diff --git a/src/jmapNew/theme/chengdu_03/menus/dispatchWorkMenu.vue b/src/jmapNew/theme/chengdu_03/menus/dispatchWorkMenu.vue index e3fda315d..ed43be196 100644 --- a/src/jmapNew/theme/chengdu_03/menus/dispatchWorkMenu.vue +++ b/src/jmapNew/theme/chengdu_03/menus/dispatchWorkMenu.vue @@ -58,7 +58,16 @@ export default { mounted() { this.$nextTick(() => { this.$store.dispatch('config/updateMenuBar'); + const _that = this; + window.onclick = function (e) { + if (!_that.$store.state.training.trainingStart) { + _that.$refs.menuBar && _that.$refs.menuBar.blankClickClose(); + } + }; }); + }, + beforeDestroy() { + window.onclick = function (e) {}; } }; diff --git a/src/jmapNew/theme/chengdu_03/menus/dispatchWorkMenuBar.vue b/src/jmapNew/theme/chengdu_03/menus/dispatchWorkMenuBar.vue index 74c576be1..93aff0a39 100644 --- a/src/jmapNew/theme/chengdu_03/menus/dispatchWorkMenuBar.vue +++ b/src/jmapNew/theme/chengdu_03/menus/dispatchWorkMenuBar.vue @@ -372,6 +372,9 @@ export default { this.$refs.helpAbout.doShow(operate); } }); + }, + blankClickClose() { + this.$refs.menuBar.doClose(); } } }; diff --git a/src/jmapNew/theme/chengdu_03/menus/localWorkMenu.vue b/src/jmapNew/theme/chengdu_03/menus/localWorkMenu.vue index b3cb3a4df..f20200129 100644 --- a/src/jmapNew/theme/chengdu_03/menus/localWorkMenu.vue +++ b/src/jmapNew/theme/chengdu_03/menus/localWorkMenu.vue @@ -33,7 +33,16 @@ export default { mounted() { this.$nextTick(() => { this.$store.dispatch('config/updateMenuBar'); + const _that = this; + window.onclick = function (e) { + if (!_that.$store.state.training.trainingStart) { + _that.$refs.menuBar && _that.$refs.menuBar.blankClickClose(); + } + }; }); + }, + beforeDestroy() { + window.onclick = function (e) {}; } }; diff --git a/src/jmapNew/theme/chengdu_03/menus/localWorkMenuBar.vue b/src/jmapNew/theme/chengdu_03/menus/localWorkMenuBar.vue index f6ecdebcf..34190d805 100644 --- a/src/jmapNew/theme/chengdu_03/menus/localWorkMenuBar.vue +++ b/src/jmapNew/theme/chengdu_03/menus/localWorkMenuBar.vue @@ -328,6 +328,9 @@ export default { this.$refs.helpAbout.doShow(operate); } }); + }, + blankClickClose() { + this.$refs.menuBar.doClose(); } } }; diff --git a/src/jmapNew/theme/datie_02/menus/ctcWorkMenu.vue b/src/jmapNew/theme/datie_02/menus/ctcWorkMenu.vue index 7d8b73d35..7a3b42018 100644 --- a/src/jmapNew/theme/datie_02/menus/ctcWorkMenu.vue +++ b/src/jmapNew/theme/datie_02/menus/ctcWorkMenu.vue @@ -1,5 +1,5 @@