冲突

src/pages/mission/components/HistoryMis.vue

@@ -17,7 +17,7 @@
             </div>
         </div>
         <div>
-            <el-table :data="tableData" style="width: 98%" stripe>
+            <el-table :data="tableData" style="width: 98%;height: calc(100vh - 240px);" stripe>
                 <el-table-column fixed label="序号" width="150">
                     <template #default="scope">
                         {{ scope.$index + 1 }}
@@ -77,7 +77,7 @@ export default {
         let loading = ref(false)
         function reload() {
             loading.value = true
-            task.getTask({ pageno: 1, pagesize: 999999 }).then(res => {
+            task.getTask({ pageno: 1, pagesize: 10 }).then(res => {
                 if (res.code == 0) {
                     tableData.value = res.data
                     totals.value = res.count
@@ -90,7 +90,7 @@ export default {
             startTime.value = ''
             endTime.value = ''
             getTime.value = ''
-            task.getTask({ pageno: 1, pagesize: 999999 }).then(res => {
+            task.getTask({ pageno: 1, pagesize: 10 }).then(res => {
                 tableData.value = res.data
                 totals.value = res.count
             })
@@ -109,7 +109,7 @@ export default {
         function searchMis() {
             task.getTask({
                 pageno: 1,
-                pagesize: 20,
+                pagesize: 10,
                 name: names.value,
                 start_time: startTime.value,
                 end_time: endTime.value

src/pages/system/components/LineTree.vue

@@ -5,7 +5,7 @@
                 style="line-height: 22px;height: 22px;float: left;width: 92%;margin: 4%;font-weight: bold;border-bottom: 1px solid #e4e2e2;">
                 <img style="width: 20px;height: 20px;margin-right: 5px;float: left;" src="../../../assets/icon/pice_set.png"
                     alt="">
-                <span style="float: left;">接线方式</span>
+                <span style="float: left;font-size: 16px;font-weight: 500;">一次性接线方式</span>
             </span>
             <el-tree v-if="vif" node-key="id" style="float: left;width: 100%;margin: 0 auto;background-color: #F7F8FB;"
                 :data="lineData" :props="defaultProps" @node-click="handleNodeClick" />