Browse Source

修改bug,内置模型管理的翻页bug

“yueshang” 1 year ago
parent
commit
d8b5fd1e76

+ 1 - 1
src/pages/mission/components/CreateMis.vue

@@ -1060,7 +1060,7 @@ const sureAdd = debounce(async () => {
           : { type: "error", message: res.msg };
       ElMessage(meg);
       loadAreaInfo(loadScdId.value * 1);
-      openAddInterval.value = false;
+      openAddInterval.value =  res && res.code == 0?false:true;
     }
   });
 }, 500);

+ 2 - 2
src/pages/mission/components/HaveMis.vue

@@ -189,10 +189,10 @@ export default {
     }
     function startNow(row, num) {
       console.log('currEditTaskModels.value', currEditTaskModels.value)
-      if (!currEditTaskModels.value) {
+      if (row.name == null || row.name == '' || row.name == undefined) {
        return ElMessage({
           message: "还未选择检测任务",
-          type: "warning"
+          type: "info"
         })
       } else {
         sizeNum.value = 1;

+ 2 - 2
src/pages/mission/modalComp/ModelTree.vue

@@ -88,8 +88,8 @@ export default {
             dialogVisible.value = result
             // 用 Promise.all 等待所有异步操作完成
             Promise.all([
-                litLine.getAllLine({ pageno: 1, pagesize: 30 }),
-                litLine.getAllm({ pageno: 1, pagesize: 100 }),
+                litLine.getAllLine({ pageno: 1, pagesize: 10000}),
+                litLine.getAllm({ pageno: 1, pagesize: 10000 }),
                 systemRow.getChildren({ code: "voltage_level" })
             ]).then(([lineRes, mineRes, levelRes]) => {
                 line = lineRes.data

+ 1 - 0
src/pages/netStructPicture/components/virtualRelation.vue

@@ -303,6 +303,7 @@ const setLeaderline = () => {
 };
 //滚动时重定位线条
 const newPositionLine = () => {
+  if(!document.getElementById("treedom3")) return;
   document.getElementById("treedom3").addEventListener(
     "scroll",
     AnimEvent.add(() => {

+ 1 - 0
src/pages/netStructPicture/components/virtualnformation.vue

@@ -421,6 +421,7 @@ const setLeaderline = () => {
 };
 //滚动时重定位线条
 const newPositionLine = () => {
+  if(!document.getElementById("treedom3")) return;
   document.getElementById("treedom3").addEventListener(
     "scroll",
     AnimEvent.add(() => {

+ 2 - 2
src/pages/system/SystemPage.vue

@@ -76,7 +76,8 @@ export default {
         let moduleSize = ref(10);
         function tagChange(row, num) {//标签切换
             selectIndex.value = num;
-            volId.value = '';//点击切换的时候置为空,防止内置模型管理翻页有问题
+            volId.value = null;//点击切换的时候置为空,防止内置模型管理翻页有问题
+            lineId.value = null;//防止点击了内置模型后回到接线方式维护翻页未选择接线方式也有volid的问题
             if (num == 1) {
                 ourNum.value = 0;
             }
@@ -89,7 +90,6 @@ export default {
             moduleTotal.value = num
             fuckList.value = data
             lineId.value = id
-            
         }
         function volBack(data, id, num) {
             fuckList.value = data

+ 20 - 20
src/pages/system/components/LineTree.vue

@@ -72,12 +72,13 @@ export default {
         let intE = ref("")
         const datatypes = ref(null);//判断点击的是第一层还是第二层的电压
         watch(() => props.selectIndex, (newVal) => {
-            result.value = newVal
+            result.value = newVal;
+            datatypes.value = null;
             searchFlashLel()
         })
         watch(() => props.moduleIndex, (newVal) => {
             size.value = newVal;
-            handleModelNodeClick(datatypes.value)
+            commonClick(datatypes.value)
                 // litLine.getAllm({ pageno: index.value, pagesize: size.value, vol_id: intE.value ? intE.value - 0 : "" }).then(res => {
                 //     if (res.code == 0) {
                 //         loading.value = true
@@ -95,8 +96,7 @@ export default {
         })
         watch(() => props.moduleSize, (newVal) => {
             index.value = newVal;
-            console.log('index.value', )
-            handleModelNodeClick(datatypes.value)
+            commonClick(datatypes.value)
             // litLine.getAllm({ pageno: index.value, pagesize: size.value, vol_id: intE.value ? intE.value - 0 : "" }).then(res => {
             //     if (res.code == 0) {
             //         loading.value = true
@@ -111,13 +111,11 @@ export default {
             //         })
             //     }
             // })
-
-           
         })
         function searchLine() {
             if (props.moduleIndex && props.moduleSize) {
                 size.value = props.moduleSize;
-                index.value = props.moduleIndex
+                index.value = props.moduleIndex;
             } else {
                 size.value = 10
                 index.value = 1
@@ -130,7 +128,7 @@ export default {
                 if (props.selectIndex == 1) {
                     vif.value = false
                     // 获取每个电压等级下的接线方式
-                    litLine.getAllLine({ pageno: 1, pagesize: 10 }).then(res2 => {
+                    litLine.getAllLine({ pageno: 1, pagesize: 10000 }).then(res2 => {
                         for (let i = 0; i < res2.data.length; i++) {
                             const vol_level_id = res2.data[i].vol_level_id
                             res.data.filter((item) => {
@@ -149,7 +147,7 @@ export default {
             })
         }
         function handleNodeClick(e) {
-            console.log('333333333', 333333333)
+            console.log('ewerwrwr', 999999)
             litLine.getAllLine({ pageno: 1, pagesize: 10, vol_id: e.id?e.id - 0:null }).then(res => {
                 if (res.code == 0) {
                     loading.value = true
@@ -165,14 +163,11 @@ export default {
                 }
             })
         }
-        function handleModelNodeClick(e) {
-            console.log('e.datatype=========', e.datatype)
-            datatypes.value = e;
-            // 模型管理       
-            if (e.datatype === 'linkstyle') {
-                console.log('44444444', 44444444)
+        function commonClick(e){
+            console.log('eeeeeeeeee', e)
+            if (e&&e.datatype === 'linkstyle') {
                 // 接线方式
-                litLine.getAllm({ pageno: index.value, pagesize:size.value , line_link_style: e.id }).then(res => {
+                litLine.getAllm({ pageno: index.value, pagesize:size.value, line_link_style: e.id }).then(res => {
                     
                     if (res.code == 0) {
                         loading.value = true
@@ -187,15 +182,14 @@ export default {
                     }
                 })
             } else {
-                console.log('55555', 55555)
                 // 电压等级
-                intE.value = e.id
-                litLine.getAllm({ pageno: index.value, pagesize: size.value, vol_id: intE.value - 0 }).then(res => {
+                intE.value = e?e.id*1:null;
+                litLine.getAllm({ pageno: index.value, pagesize: size.value, vol_id: intE.value }).then(res => {
                     if (res.code == 0) {
                         loading.value = true
                         counts.value = res.count
                         emit("lineBack", loading.value)
-                        emit("volBack", res.data, e.id, counts.value)
+                        emit("volBack", res.data, intE.value, counts.value)
                     } else {
                         ElMessage({
                             message: res.msg,
@@ -205,6 +199,11 @@ export default {
                 })
             }
         }
+        function handleModelNodeClick(e) {
+            datatypes.value = e;
+            // 模型管理       
+            commonClick(e)
+        }
         function pClick(row, num) {
             selectIndex.value = num
             litLine.getAllLine({ pageno: 1, pagesize: 10, vol_id: row.id - 0 }).then(res => {
@@ -236,6 +235,7 @@ export default {
             size,
             index,
             intE,
+            commonClick
         }
     },
     components: {

+ 3 - 3
src/pages/system/components/Pagination.vue

@@ -35,7 +35,6 @@ export default {
         })
         watch(()=>props.pageNum,(newVal)=>{
             size.value = newVal
-            console.log(size.value,'watch');
         },{
             deep:true
         })
@@ -46,17 +45,18 @@ export default {
             total.value = props.totals
             page.value = props.pages
             size.value = props.pageNum
-            console.log(size.value,'size');
         }
 
         // 页码
         function handleCurrentChange(e) {
-            page.value = e
+            page.value = e;
+            console.log('当前页码', e)
             emit("pageBack", page.value, size.value)
         }
         // 条数
         function handleSizeChange(e) {
             size.value = e
+            console.log('当前条数', e)
             emit("pageBack", page.value, size.value)
         }
         onMounted(() => {

+ 5 - 6
src/pages/system/components/SetModule.vue

@@ -98,19 +98,18 @@ export default {
             console.log('newVal555555', newVal)
         })
         watch(() => props.moduleTotal, (newVal) => {
-            console.log('newvalue========', newVal)
             totals.value = newVal
         })
         //监听变电站id变化
         watch(()=>props.volId,(newVal)=>{
             flashId.value = newVal;
-            
-            console.log('flashId.value', flashId.value)
+            pages.value = 1;
+            pageNum.value = 10;
+            emit("pageCase", pages.value, pageNum.value)
         })
         function ready() {
             flashId.value = props.volId
             loading.value = true;
-            console.log('first1111111', pages.value)
             litLine.getAllm({ pageno: pages.value, pagesize: pageNum.value }).then(res => {
                 if (res.code == 0) {
                     tableData.value = res.data
@@ -129,7 +128,7 @@ export default {
         function sunReady() {
             loading.value = true
             console.log('first222221', pages.value)
-            litLine.getAllm({ pageno: pages.value, pagesize:  pageNum.value}).then(res => {
+            litLine.getAllm({ pageno: pages.value, pagesize: pageNum.value}).then(res => {
                 if (res.code == 0) {
                     tableData.value = res.data
                     totals.value = res.count
@@ -192,7 +191,7 @@ export default {
         }
         function addBack(isshow) {
             nodeMos.value = false
-            console.log('first144441', pages.value)
+            console.log('first144441', pages.value,pageNum.value)
             needRow.value = null
             if (isshow) {
                 litLine.getAllm({ pageno: pages.value, pagesize: pageNum.value, line_link_style: props.linkstyleid, vol_id: props.volId || '' }).then(res => {