南京二号线现地实操获取控制权调整

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

@@ -205,9 +205,13 @@ export default {
                 this.checkRoleChange(list);
             }
         },
-        '$store.state.trainingNew.trainingDetail': function(val) {
-            if (val && val.type) {
-                this.login();
+        '$store.state.trainingNew.trainingSwitch': function(val) {
+            if (val) {
+                this.loginText = '登录';
+                this.inputStr = '';
+                this.keydownTimes = 0;
+                this.modelType = 'text';
+                this.$emit('login', '');
             }
         },
         '$store.state.socket.simulationAlarmInfo': function(val) {
@@ -351,6 +355,9 @@ export default {
                     keydownTimes: this.keydownTimes
                 }
             };
+            if (this.keydownTimes === 1) {
+                operate.cancel = true;
+            }
             this.$store.dispatch('trainingNew/next', operate).then(valid => {
                 if (valid) {
                     if (this.keydownTimes === 0) {

src/jmapNew/theme/nanjing_02/menus/localWorkMenuButton.vue

@@ -887,10 +887,10 @@ export default {
                     step.val = row.name;
                 }
 
-                if (row.fillStationCode) {
-                    const station = this.stationObj || {};
-                    step.code = station.code;
-                }
+                // if (row.fillStationCode) {
+                //     const station = this.stationObj || {};
+                //     step.code = station.code;
+                // }
 
                 if (row.param) {
                     this.param = row.param;

src/scripts/cmdPlugin/newHandler.js

@@ -89,7 +89,7 @@ class Handler {
     getTrainingOperation() {
         const stepInfo = store.state.trainingNew.stepInfo;
         const operateOrder = store.state.trainingNew.operateOrder;
-        return stepInfo.operations[operateOrder];
+        return stepInfo.operations ? stepInfo.operations[operateOrder] : {};
     }
     // 是否为步骤最后一步操作
     isLastOperation() {