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

src/pages/mission/components/StartMission.vue

@@ -29,7 +29,7 @@
                         <img style="display: block;" src="../../../assets/icon/file_blue.png" alt="">
                         <span style="display: block;font-size: 14px;font-size: 16px;font-weight: 400;">检测结果</span>
                     </div>
-                    <el-table :data="endList" stripe style="width: 100%;height: calc(100vh - 600px);">
+                    <el-table :data="endList" stripe style="width: 100%;height: calc(100vh - 600px);" v-loading="loading">
                         <el-table-column prop="ied_name" label="装置名称" width="150" />
                         <el-table-column prop="ied_desc" label="装置描述" width="150" :show-overflow-tooltip="true" />
                         <el-table-column label="等级" width="130">
@@ -40,8 +40,9 @@
                         </el-table-column>
                         <el-table-column prop="line_no" label="行号" width="130">
                             <template #default="scope">
-                                <span style="color: blue;border-bottom: 1px solid blue;cursor: pointer;" @click="lineno(scope.row)">{{
-                                    scope.row.line_no }}</span>
+                                <span style="color: blue;border-bottom: 1px solid blue;cursor: pointer;"
+                                    @click="lineno(scope.row)">{{
+                                        scope.row.line_no }}</span>
                             </template>
                         </el-table-column>
                         <el-table-column prop="parse_result" label="描述" width="auto" :show-overflow-tooltip="true" />
@@ -56,7 +57,8 @@
             </div>
         </div>
         <div>
-            <LookLine v-if="lineSearch" :lineSearch="lineSearch" :scdIds="scdIds" :lineNum="lineNum" @lineClose="lineClose">
+            <LookLine v-if="lineSearch" :lineSearch="lineSearch" :scdIds="scdIds" :lineNum="lineNum" :lineMsg="lineMsg"
+                @lineClose="lineClose">
             </LookLine>
         </div>
     </div>
@@ -85,6 +87,8 @@ export default {
         let lineNum = ref(0)
         let lineSearch = ref(false)
         let end = ref(true)
+        let lineMsg = ref("")
+        let loading = ref(false)
         watch(() => props.startMis, (newVal) => {
             loadingMis.value = newVal
             scdIds.value = newVal.scd_id
@@ -103,6 +107,7 @@ export default {
         function picReload() {
             loadingMis.value = props.startMis
             scdIds.value = loadingMis.value.scd_id
+            loading.value = true
             task.tackStart({ id: loadingMis.value.id }).then(res => {
                 let countTime = setInterval(() => {
                     task.lookStep({ id: loadingMis.value.id - 0 }).then(res => {
@@ -119,7 +124,7 @@ export default {
                 setTimeout(() => {
                     clearInterval(countTime)
                     end.value = false
-                }, 30000)
+                }, 40000)
             })
             setTimeout(() => {
                 slc.getScdByIdFromMission({
@@ -127,9 +132,15 @@ export default {
                     pageno: 1,
                     pagesize: 20,
                 }).then(res => {
-                    endList.value = res.data
+                    if (res.data) {
+                        endList.value = res.data
+                        loading.value = false
+                    }else{
+                        endList.value = []
+                        loading.value = false
+                    }
                 })
-            }, 20000)
+            }, 30000)
         }
         function backDown() {
             emit("smBack", arrow.value)
@@ -143,8 +154,12 @@ export default {
         }
         function lineno(row) {
             lineNum.value = row.line_no
+            lineMsg.value = row.parse_result
             lineSearch.value = true
         }
+        function lineClose(data) {
+            lineSearch.value = data
+        }
         onMounted(() => {
             picReload()
         })
@@ -162,6 +177,9 @@ export default {
             scdIds,
             lineNum,
             lineSearch,
+            lineMsg,
+            lineClose,
+            loading,
         }
     },
     components: {
@@ -235,4 +253,5 @@ p {
     font-family: Source Han Sans CN-Regular, Source Han Sans CN;
     font-weight: 400;
     color: #255CE7;
-}</style>
+}
+</style>

src/pages/mission/modalComp/LookLine.vue

@@ -1,12 +1,21 @@
 <template>
     <div>
-        <el-dialog v-model="dialogDisabled" width="50vw" append-to-body draggable @close="closes">
+        <el-dialog v-model="dialogDisabled" width="60vw" append-to-body draggable @close="closes">
             <template #header>
                 <div class="my-header">
                     <div class="title">SCD源XML查看</div>
                 </div>
             </template>
             <div class="line-title">{{ lineNoTitle }}</div>
+            <div style="
+            color: red;
+            font-size: 16px;
+            margin: 15px 0px;
+            border-bottom: 1px solid #dbdbdb;
+            text-align: center;
+            padding-bottom: 10px;
+            ">{{
+                messageLine }}</div>
             <el-scrollbar height="500px">
                 <div class="main-cont-line">
                     <div class="main-line">
@@ -42,7 +51,11 @@ export default {
         lineNum: {
             type: String,
             required: true
-        }
+        },
+        lineMsg: {
+            type: String,
+            required: true
+        },//描述
     },
     setup(props, { emit }) {
         let dialogDisabled = ref(false)
@@ -50,6 +63,7 @@ export default {
         let line = ref(0)//行号
         let clicklineNOData = ref("")
         let lineNoData = ref([])
+        let messageLine = ref("")
         watch(() => props.lineNum, (newVal) => {
             line.value = newVal
             clicklineNOData.value = newVal
@@ -57,15 +71,20 @@ export default {
         watch(() => props.scdIds, (newVal) => {
             needScdId.value = newVal
         })
+        watch(() => props.lineMsg, (newVal) => {
+            messageLine.value = newVal
+        })
         // 初始化函数
         function reload() {
             dialogDisabled.value = props.lineSearch
             needScdId.value = props.scdIds
             line.value = props.lineNum
             clicklineNOData.value = props.lineNum
+            messageLine.value = props.lineMsg
+            console.log(messageLine.value, 'message');
             scdLineSourcexml({
                 scd_id: needScdId.value - 0,
-                line_no: line.value - 0
+                lineno: line.value - 0
             }).then(res => {
                 if (res.data != null) {
                     lineNoData.value = res.data
@@ -76,10 +95,6 @@ export default {
             dialogDisabled.value = false
             emit("lineClose", dialogDisabled.value)
         }
-        function needSure() {
-            dialogDisabled.value = false
-            emit("lineClose", dialogDisabled.value)
-        }
         onMounted(() => {
             reload()
         })
@@ -92,6 +107,7 @@ export default {
             closes: needClose,
             clicklineNOData,
             lineNoData,
+            messageLine,
         }
     }
 }
@@ -103,4 +119,15 @@ export default {
     color: #fff;
     margin-right: 20px;
 }
-</style>
+
+.my-header {
+    border-bottom: 1px solid #a3ade0;
+    font-size: 16px;
+    color: #1a2447;
+    padding-bottom: 10px;
+}
+
+:deep(.el-dialog__body) {
+    margin: 0 !important;
+    padding: 0 !important;
+}</style>

src/pages/setting/components/SetLog.vue

@@ -193,64 +193,64 @@ export default {
             })
         }
         function aboutChange(e) {//操作结果change事件
-            loading.value = true
+            // loading.value = true
             setAbout.value = e
-            setlog.getAllLog({ pageindex: pages.value, pageSize: sizes.value, success: setAbout.value, enddate: getDate(), startdate: getDate() }).then(res => {
-                if (res.data != null) {
-                    logList.value = res.data
-                    logTotal.value = res.count
-                    loading.value = false
-                } else {
-                    logList.value = []
-                        logTotal.value = 0
-                        loading.value = false
-                }
-            })
+            // setlog.getAllLog({ pageindex: pages.value, pageSize: sizes.value, success: setAbout.value, enddate: getDate(), startdate: getDate() }).then(res => {
+            //     if (res.data != null) {
+            //         logList.value = res.data
+            //         logTotal.value = res.count
+            //         loading.value = false
+            //     } else {
+            //         logList.value = []
+            //             logTotal.value = 0
+            //             loading.value = false
+            //     }
+            // })
         }
         function audiChange(e) {//审计分类change事件
-            loading.value = true
+            // loading.value = true
             audiType.value = e
-            setlog.getAllLog({ pageindex: pages.value, pageSize: sizes.value, audittype: audiType.value, enddate: getDate(), startdate: getDate() }).then(res => {
-                if (res.data != null) {
-                    logList.value = res.data
-                    logTotal.value = res.count
-                    loading.value = false
-                } else {
-                    logList.value = []
-                        logTotal.value = 0
-                        loading.value = false
-                }
-            })
+            // setlog.getAllLog({ pageindex: pages.value, pageSize: sizes.value, audittype: audiType.value, enddate: getDate(), startdate: getDate() }).then(res => {
+            //     if (res.data != null) {
+            //         logList.value = res.data
+            //         logTotal.value = res.count
+            //         loading.value = false
+            //     } else {
+            //         logList.value = []
+            //             logTotal.value = 0
+            //             loading.value = false
+            //     }
+            // })
         }
         function stChange(e) {//操作分类change事件
-            loading.value = true
+            // loading.value = true
             setType.value = e
-            setlog.getAllLog({ pageindex: pages.value, pageSize: sizes.value, opttype: setType.value, enddate: getDate(), startdate: getDate() }).then(res => {
-                if (res.data != null) {
-                    logList.value = res.data
-                    logTotal.value = res.count
-                    loading.value = false
-                } else {
-                    logList.value = []
-                        logTotal.value = 0
-                        loading.value = false
-                }
-            })
+            // setlog.getAllLog({ pageindex: pages.value, pageSize: sizes.value, opttype: setType.value, enddate: getDate(), startdate: getDate() }).then(res => {
+            //     if (res.data != null) {
+            //         logList.value = res.data
+            //         logTotal.value = res.count
+            //         loading.value = false
+            //     } else {
+            //         logList.value = []
+            //             logTotal.value = 0
+            //             loading.value = false
+            //     }
+            // })
         }
         function thingChange(e) {//事件类型change事件
-            loading.value = true
+            // loading.value = true
             thing.value = e
-            setlog.getAllLog({ pageindex: pages.value, pageSize: sizes.value, eventtype: thing.value, enddate: getDate(), startdate: getDate() }).then(res => {
-                if (res.data != null) {
-                    logList.value = res.data
-                    logTotal.value = res.count
-                    loading.value = false
-                } else {
-                    logList.value = []
-                        logTotal.value = 0
-                        loading.value = false
-                }
-            })
+            // setlog.getAllLog({ pageindex: pages.value, pageSize: sizes.value, eventtype: thing.value, enddate: getDate(), startdate: getDate() }).then(res => {
+            //     if (res.data != null) {
+            //         logList.value = res.data
+            //         logTotal.value = res.count
+            //         loading.value = false
+            //     } else {
+            //         logList.value = []
+            //             logTotal.value = 0
+            //             loading.value = false
+            //     }
+            // })
         }
         function allSearch() {
             setlog.getAllLog({

src/pages/system/SystemPage.vue

@@ -21,7 +21,7 @@
                 </div>
                 <!-- 切换box -->
                 <div class="changeBox" :style="selectIndex == 1 && ourNum == 1 ? 'width:96%' : ''" v-loading="loading">
-                    <LitLine v-if="selectIndex == 0" :fuckList="fuckList"></LitLine>
+                    <LitLine v-if="selectIndex == 0" :fuckList="fuckList" :moduleTotal="moduleTotal"></LitLine>
                     <InsideModule v-if="selectIndex == 1 && ourNum == 1" :tfType="tfType" :insideNeed="insideNeed"
                         :lineId="lineId" :setName="setName" :setId="setId" @closeDraw="closeDraw"></InsideModule>
                     <SetModule v-if="selectIndex == 1 && ourNum == 0" @backNum="backNum" :linkstyleid="lineId"
@@ -84,19 +84,16 @@ export default {
                 tag.isSelected = tag.id === row.id;
             });
         }
-        function listBack(data, id) {
-            setTimeout(() => {
-                fuckList.value = data
-                lineId.value = id
-            }, 1000)
+        function listBack(data, id, num) {
+            fuckList.value = data
+            lineId.value = id
+            moduleTotal.value = num
+            console.log(moduleTotal.value, 'systempage123');
         }
         function volBack(data, id, num) {
-            // setTimeout(() => {
             fuckList.value = data
             volId.value = id
             moduleTotal.value = num
-            console.log(moduleTotal.value, 'systempage');
-            // }, 1000)
         }
         function backNum(data, name, row) {
             ourNum.value = data

src/pages/system/components/LineTree.vue

@@ -76,7 +76,7 @@ export default {
         })
         watch(() => props.moduleIndex, (newVal) => {
             size.value = newVal
-            litLine.getAllm({ pageno: index.value, pagesize: size.value, vol_id: intE.value - 0 }).then(res => {
+            litLine.getAllm({ pageno: index.value, pagesize: size.value, vol_id: intE.value ? intE.value - 0 : "" }).then(res => {
                 if (res.code == 0) {
                     loading.value = true
                     counts.value = res.count
@@ -93,7 +93,7 @@ export default {
         })
         watch(() => props.moduleSize, (newVal) => {
             index.value = newVal
-            litLine.getAllm({ pageno: index.value, pagesize: size.value, vol_id: intE.value - 0 }).then(res => {
+            litLine.getAllm({ pageno: index.value, pagesize: size.value, vol_id: intE.value ? intE.value - 0 : "" }).then(res => {
                 if (res.code == 0) {
                     loading.value = true
                     counts.value = res.count
@@ -109,8 +109,14 @@ export default {
             })
         })
         function searchLine() {
-            size.value = props.moduleIndex
-            index.value = props.moduleSize
+            if (props.moduleIndex && props.moduleSize) {
+                size.value = props.moduleIndex
+                index.value = props.moduleSize
+            } else {
+                size.value = 1
+                index.value = 10
+            }
+
         }
         function searchFlashLel() {//拿到电压等级
             systemRow.getChildren({ code: "voltage_level" }).then(res => {
@@ -140,9 +146,10 @@ export default {
             litLine.getAllLine({ pageno: 1, pagesize: 20, vol_id: e.id - 0 }).then(res => {
                 if (res.code == 0) {
                     loading.value = true
-                    emit("lineBack", loading.value)
                     pushList.value = res.data
-                    emit("listBack", res.data)
+                    counts.value = res.count
+                    emit("lineBack", loading.value)
+                    emit("listBack", res.data, e.id, counts.value)
                 } else {
                     ElMessage({
                         message: res.msg,
@@ -158,8 +165,9 @@ export default {
                 litLine.getAllm({ pageno: 1, pagesize: 20, line_link_style: e.id }).then(res => {
                     if (res.code == 0) {
                         loading.value = true
+                        counts.value = res.count
                         emit("lineBack", loading.value)
-                        emit("listBack", res.data, e.id)
+                        emit("listBack", res.data, e.id, counts.value)
                     } else {
                         ElMessage({
                             message: res.msg,
@@ -174,7 +182,7 @@ export default {
                     if (res.code == 0) {
                         loading.value = true
                         counts.value = res.count
-                        console.log(counts.value, 'linetree');
+                        console.log(res.data, 'linetree');
                         emit("lineBack", loading.value)
                         emit("volBack", res.data, e.id, counts.value)
                     } else {

src/pages/system/components/LitLine.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <div class="bigBox" style="position: relative;">
+        <div class="bigBox" style="position: relative;" v-loading="loading">
             <div style="text-align: center;">
                 <h2>接线方式管理</h2>
             </div>
@@ -57,7 +57,7 @@
 </template>
 
 <script>
-import { ref, onMounted, toRefs, watch } from 'vue';
+import { ref, onMounted, toRefs, watch, onBeforeUnmount } from 'vue';
 import litLine from "../../../api/litLine"
 import AddLine from '../modalComp/AddLine.vue';
 import LookLine from '../modalComp/LookLine.vue';
@@ -69,6 +69,10 @@ export default {
         fuckList: {
             type: Array,
             required: true
+        },
+        moduleTotal: {
+            type: Number,
+            required: true
         }
     },
     setup(props, { emit }) {
@@ -81,19 +85,31 @@ export default {
         let picModal = ref(false)
         let listNum = ref(0)//0为查看，1为编辑
         let totals = ref(0)//总条数
+        let loading = ref(false)
         watch(() => props.fuckList, (newVal) => {
             lineList.value = newVal
         })
+        watch(() => props.moduleTotal, (newVal) => {
+            totals.value = newVal
+        })
         function search() {
-            litLine.getAllLine({ pageno: 1, pagesize: 10 }).then(res => {
-                if (res.data != null) {
-                    lineList.value = res.data
-                    totals.value = res.count
-                } else {
-                    lineList.value = []
-                    totals.value = 0
-                }
-            })
+            if (totals.value) {
+                totals.value = props.moduleTotal
+            } else {
+                loading.value = true
+                litLine.getAllLine({ pageno: 1, pagesize: 10 }).then(res => {
+                    if (res.data != null) {
+                        lineList.value = res.data
+                        totals.value = res.count
+                        loading.value = false
+                    } else {
+                        lineList.value = []
+                        totals.value = 0
+                        loading.value = false
+                    }
+                })
+            }
+
         }
         function handleSelectionChange(val) {
             console.log(val, 'val');
@@ -135,13 +151,16 @@ export default {
             picModal.value = data
         }
         function pageBack(no, index) {
+            loading.value = true
             litLine.getAllLine({ pageno: no - 0, pagesize: index - 0 }).then(res => {
                 if (res.data != null) {
                     lineList.value = res.data
                     totals.value = res.count
+                    loading.value = false
                 } else {
                     lineList.value = []
                     totals.value = 0
+                    loading.value = false
                 }
             })
         }
@@ -174,6 +193,7 @@ export default {
             picBack,
             totals,//总条数
             pageBack,//Pagination.vue返回数据
+            loading,
         }
     },
     components: {

src/pages/system/components/SetModule.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <div class="bigBox">
+        <div class="bigBox" v-loading="loading">
             <div style="text-align: center;">
                 <h2 style="font-size: 18px;font-weight:bolder;">模型管理</h2>
             </div>
@@ -78,18 +78,34 @@ export default {
         let needRow = ref({})
         let modelType = ref(0)//0为新增1为修改
         let totals = ref(0)
+        let loading = ref(false)
         // let { goMap } = toRefs(props)
         watch(() => props.fuckList, (newVal) => {
             tableData.value = newVal
         })
         watch(() => props.moduleTotal, (newVal) => {
             totals.value = newVal
-            console.log(totals.value, 'setmodulewatch');
         })
         function ready() {
-            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
-            console.log(totals.value, 'setmoduleready');
         }
         function tableChange(e) {
             console.log(e, 'table');
@@ -144,6 +160,7 @@ export default {
             modelType,//1为修改0为新增
             totals,//总条数
             pageBack,//Pagination.vue返回数据
+            loading,
         }
     },
     components: {