Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev

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

@@ -133,13 +133,13 @@ export default {
         },
         commit() {
             const operate = {
-                send: true,
-                type: MapDeviceType.Signal.type,
-                operation: OperationEvent.Signal.detail.menu.operation
+                over: true,
+                operation: OperationEvent.Signal.detail.menu.operation,
+                cmdType: CMD.Signal.CMD_SIGNAL_DETAIL
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -156,7 +156,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }

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

@@ -27,7 +27,6 @@
       <span class="base-label" style="left: 2px;">确认</span>
       <div style="overflow: hidden;">
         <div>操作设备</div>
-        {{disabledConfirm2}}
         <el-col :span="11">
             <el-select :id="domIdChoose" v-model="messageText2" filterable size="mini" :disabled="disabledConfirm2" @change="SelectChange">
               <el-option v-for="option in signalList" :key="option.code" :label="option.name" :value="option.name" />