From cc4c6b0d65e1f2c1b62e5c43ed2f8ff9765e26cb Mon Sep 17 00:00:00 2001
From: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Thu, 27 Jul 2023 15:22:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E8=B7=B3=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/MainLayout.vue    |  2 ++
 src/pages/LineMonitorPage.vue |  2 --
 src/pages/MonitorPage.vue     | 12 ++++++++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue
index f34b534..bc0cede 100644
--- a/src/layouts/MainLayout.vue
+++ b/src/layouts/MainLayout.vue
@@ -112,6 +112,7 @@
       </q-form>
     </q-card>
   </q-dialog>
+  <commonAlarm v-show="route.path.includes('monitor')" />
 </template>
 
 <script setup lang="ts">
@@ -122,6 +123,7 @@ import { Dialog, useQuasar } from 'quasar';
 import { clearJwtToken } from 'src/configs/TokenManage';
 import { mockAlertSet } from 'src/api/AlertMock';
 import alarmInfoList from 'src/components/alarm/alarmInfoList.vue';
+import commonAlarm from 'src/components/alarm/commonAlarm.vue';
 
 const leftDrawerOpen = ref(false);
 const router = useRouter();
diff --git a/src/pages/LineMonitorPage.vue b/src/pages/LineMonitorPage.vue
index fdd80f4..fedaa11 100644
--- a/src/pages/LineMonitorPage.vue
+++ b/src/pages/LineMonitorPage.vue
@@ -2,7 +2,6 @@
   <q-page class="row items-center justify-evenly">
     <div id="line-app-container"></div>
   </q-page>
-  <commonAlarm />
 </template>
 
 <script setup lang="ts">
@@ -10,7 +9,6 @@ import { onMounted, ref, watch } from 'vue';
 import { useLineStore } from 'src/stores/line-store';
 import { useRoute } from 'vue-router';
 import { loadLineDatas, getLineApp } from 'src/drawApp/lineApp';
-import commonAlarm from 'src/components/alarm/commonAlarm.vue';
 
 const props = withDefaults(
   defineProps<{
diff --git a/src/pages/MonitorPage.vue b/src/pages/MonitorPage.vue
index 315b3fe..6032bb0 100644
--- a/src/pages/MonitorPage.vue
+++ b/src/pages/MonitorPage.vue
@@ -2,7 +2,6 @@
   <q-page class="row items-center justify-evenly">
     <div id="line-app-container"></div>
   </q-page>
-  <commonAlarm />
 </template>
 
 <script setup lang="ts">
@@ -11,7 +10,6 @@ import { useLineNetStore } from 'src/stores/line-net-store';
 import { loadLineNetDatas, getLineNetApp } from 'src/drawApp/lineNetApp';
 import { RunLine } from 'src/graphics/runLine/RunLine';
 import { useRouter } from 'vue-router';
-import commonAlarm from 'src/components/alarm/commonAlarm.vue';
 
 const props = withDefaults(
   defineProps<{
@@ -47,6 +45,16 @@ watch(
   }
 );
 
+watch(
+  () => lineNetStore.alarmInfo,
+  (val) => {
+    if (val.length && !lineNetStore.alarmDialog) {
+      router.replace('/line/monitor/3');
+    }
+  },
+  { deep: true }
+);
+
 function onResize() {
   const dom = document.getElementById('line-app-container');
   if (dom) {