Merge branch 'master' of http://94.191.59.107:3000/houwenfeng/scd_tools_ui

src/pages/mission/components/CreateMis.vue

@@ -73,7 +73,7 @@
                             <img src="../../../assets/icon/DotsNine.png" alt="">
                         </div>
                         <div style="height: 24px;line-height: 22px;margin-left: 5px;">
-                            <span>间隔列表</span>
+                            <span style="font-size: 16px;font-weight: 400;">间隔列表</span>
                         </div>
                     </div>
                     <!-- <p :class="jgSelect == index ? 'result' : ''" v-for="(item, index) in jgList"
@@ -89,8 +89,8 @@
                             <img src="../../../assets/icon/HardDrives.png" alt="">
                         </div>
                         <div style="height: 24px;line-height: 22px;margin-left: 5px;">
-                            <span>装置列表——间隔：<em>{{ jg }}</em></span>
-                            <span>检测模型：<em>{{ flashLevel ? flashLevel : '' }}</em></span>
+                            <span style="font-size: 16px;font-weight: 400;">装置列表——间隔：<em>{{ jg }}</em></span>
+                            <span style="font-size: 16px;font-weight: 400;">检测模型：<em>{{ flashLevel ? flashLevel : '' }}</em></span>
                         </div>
                         <div
                             style="position: absolute;top: 0px;right: 0px;display: flex;justify-content: center;align-items: center;">

src/pages/setting/components/SetLog.vue

@@ -186,10 +186,21 @@ export default {
         function getBack(index, size) {//分页组件返回数据赋值
             loading.value = true
             pages.value = index
-            sizes.value = sizes
+            sizes.value = size
             setlog.getAllLog({ pageindex: pages.value, pageSize: sizes.value, enddate: getDate(), startdate: getDate() }).then(res => {
-                logList.value = res.data
-                logTotal.value = res.count
+                if (res.code == 0) {
+                    logList.value = res.data
+                    logTotal.value = res.count
+                    loading.value = false
+                } else {
+                    logList.value = []
+                    logTotal.value = 0
+                    loading.value = false
+                    ElMessage({
+                        message: res.msg,
+                        type: "error"
+                    })
+                }
             })
         }
         function aboutChange(e) {//操作结果change事件

src/pages/system/SystemPage.vue

@@ -88,7 +88,6 @@ export default {
             fuckList.value = data
             lineId.value = id
             moduleTotal.value = num
-            console.log(moduleTotal.value, 'systempage123');
         }
         function volBack(data, id, num) {
             fuckList.value = data

src/pages/system/components/SetModule.vue

@@ -87,24 +87,24 @@ export default {
             totals.value = newVal
         })
         function ready() {
-            if (JSON.stringify(props.fuckList) =="[]") {
-                loading.value = true
-                litLine.getAllm({ pageno: 1, pagesize: 20 }).then(res => {
-                    if (res.code == 0) {
-                        tableData.value = res.data
-                        totals.value = res.count
-                        loading.value = false
-                        console.log(totals.value,'totals,module');
-                    } else {
-                        ElMessage({
-                            message: res.msg,
-                            type: "error"
-                        })
-                    }
-                })
-            } else {
-                tableData.value = props.fuckList
-            }
+            // if (JSON.stringify(props.fuckList) =="[]") {
+            loading.value = true
+            litLine.getAllm({ pageno: 1, pagesize: 20 }).then(res => {
+                if (res.code == 0) {
+                    tableData.value = res.data
+                    totals.value = res.count
+                    loading.value = false
+                    console.log(totals.value, 'totals,module');
+                } else {
+                    ElMessage({
+                        message: res.msg,
+                        type: "error"
+                    })
+                }
+            })
+            // } else {
+            //     tableData.value = props.fuckList
+            // }
             totals.value = props.moduleTotal
         }
         function tableChange(e) {