From 6443edfb43601570fb7b54c1fe32e2624e47c2b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=B2=E4=B9=88=E4=BA=86?= <zhongchunyang@rocan.com.cn>
Date: Wed, 28 Feb 2024 11:16:40 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.ts                              |  4 ++--
 src/utils/tableStore.ts                          |  2 +-
 .../eventStatistics/ITICquxianfenxi/index.vue    |  1 +
 .../eventStatistics/SEMIF47fenxi/index.vue       |  1 +
 .../chixushijiangailvfenbu/index.vue             |  1 +
 .../dianyazanjiangbiaojimidu/index.vue           |  1 +
 .../zanjiangfenbutongji/index.vue                |  1 +
 .../zanjiangfuzhigailvfenbu/index.vue            |  1 +
 .../monitoringPoint/online/eventStudy/index.vue  |  5 ++++-
 .../voltageSags/monitoringPoint/online/index.vue | 16 ++++++++++++----
 .../online/runningCondition/index.vue            |  7 +++----
 11 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/src/router/index.ts b/src/router/index.ts
index dc4c3763..3a33c19c 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,4 +1,4 @@
-import { createRouter, createWebHashHistory } from 'vue-router'
+    import { createRouter, createWebHashHistory } from 'vue-router'
 import staticRoutes from '@/router/static'
 import { useAdminInfo } from '@/stores/adminInfo'
 import NProgress from 'nprogress'
@@ -21,7 +21,7 @@ router.beforeEach((to, from, next) => {
         // 登录或者注册才可以往下进行
         next()
     } else if (to.path == '/admin/center/homePage') {
-        window.open(window.location.origin + '/homePage')
+        window.open(window.location.origin + '/homePage/#/')
     } else {
         // 获取 token
         const adminInfo = useAdminInfo()
diff --git a/src/utils/tableStore.ts b/src/utils/tableStore.ts
index 0514c421..a12583cc 100644
--- a/src/utils/tableStore.ts
+++ b/src/utils/tableStore.ts
@@ -60,6 +60,7 @@ export default class TableStore {
     }
 
     index() {
+        this.table.beforeSearchFun && this.table.beforeSearchFun()
         this.table.data = []
         this.table.loading = true
         // 重置用的数据数据
@@ -96,7 +97,6 @@ export default class TableStore {
             [
                 'search',
                 () => {
-                    this.table.beforeSearchFun && this.table.beforeSearchFun()
                     this.table.params.pageNum = 1
                     this.index()
                 }
diff --git a/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/ITICquxianfenxi/index.vue b/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/ITICquxianfenxi/index.vue
index 61c28f28..c9be5f3c 100644
--- a/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/ITICquxianfenxi/index.vue
+++ b/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/ITICquxianfenxi/index.vue
@@ -49,6 +49,7 @@ const options = ref({})
 
 const init = () => {
     loading.value = true
+    formData.lineIndex = monitoringPoint.state.lineId
     formData.startTime = datePickerRef.value.timeValue[0]
     formData.endTime = datePickerRef.value.timeValue[1]
     getPlot(formData).then(
diff --git a/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/SEMIF47fenxi/index.vue b/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/SEMIF47fenxi/index.vue
index ed656924..1c6bd140 100644
--- a/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/SEMIF47fenxi/index.vue
+++ b/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/SEMIF47fenxi/index.vue
@@ -49,6 +49,7 @@ const options = ref({})
 
 const init = () => {
     loading.value = true
+    formData.lineIndex = monitoringPoint.state.lineId
     formData.startTime = datePickerRef.value.timeValue[0]
     formData.endTime = datePickerRef.value.timeValue[1]
     getPlot(formData).then(
diff --git a/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/chixushijiangailvfenbu/index.vue b/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/chixushijiangailvfenbu/index.vue
index ee244591..6e39b463 100644
--- a/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/chixushijiangailvfenbu/index.vue
+++ b/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/chixushijiangailvfenbu/index.vue
@@ -32,6 +32,7 @@ const options = ref({})
 
 const init = () => {
     loading.value = true
+    formData.lineIndex = monitoringPoint.state.lineId
     formData.startTime = datePickerRef.value.timeValue[0]
     formData.endTime = datePickerRef.value.timeValue[1]
     getProbabilityDistribution(formData).then(
diff --git a/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/dianyazanjiangbiaojimidu/index.vue b/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/dianyazanjiangbiaojimidu/index.vue
index 435c8ab9..acb46bd7 100644
--- a/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/dianyazanjiangbiaojimidu/index.vue
+++ b/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/dianyazanjiangbiaojimidu/index.vue
@@ -90,6 +90,7 @@ const thirdData = ref([])
 const chartsData = ref([])
 
 const init = () => {
+    formData.lineIndex = monitoringPoint.state.lineId
     formData.startTime = datePickerRef.value.timeValue[0]
     formData.endTime = datePickerRef.value.timeValue[1]
     loading.value = true
diff --git a/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/zanjiangfenbutongji/index.vue b/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/zanjiangfenbutongji/index.vue
index 0208c492..c0f31807 100644
--- a/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/zanjiangfenbutongji/index.vue
+++ b/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/zanjiangfenbutongji/index.vue
@@ -45,6 +45,7 @@ const thirdData = ref<any>([])
 const init = () => {
 
     loading.value = true
+    formData.lineIndex = monitoringPoint.state.lineId
     formData.startTime = datePickerRef.value.timeValue[0]
     formData.endTime = datePickerRef.value.timeValue[1]
     formData.flag = datePickerRef.value.interval
diff --git a/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/zanjiangfuzhigailvfenbu/index.vue b/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/zanjiangfuzhigailvfenbu/index.vue
index 0ba250a1..38f77011 100644
--- a/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/zanjiangfuzhigailvfenbu/index.vue
+++ b/src/views/pqs/voltageSags/monitoringPoint/online/eventStatistics/zanjiangfuzhigailvfenbu/index.vue
@@ -32,6 +32,7 @@ const options = ref({})
 
 const init = () => {
     loading.value = true
+    formData.lineIndex = monitoringPoint.state.lineId
     formData.startTime = datePickerRef.value.timeValue[0]
     formData.endTime = datePickerRef.value.timeValue[1]
     getProbabilityDistribution(formData).then(
diff --git a/src/views/pqs/voltageSags/monitoringPoint/online/eventStudy/index.vue b/src/views/pqs/voltageSags/monitoringPoint/online/eventStudy/index.vue
index 1303f64c..219f1959 100644
--- a/src/views/pqs/voltageSags/monitoringPoint/online/eventStudy/index.vue
+++ b/src/views/pqs/voltageSags/monitoringPoint/online/eventStudy/index.vue
@@ -74,6 +74,10 @@ const tableStore = new TableStore({
             ]
         }
     ],
+    beforeSearchFun: () => {
+        tableStore.table.params.lineId = monitoringPoint.state.lineId
+        console.log('beforeSearchFun')
+    },
     loadCallback: () => {
         tableStore.table.data.forEach((item: any) => {
             item.eventTypeName = eventTypeOptions.find(item2 => item2.id === item.eventType)?.name
@@ -82,7 +86,6 @@ const tableStore = new TableStore({
     }
 })
 provide('tableStore', tableStore)
-tableStore.table.params.lineId = monitoringPoint.state.lineId
 tableStore.table.params.searchState = 0
 onMounted(() => {
     // 加载数据
diff --git a/src/views/pqs/voltageSags/monitoringPoint/online/index.vue b/src/views/pqs/voltageSags/monitoringPoint/online/index.vue
index f4ed2049..3590dd3c 100644
--- a/src/views/pqs/voltageSags/monitoringPoint/online/index.vue
+++ b/src/views/pqs/voltageSags/monitoringPoint/online/index.vue
@@ -4,13 +4,13 @@
             <el-tab-pane label='导航' name='1' :style='height' lazy>
                 <Navigation @changeTab='changeTab' />
             </el-tab-pane>
-            <el-tab-pane label='事件统计' name='2' lazy>
+            <el-tab-pane label='事件统计' name='2' lazy v-if='!isReload'>
                 <EventStatistics />
             </el-tab-pane>
-            <el-tab-pane label='事件分析' name='3' lazy>
+            <el-tab-pane label='事件分析' name='3' lazy v-if='!isReload'>
                 <EventStudy />
             </el-tab-pane>
-            <el-tab-pane label='运行情况' name='4' lazy :style='height'>
+            <el-tab-pane label='运行情况' name='4' lazy :style='height' v-if='!isReload'>
                 <RunningCondition />
             </el-tab-pane>
         </el-tabs>
@@ -18,7 +18,7 @@
     </div>
 </template>
 <script setup lang='ts'>
-import { defineOptions, ref, watch } from 'vue'
+import { defineOptions, nextTick, ref, watch } from 'vue'
 import Navigation from './navigation/index.vue'
 import EventStatistics from './eventStatistics/index.vue'
 import EventStudy from './eventStudy/index.vue'
@@ -30,6 +30,7 @@ import { useMonitoringPoint } from '@/views/pqs/voltageSags/monitoringPoint/onli
 defineOptions({
     name: 'Descentsystem/monitoringpoint'
 })
+const isReload = ref(false)
 const monitoringPoint = useMonitoringPoint()
 const height = mainHeight(82)
 const activeName = ref('1')
@@ -43,6 +44,13 @@ watch(
     },
     { immediate: true }
 )
+watch(() => monitoringPoint.state.lineId, () => {
+    //  刷新页面
+    isReload.value = true
+    nextTick(() => {
+        isReload.value = false
+    })
+})
 const changeTab = (e: string) => {
     activeName.value = e
 }
diff --git a/src/views/pqs/voltageSags/monitoringPoint/online/runningCondition/index.vue b/src/views/pqs/voltageSags/monitoringPoint/online/runningCondition/index.vue
index 7a5758eb..59b76b3d 100644
--- a/src/views/pqs/voltageSags/monitoringPoint/online/runningCondition/index.vue
+++ b/src/views/pqs/voltageSags/monitoringPoint/online/runningCondition/index.vue
@@ -24,7 +24,7 @@
     </div>
 </template>
 <script setup lang='ts'>
-import { nextTick, onMounted, reactive, ref } from 'vue'
+import { nextTick, onMounted, reactive, ref, watch } from 'vue'
 import DatePicker from '@/components/form/datePicker/index.vue'
 import MyEchart from '@/components/echarts/MyEchart.vue'
 import { useMonitoringPoint } from '@/views/pqs/voltageSags/monitoringPoint/online/store'
@@ -35,7 +35,7 @@ const datePickerRef = ref()
 const loading = ref(true)
 const monitoringPoint = useMonitoringPoint()
 const formData = reactive({
-    id: monitoringPoint.state.lineId,
+    id: '',
     searchBeginTime: '',
     searchEndTime: '',
     timeFlag: 1
@@ -45,10 +45,9 @@ const secondOptions = ref<any>({})
 const firstData = ref<any>([])
 const secondData = ref<any>([])
 
-
 const init = () => {
-
     loading.value = true
+    formData.id = monitoringPoint.state.lineId
     formData.searchBeginTime = datePickerRef.value.timeValue[0]
     formData.searchEndTime = datePickerRef.value.timeValue[1]
     formData.timeFlag = datePickerRef.value.interval