Merge remote-tracking branch 'origin/test' into test

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) {};
     }
 };
 </script>

src/jmapNew/theme/chengdu_03/menus/dispatchWorkMenuBar.vue

@@ -372,6 +372,9 @@ export default {
                     this.$refs.helpAbout.doShow(operate);
                 }
             });
+        },
+        blankClickClose() {
+            this.$refs.menuBar.doClose();
         }
     }
 };

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) {};
     }
 };
 </script>

src/jmapNew/theme/chengdu_03/menus/localWorkMenuBar.vue

@@ -328,6 +328,9 @@ export default {
                     this.$refs.helpAbout.doShow(operate);
                 }
             });
+        },
+        blankClickClose() {
+            this.$refs.menuBar.doClose();
         }
     }
 };

src/jmapNew/theme/datie_02/menus/ctcWorkMenu.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="menus" :style="{width: width + 'px'}">
+  <div class="menus" :style="{width: width + 'px', height: '100%'}">
     <div class="title">{{ `哈尔滨局CTC3.0(车务终端A机)--王岗：${dateString}第一班 18:00 管理员代--` }}</div>
     <menu-bar ref="menuBar" :selected="selected" />
     <div style="position: absolute; top: 64px;z-index: 10;background: #F0F0F0;padding: 2px;height: 65px;width: 100%;">