北京一号线现地 道岔 站台实训操作步骤代码调整

src/jmapNew/shape/StationStand/index.js

@@ -491,8 +491,37 @@ class StationStand extends Group {
         return rect;
     }
 
-    getShapeTipPoint() {
+    getShapeTipPoint(opts) {
-        const rect = this.getBoundingRect();
+        let rect;
+        if (opts.subDeviceType == 'DetainLamp') {
+            if (this.model.right) {
+                opts.subDeviceType = 'UpDetainLamp';
+            } else {
+                opts.subDeviceType = 'DownDetainLamp';
+            }
+        }
+        switch (opts.subDeviceType) {
+        case 'StopJumpLamp': {
+            rect = this.stopJumpLampButton.getBoundingRect();
+            break;
+        }
+        case 'CancelStopJumpLamp': {
+            rect = this.cancelStopJumpLampButton.getBoundingRect();
+            break;
+        }
+        case 'UpDetainLamp': {
+            rect = this.upDetainLampButton.getBoundingRect();
+            break;
+        }
+        case 'DownDetainLamp': {
+            rect = this.downDetainLampButton.getBoundingRect();
+            break;
+        }
+        default: {
+            rect = this.getBoundingRect();
+            break;
+        }
+        }
         if (rect) {
             return {
                 x: rect.x + rect.width / 2,

src/scripts/OperationConfig.js

@@ -879,7 +879,7 @@ export const OperationList = {
                 productTypes: ['01'], // 产品类型 01 现地 02 行调
                 stepVOList: [
                     { deviceType: '06', orderNum: 1, operateCode: '2993', tip: '鼠标左键点击【功能按钮】'},
-                    { deviceType: '06', orderNum: 2, operateCode: '2993', tip: '鼠标左键点击【车站】', codeType:'STAND'}
+                    { deviceType: 'DetainLamp', orderNum: 2, operateCode: '504', tip: '鼠标左键点击【{12}扣车】', codeType:'STAND'}
                 ]
             },
             {
@@ -907,7 +907,7 @@ export const OperationList = {
                 productTypes: ['01'], // 产品类型 01 现地 02 行调
                 stepVOList: [
                     { deviceType: '06', orderNum: 1, operateCode: '2994', tip: '鼠标左键点击【总取消】' },
-                    { deviceType: '06', orderNum: 2, operateCode: '2994', tip: '鼠标左键点击【车站】', codeType:'STAND' }
+                    { deviceType: 'DetainLamp', orderNum: 2, operateCode: '505', tip: '鼠标左键点击【{12}扣车】', codeType:'STAND'}
                 ]
             },
             {
@@ -1221,7 +1221,7 @@ export const OperationList = {
                 productTypes: ['01'],
                 stepVOList: [
                     { deviceType: '02', orderNum: 1, operateCode: '1020', tip: '鼠标左键点击【道岔总反】' },
-                    { deviceType: '02', orderNum: 2, operateCode: '1020', tip: '鼠标左键点击【道岔】', codeType:'SWITCH' }
+                    { deviceType: '02', orderNum: 2, operateCode: '102', tip: '鼠标左键点击【道岔】', codeType:'SWITCH' }
                 ]
             },
             {
@@ -1235,7 +1235,7 @@ export const OperationList = {
                 productTypes: ['01'],
                 stepVOList: [
                     { deviceType: '02', orderNum: 1, operateCode: '1010', tip: '鼠标左键点击【道岔总定】' },
-                    { deviceType: '02', orderNum: 2, operateCode: '1010', tip: '鼠标左键点击【道岔】', codeType:'SWITCH' }
+                    { deviceType: '02', orderNum: 2, operateCode: '101', tip: '鼠标左键点击【道岔】', codeType:'SWITCH' }
                 ]
             },
             {
@@ -1249,7 +1249,7 @@ export const OperationList = {
                 productTypes: ['01'],
                 stepVOList: [
                     { deviceType: '02', orderNum: 1, operateCode: '1030', tip: '鼠标左键点击【道岔单锁】' },
-                    { deviceType: '02', orderNum: 2, operateCode: '1030', tip: '鼠标左键点击【道岔】', codeType:'SWITCH' }
+                    { deviceType: '02', orderNum: 2, operateCode: '103', tip: '鼠标左键点击【道岔】', codeType:'SWITCH' }
                 ]
             },
             {
@@ -1263,7 +1263,8 @@ export const OperationList = {
                 productTypes: ['01'],
                 stepVOList: [
                     { deviceType: '02', orderNum: 1, operateCode: '1040', tip: '鼠标左键点击【道岔解锁】' },
-                    { deviceType: '02', orderNum: 2, operateCode: '1040', tip: '鼠标左键点击【道岔】', codeType:'SWITCH' }
+                    { deviceType: '02', orderNum: 2, operateCode: '104', tip: '鼠标左键点击【道岔】', codeType:'SWITCH' },
+                    { deviceType: '02', orderNum: 3, operateCode: '104', tip: '鼠标左键点击【确定】'}
                 ]
             },
             {

src/scripts/cmdPlugin/ValidateHandler.js

@@ -61,6 +61,7 @@ class ValidateHandler {
             const standard = steps[order];
             if (operate && standard &&
                         operate.operation == standard.operation &&
+                        operate.code == standard.code &&
                         operate.val == standard.val) {
                 valid = true;
             }

src/views/newMap/mapsystemNew/plugin/trainingtip.vue

@@ -41,7 +41,6 @@ export default {
                 this.$store.dispatch('training/isTeachMode').then(() => {
                     this.tipShow = true;
                     const offset = this.$store.state.config.canvasOffset;
-                    console.log(offset, '-------------------');
                     if (this.$store.state.training.started) {
                         const order = this.$store.state.training.order;
                         const steps = this.$store.state.training.steps;