宁波一号线 键盘操作调整（回车事件）

src/jmapNew/theme/components/menus/dialog/switchControl.vue

@@ -137,6 +137,13 @@ export default {
             return '';
         }
     },
+    watch:{
+        '$store.state.map.keyboardEnterCount': function (val) {
+            if (this.dialogShow && this.popClass === 'ningbo-01__systerm') {
+                this.commit();
+            }
+        }
+    },
     mounted() {
         this.$nextTick(() => {
             this.$store.dispatch('training/tipReload');

src/jmapNew/theme/components/menus/dialog/switchHookLock.vue

@@ -79,6 +79,13 @@ export default {
             return this.dialogShow && !this.$store.state.menuOperation.break;
         }
     },
+    watch:{
+        '$store.state.map.keyboardEnterCount': function (val) {
+            if (this.dialogShow && this.popClass === 'ningbo-01__systerm') {
+                this.commit();
+            }
+        }
+    },
     mounted() {
         this.$nextTick(() => {
             this.$store.dispatch('training/tipReload');

src/jmapNew/theme/ningbo_01/menus/dialog/switchUnLock.vue

@@ -28,7 +28,7 @@
       <div style="overflow: hidden;">
         <div>道岔</div>
         <el-col :span="11">
-          <el-select :id="domIdChoose" v-model="messageText2" filterable size="mini" :disabled="disabledConfirm2" @change="SelectChange">
+          <el-select :id="domIdChoose" ref="selectSwitch" v-model="messageText2" filterable size="mini" :disabled="disabledConfirm2" @change="SelectChange">
             <el-option v-for="option in filterSwitchList" :key="option.code" :label="option.name" :value="option.code" />
           </el-select>
         </el-col>
@@ -140,6 +140,17 @@ export default {
             return '';
         }
     },
+    watch:{
+        '$store.state.map.keyboardEnterCount': function (val) {
+            if (this.dialogShow) {
+                if (this.disabledConfirm2 && !this.disabledConfirm1) {
+                    this.confirm1();
+                } else if (this.disabledConfirm1 && !this.disabledConfirm2 ) {
+                    this.confirm2();
+                }
+            }
+        }
+    },
     mounted() {
         this.$nextTick(() => {
             this.$store.dispatch('training/tipReload');
@@ -180,7 +191,6 @@ export default {
             this.$store.dispatch('training/emitTipFresh');
             mouseCancelState(this.selected);
         },
-
         SelectChange() {
             const operate = {
                 operation: '',
@@ -197,6 +207,7 @@ export default {
             this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.selectSwitch.blur();
                 }
             }).catch(() => {
                 this.$refs.noticeInfo.doShow();

src/jmapNew/theme/ningbo_01/menus/menuSwitch.vue

@@ -94,11 +94,11 @@ export default {
                         handler: this.reverse,
                         cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION
                     },
-                    {
+                    // {
-                        label: '道岔单锁',
+                    //     label: '道岔单锁',
-                        handler: this.lock,
+                    //     handler: this.lock,
-                        cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK
+                    //     cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK
-                    },
+                    // },
                     {
                         type: 'separator'
                     },