From 731c716036b49d0e46540003f2571429aed1ce82 Mon Sep 17 00:00:00 2001 From: fan Date: Fri, 7 Jul 2023 11:22:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/components/menus/menuBarNew.vue | 6 ++++++ src/jmapNew/theme/datie_02/menus/dispatchWorkMenuBar.vue | 2 +- src/jmapNew/theme/datie_02/menus/localWorkMenuBar.vue | 2 +- src/views/newMap/display/terminals/dispatcherManage.vue | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/jmapNew/theme/components/menus/menuBarNew.vue b/src/jmapNew/theme/components/menus/menuBarNew.vue index 88020390f..5819fe4be 100644 --- a/src/jmapNew/theme/components/menus/menuBarNew.vue +++ b/src/jmapNew/theme/components/menus/menuBarNew.vue @@ -54,6 +54,12 @@ export default { } }, mounted() { + const self = this; + window.onclick = function (e) { + if (document.getElementById('menuBar') && !self.$store.state.training.trainingStart) { + self.doClose(false); + } + }; this.initMenu(); }, methods: { diff --git a/src/jmapNew/theme/datie_02/menus/dispatchWorkMenuBar.vue b/src/jmapNew/theme/datie_02/menus/dispatchWorkMenuBar.vue index 18f177812..77c0cd390 100644 --- a/src/jmapNew/theme/datie_02/menus/dispatchWorkMenuBar.vue +++ b/src/jmapNew/theme/datie_02/menus/dispatchWorkMenuBar.vue @@ -65,7 +65,7 @@ export default { operate: OperationEvent.StationControl.requestStationControl.mbar }, { - title: 'Forced Station Control', + title: 'Emergency Station Control', click: this.mandatoryStationControl, operate: OperationEvent.StationControl.forcedStationControl.password }, diff --git a/src/jmapNew/theme/datie_02/menus/localWorkMenuBar.vue b/src/jmapNew/theme/datie_02/menus/localWorkMenuBar.vue index e54c2f305..b21903c67 100644 --- a/src/jmapNew/theme/datie_02/menus/localWorkMenuBar.vue +++ b/src/jmapNew/theme/datie_02/menus/localWorkMenuBar.vue @@ -67,7 +67,7 @@ export default { operate: OperationEvent.StationControl.requestStationControl.mbar }, { - title: 'Forced Station Control', + title: 'Emergency Station Control', click: this.mandatoryStationControl, operate: OperationEvent.StationControl.forcedStationControl.password }, diff --git a/src/views/newMap/display/terminals/dispatcherManage.vue b/src/views/newMap/display/terminals/dispatcherManage.vue index ad6d1e773..0e2ab2ae6 100644 --- a/src/views/newMap/display/terminals/dispatcherManage.vue +++ b/src/views/newMap/display/terminals/dispatcherManage.vue @@ -49,7 +49,7 @@ export default { imgUrl: CmdIcon }, { - label: 'Station yard map', + label: 'Station Layout Diagram', refPath: 'dispatchWork', domId: 'dispatchWork', imgUrl: ZhanchangIcon