2

src/pages/mission/components/HistoryMis.vue

@@ -45,7 +45,7 @@
                     </template>
                 </el-table-column>
             </el-table>
-            <PageNation :totals="totals" :pageNum="pageNum" :pageSize="pageSize" @pageBack="pageBack"></PageNation>
+            <PageNation :totals="totals" :pageNum="pageNum" :pageSize="pageSize" @pageBack="pageBack" @currentBack="currentBack"></PageNation>
         </div>
         <DelHistory v-if="delModal" :delModal="delModal" :delId="delId" :reload="reload" @delBack="delBack">
         </DelHistory>
@@ -87,6 +87,7 @@ export default {
             startTime.value = ''
             endTime.value = ''
             getTime.value = ''
+            pageNum.value = 1
             task.getTask({ pageno: 1, pagesize: 10 }).then(res => {
                 tableData.value = res.data
                 totals.value = res.count
@@ -156,6 +157,9 @@ export default {
         function delBack(data) {
             delModal.value = data
         }
+        function currentBack(data){
+            pageNum.value = data
+        }
         onMounted(() => {
             reload()
         })
@@ -182,6 +186,7 @@ export default {
             totals,//总条数
             relady,//重新检测
             loading,
+            currentBack,
         }
     },
     components: {

src/pages/mission/components/PageNation.vue

@@ -1,8 +1,9 @@
 <template>
     <div style="position: absolute;bottom: -60px;right: 20px;">
         <el-pagination v-model:current-page="currentPage" v-model:page-size="pageSize" :page-sizes="[10, 20, 30, 40]"
-            :small="small" :disabled="disabled" :background="background" layout="total, sizes, prev, pager, next, jumper"
-            :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+            :small="small" :disabled="disabled" :background="background"
+            layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handleSizeChange"
+            @current-change="handleCurrentChange" />
     </div>
 </template>
 
@@ -31,14 +32,20 @@ export default {
         let disabled = ref(false)
         let background = ref(false)
         let total = ref(100)//总数
-        watch(()=>props.totals,(newVal)=>{
+        watch(() => props.totals, (newVal) => {
             total.value = newVal
         })
+        watch(() => props.pageNum, (newVal) => {
+            currentPage.value = newVal
+            console.log(currentPage.value,'watch');
+        },{
+            deep:true
+        })
         function reload() {
             currentPage.value = props.pageNum
             pageSize.value = props.pageSize
             total.value = props.totals
-            console.log(total.value,'total');
+            console.log(currentPage.value,'页码');
         }
         function handleSizeChange(e) {//每页条数
             pageSize.value = e
@@ -47,7 +54,7 @@ export default {
                 pagesize: pageSize.value - 0
             }).then(res => {
                 total.value = res.count
-                emit("pageBack",res.data)
+                emit("pageBack", res.data)
             })
         }
         function handleCurrentChange(e) {//页码
@@ -57,7 +64,8 @@ export default {
                 pagesize: pageSize.value - 0
             }).then(res => {
                 total.value = res.count
-                emit("pageBack",res.data)
+                emit("currentBack",currentPage.value)
+                emit("pageBack", res.data)
             })
         }
         onMounted(() => {

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" :moduleTotal="moduleTotal"></LitLine>
+                    <LitLine v-if="selectIndex == 0" :fuckList="fuckList" :moduleTotal="moduleTotal" :lineId="lineId"></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"

src/pages/system/components/LitLine.vue

@@ -46,9 +46,10 @@
             </div>
             <div>
                 <AddLine v-if="alModal" :alModal="alModal" :sunSearch="sunSearch" @alBack="alBack"></AddLine>
-                <LookLine v-if="lookModal" :lookModal="lookModal" :needList="needList" :search="search"
+                <LookLine v-if="lookModal" :lookModal="lookModal" :flashId="flashId" :checkFlash="checkFlash" :needList="needList" :search="search"
                     @lookBack="lookBack" :listNum="listNum"></LookLine>
-                <DelLine v-if="delModal" :delModal="delModal" :needList="needList" :sunSearch="sunSearch" @delBack=delBack>
+                <DelLine v-if="delModal" :delModal="delModal" :flashId="flashId" :checkFlash="checkFlash" :needList="needList" :sunSearch="sunSearch"
+                    @delBack=delBack>
                 </DelLine>
                 <PicLook v-if="picModal" :picModal="picModal" :needList="needList" @picBack="picBack"></PicLook>
             </div>
@@ -73,7 +74,11 @@ export default {
         moduleTotal: {
             type: Number,
             required: true
-        }
+        },
+        lineId:{
+            type:String,
+            required:true,
+        },//电压等级的id
     },
     setup(props, { emit }) {
         let lineList = ref([])//
@@ -86,16 +91,51 @@ export default {
         let listNum = ref(0)//0为查看，1为编辑
         let totals = ref(0)//总条数
         let loading = ref(false)
+        let flashId = ref("")//本组件电压等级id
         watch(() => props.fuckList, (newVal) => {
             lineList.value = newVal
         })
         watch(() => props.moduleTotal, (newVal) => {
             totals.value = newVal
         })
+        watch(()=>props.lineId,(newVal)=>{
+            flashId.value = newVal
+        })
+        function checkFlash(num){
+            loading.value = true
+            litLine.getAllLine({ pageno: 1, pagesize: 20, vol_id: num - 0 }).then(res => {
+                if (res.code == 0) {
+                    loading.value = false
+                    lineList.value = res.data
+                    totals.value = res.count
+                    // counts.value = res.count
+                    // emit("lineBack", loading.value)
+                    // emit("listBack", res.data, e.id, counts.value)
+                } else {
+                    ElMessage({
+                        message: res.msg,
+                        type: "error"
+                    })
+                }
+            })
+        }
         function search() {
+            flashId.value = props.lineId
             if (totals.value) {
                 console.log('调用了search的if');
                 totals.value = props.moduleTotal
+                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
+                    }
+                })
             } else {
                 console.log('调用了search的else');
                 loading.value = true
@@ -210,6 +250,8 @@ export default {
             pageBack,//Pagination.vue返回数据
             loading,
             sunSearch,//DelLine.VUE需要的刷新
+            flashId,//本组件变电站id
+            checkFlash,//便于刷新的函数
         }
     },
     components: {

src/pages/system/modalComp/DelLine.vue

@@ -38,7 +38,15 @@ export default {
         sunSearch: {
             type: Function,
             required: true
-        }
+        },
+        flashId: {
+            type: String,
+            required: true,
+        },//litline.vue传过来的电压id
+        checkFlash: {
+            type: Function,
+            required: true,
+        },//litline.vue传过来的便于刷新页面的方法
     },
     setup(props, { emit }) {
         let dialogVisible = ref(false)
@@ -46,9 +54,14 @@ export default {
         let lastList = props.needList
         let delId = ref('')
         let { cancels, sureClick } = toRefs(props)
+        let flashIds = ref("")//本组件的电压等级id
+        watch(() => props.flashId, (newVal) => {
+            flashIds.value = newVal
+        })
         function lineList() {
             delId.value = lastList.id
             dialogVisible.value = result
+            flashIds.value = props.flashId
         }
         function canBack() {
             dialogVisible.value = false
@@ -62,7 +75,11 @@ export default {
                         message: "删除成功",
                         duration: 1500
                     })
-                    props.sunSearch()
+                    if (flashIds.value) {
+                        props.checkFlash(flashIds.value)
+                    } else {
+                        props.sunSearch()
+                    }
                     dialogVisible.value = false
                     emit("delBack", dialogVisible.value)
                 }
@@ -77,6 +94,7 @@ export default {
             cancels: canBack,
             sureClick: sureGet,
             closes: canBack,
+            flashIds,
         }
     }
 }

src/pages/system/modalComp/LookLine.vue

@@ -1,7 +1,8 @@
 <template>
     <div>
         <div>
-            <el-dialog v-model="dialogVisible" :title="titles" width="30%" @close="closes" :close-on-click-modal="false">
+            <el-dialog v-model="dialogVisible" :title="titles" width="30%" @close="closes"
+                :close-on-click-modal="false">
                 <!--  -->
                 <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-width="120px" class="demo-ruleForm"
                     status-icon>
@@ -51,7 +52,15 @@ export default {
         search: {
             type: Function,
             required: true
-        }
+        },
+        flashId: {
+            type: String,
+            required: true,
+        },//litline.vue传过来的电压id
+        checkFlash: {
+            type: Function,
+            required: true,
+        },//litline.vue传过来的便于刷新页面的方法
     },
     setup(props, { emit }) {
         let dialogVisible = ref(false)
@@ -62,6 +71,7 @@ export default {
         let selectList = ref([])
         let editId = ref("")
         let disNum = ref(false)
+        let flashIds = ref("")//本组件的电压等级id
         let { cancels, sureClick } = toRefs(props)
         let ruleForm = ref({
             name: "",
@@ -76,7 +86,11 @@ export default {
             careNum.value = newVal
             console.log(careNum.value, 'watch');
         })
+        watch(() => props.flashId, (newVal) => {
+            flashIds.value = newVal
+        })
         function searchFlashLel() {
+            flashIds.value = props.flashId
             systemRow.getChildren({ code: "voltage_level" }).then(res => {
                 if (res.data != null) {
                     selectList.value = res.data
@@ -127,7 +141,11 @@ export default {
                                     message: "修改成功",
                                     duration: 1500
                                 })
-                                props.search()
+                                if (flashIds.value) {
+                                    props.checkFlash(flashIds.value)
+                                } else {
+                                    props.search()
+                                }
                             }
                         })
                     }
@@ -158,6 +176,7 @@ export default {
             selectList,
             ruleFormRef,
             rules,
+            flashIds,//本组件的电压id
         }
     }
 }