From 2144a4c31de8f45bbb28e7356a69982a3b3b449b Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Thu, 29 Dec 2022 14:42:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=90=E9=83=BD=E4=B8=80?=
 =?UTF-8?q?=E5=92=8C=E8=A5=BF=E5=AE=89=E4=BA=8C=E7=9A=84=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=A0=86=E6=A0=88=E5=AE=9E=E8=AE=AD=E5=BC=80?=
 =?UTF-8?q?=E5=A7=8B=E9=83=BD=E8=87=AA=E5=8A=A8=E5=85=B3=E9=97=AD=EF=BC=9B?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/theme/chengdu_01/menus/menuBar.vue     |  1 -
 src/jmapNew/theme/chengdu_01/menus/menuRequest.vue |  5 +++++
 .../theme/chengdu_01/menus/passiveDialog/alarm.vue | 14 ++++++++------
 src/jmapNew/theme/xian_02/menus/menuRequest.vue    |  5 +++++
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/jmapNew/theme/chengdu_01/menus/menuBar.vue b/src/jmapNew/theme/chengdu_01/menus/menuBar.vue
index 4e1caca77..3efb5f524 100644
--- a/src/jmapNew/theme/chengdu_01/menus/menuBar.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/menuBar.vue
@@ -234,7 +234,6 @@ export default {
                 menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
                 this.menu.push(menuItem);
             });
-            console.log('🚀 ~ file: menuBar.vue:224 ~ initMenu ~ menu', this.menu);
             if (this.menu.length) {
                 this.menu[2].children = this.initStationList();
                 this.clickEvent();
diff --git a/src/jmapNew/theme/chengdu_01/menus/menuRequest.vue b/src/jmapNew/theme/chengdu_01/menus/menuRequest.vue
index 70c82d7c4..b86673e5a 100644
--- a/src/jmapNew/theme/chengdu_01/menus/menuRequest.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/menuRequest.vue
@@ -83,6 +83,11 @@ export default {
                     }
                 });
             }
+        },
+        '$store.state.trainingNew.trainingSwitch': function (val) {
+            if (val && !this.unfold) {
+                this.unfold = true;
+            }
         }
     },
     mounted() {
diff --git a/src/jmapNew/theme/chengdu_01/menus/passiveDialog/alarm.vue b/src/jmapNew/theme/chengdu_01/menus/passiveDialog/alarm.vue
index c25df3eb5..9a04dfd5d 100644
--- a/src/jmapNew/theme/chengdu_01/menus/passiveDialog/alarm.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/passiveDialog/alarm.vue
@@ -130,13 +130,15 @@ export default {
                 if (elem.success) {
                     const operate = this.$store.state.training.operate;
                     const control = this.$store.getters['map/getDeviceByCode'](elem.stationControlCode);
-                    const station = this.$store.getters['map/getDeviceByCode'](control.stationCode);
-                    const newOperate = {
-                        type: operate.type,
-                        name: station.name
-                    };
+                    if (control && control.stationCode) {
+                        const station = this.$store.getters['map/getDeviceByCode'](control.stationCode);
+                        const newOperate = {
+                            type: operate.type,
+                            name: station.name
+                        };
 
-                    this.doShow(newOperate);
+                        this.doShow(newOperate);
+                    }
                 }
             }
         }
diff --git a/src/jmapNew/theme/xian_02/menus/menuRequest.vue b/src/jmapNew/theme/xian_02/menus/menuRequest.vue
index 9decaf67e..939f55d74 100644
--- a/src/jmapNew/theme/xian_02/menus/menuRequest.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuRequest.vue
@@ -99,6 +99,11 @@ export default {
                     }
                 });
             }
+        },
+        '$store.state.trainingNew.trainingSwitch': function (val) {
+            if (val && !this.unfold) {
+                this.unfold = true;
+            }
         }
     },
     mounted() {