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