修改bug及新增间隔的新增等

src/pages/mission/components/PageNation.vue

@@ -72,7 +72,8 @@ export default {
             })
         }
         function handleCurrentChange(e) {//页码
-            currentPage.value = e
+            currentPage.value = e;
+            console.log(' currentPage.value',  currentPage.value,pageSize.value)
             task.getTask({
                 pageno: currentPage.value - 0,
                 pagesize: pageSize.value - 0

src/pages/mission/modalComp/ModelTree.vue

@@ -40,6 +40,9 @@ export default {
         checkedNodeNames: {
             type: Array,
             required: true,
+        },
+        spaceInterval:{
+            type: Array,
         }
     },
     setup(props, { emit }) {
@@ -58,13 +61,19 @@ export default {
         let dialogVisible = ref(false)
         let checkKey = ref([])//默认选中的key
         let checkNames = ref([])//默认选中的names
-        let treeRef = ref(null)
+        let treeRef = ref(null);
+        const chooseData = ref([])
         watch(() => props.treeNeed, (newVal) => {
             checkKey.value = newVal
         },{immediate:true})
         watch(() => props.checkedNodeNames, (newVal) => {
-            checkNames.value = newVal
+            checkNames.value = newVal;
+            console.log('checkNames.value', checkNames.value)
         },{immediate:true})
+        watch(() => props.spaceInterval, (newVal) => {
+            chooseData.value = newVal;
+        },{immediate:true})
+        
         function reload() {            
             if (props.treeNeed) {
                 checkKey.value = props.treeNeed
@@ -112,6 +121,7 @@ export default {
                 if( checkKey.value != null) {
                     mdId.value = checkKey.value
                     mdName.value = checkNames.value
+                    console.log('checkKey.value', checkKey.value)
                 }
             }).catch(error => {
                 // 处理错误
@@ -123,15 +133,21 @@ export default {
         function handleCheckChange(e) {
             const id = e.id;
             const model_name = e.model_name;
+
             if (!mdId.value.includes(id)) {
                 mdId.value.push(id);
                 mdName.value.push(model_name);
+                chooseData.value.push({
+                    model_id:id,
+                    model_name:e.model_name
+                })
             } else {
                 const idIndex = mdId.value.indexOf(id);
                 mdId.value.splice(idIndex, 1);
                 mdName.value.splice(idIndex, 1);
+                chooseData.value.splice(idIndex, 1)
             }
-            emit("treeNum", mdId.value, mdName.value);
+            emit("treeNum", mdId.value, mdName.value,chooseData.value);
         }
         function getBack() {
             dialogVisible.value = false

src/pages/setting/modalComp/AddSc.vue

@@ -132,7 +132,7 @@ export default {
                                 // props.handleNodeClick(e)
                                 ElMessage({
                                     type: "error",
-                                    message: "新增重复"
+                                    message: "名称或编码已存在"
                                 })
                             }
                         })

src/pages/system/components/LineTree.vue

@@ -124,7 +124,7 @@ export default {
                 if (props.selectIndex == 1) {
                     vif.value = false
                     // 获取每个电压等级下的接线方式
-                    litLine.getAllLine({ pageno: 1, pagesize: 20 }).then(res2 => {
+                    litLine.getAllLine({ pageno: 1, pagesize: 10 }).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) => {
@@ -143,7 +143,7 @@ export default {
             })
         }
         function handleNodeClick(e) {
-            litLine.getAllLine({ pageno: 1, pagesize: 20, vol_id: e.id - 0 }).then(res => {
+            litLine.getAllLine({ pageno: 1, pagesize: 10, vol_id: e.id - 0 }).then(res => {
                 if (res.code == 0) {
                     loading.value = true
                     pushList.value = res.data
@@ -162,7 +162,7 @@ export default {
             // 模型管理       
             if (e.datatype === 'linkstyle') {
                 // 接线方式
-                litLine.getAllm({ pageno: 1, pagesize: 20, line_link_style: e.id }).then(res => {
+                litLine.getAllm({ pageno: 1, pagesize: 10, line_link_style: e.id }).then(res => {
                     
                     if (res.code == 0) {
                         loading.value = true
@@ -179,7 +179,7 @@ export default {
             } else {
                 // 电压等级
                 intE.value = e.id
-                litLine.getAllm({ pageno: 1, pagesize: 20, vol_id: intE.value - 0 }).then(res => {
+                litLine.getAllm({ pageno: 1, pagesize: 10, vol_id: intE.value - 0 }).then(res => {
                     if (res.code == 0) {
                         loading.value = true
                         counts.value = res.count
@@ -196,7 +196,7 @@ export default {
         }
         function pClick(row, num) {
             selectIndex.value = num
-            litLine.getAllLine({ pageno: 1, pagesize: 20, vol_id: row.id - 0 }).then(res => {
+            litLine.getAllLine({ pageno: 1, pagesize: 10, vol_id: row.id - 0 }).then(res => {
                 if (res.code == 0) {
                     pushList.value = res.data
                     emit("listBack", pushList.value, row.id)

src/pages/system/components/LitLine.vue

@@ -84,7 +84,7 @@
         </el-table>
       </div>
       <div style="position: absolute; right: 0px; bottom: 0px">
-        <Pagination :totals="totals" @pageBack="pageBack"></Pagination>
+        <Pagination :pages="pages" :pageNum="pageNum" :totals="totals" @pageBack="pageBack"></Pagination>
       </div>
       <div>
         <AddLine
@@ -162,6 +162,8 @@ export default {
     let totals = ref(0); //总条数
     let loading = ref(false);
     let flashId = ref(""); //本组件电压等级id
+    let pages = ref(1)//页码
+    let pageNum = ref(10)//页数
     watch(
       () => props.fuckList,
       (newVal) => {
@@ -177,13 +179,16 @@ export default {
     watch(
       () => props.lineId,
       (newVal) => {
+        console.log('newVal', newVal)
         flashId.value = newVal;
+        pages.value = 1;
+        pageNum.value = 10;
       }
     );
     function checkFlash(num) {
       loading.value = true;
       litLine
-        .getAllLine({ pageno: 1, pagesize: 20, vol_id: num - 0 })
+        .getAllLine({ pageno: pages.value, pagesize: pageNum.value, vol_id: num - 0 })
         .then((res) => {
           if (res.code == 0) {
             loading.value = false;
@@ -206,7 +211,7 @@ export default {
         console.log("调用了search的if");
         totals.value = props.moduleTotal;
         loading.value = true;
-        litLine.getAllLine({ pageno: 1, pagesize: 10 }).then((res) => {
+        litLine.getAllLine({ pageno: pages.value, pagesize: pageNum.value }).then((res) => {
           if (res.data != null) {
             lineList.value = res.data;
             totals.value = res.count;
@@ -220,7 +225,7 @@ export default {
       } else {
         console.log("调用了search的else");
         loading.value = true;
-        litLine.getAllLine({ pageno: 1, pagesize: 10 }).then((res) => {
+        litLine.getAllLine({ pageno: pages.value, pagesize: pageNum.value}).then((res) => {
           if (res.data != null) {
             lineList.value = res.data;
             totals.value = res.count;
@@ -235,7 +240,7 @@ export default {
     }
     function sunSearch() {
       loading.value = true;
-      litLine.getAllLine({ pageno: 1, pagesize: 10 }).then((res) => {
+      litLine.getAllLine({ pageno: pages.value, pagesize: pageNum.value }).then((res) => {
         if (res.data != null) {
           lineList.value = res.data;
           totals.value = res.count;
@@ -287,6 +292,9 @@ export default {
       picModal.value = data;
     }
     function pageBack(no, index) {
+      console.log('first', no,'sdfsf',index,)
+      pages.value = no;
+      pageNum.value = index;
       loading.value = true;
       litLine
         .getAllLine({ pageno: no - 0, pagesize: index - 0 })
@@ -340,6 +348,8 @@ export default {
       flashId, //本组件变电站id
       checkFlash, //便于刷新的函数
       addPng,
+      pages,
+      pageNum
     };
   },
   components: {

src/pages/system/components/SetModule.vue

@@ -194,7 +194,8 @@ export default {
             }
         }
         function pageBack(no, index) {
-            pages.value = no
+            pages.value = no;
+            console.log('index===翻页', pages.value, pageNum.value)
             pageNum.value = index
             emit("pageCase", no, index)
         }