Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1

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();

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() {

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);
+                    if (control && control.stationCode) {
-                    const newOperate = {
+                        const station = this.$store.getters['map/getDeviceByCode'](control.stationCode);
-                        type: operate.type,
+                        const newOperate = {
-                        name: station.name
+                            type: operate.type,
-                    };
+                            name: station.name
+                        };
 
-                    this.doShow(newOperate);
+                        this.doShow(newOperate);
+                    }
                 }
             }
         }

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() {