调整西安二号线操作

src/jmapNew/shape/Switch/index.js

@@ -159,7 +159,8 @@ export default class Switch extends Group {
             _subType: 'enabled', // 标识
             style: {
                 x: nameTextX,
-                y: nameTextY + directy * 20,
+                // y: nameTextY + directy * 20,
+                y: nameTextY + 20,
                 fontSize: 12,
                 text: 'E',
                 textAlign: 'center',

src/jmapNew/theme/xian_02/menus/menuRequest.vue

@@ -19,14 +19,14 @@
           <el-button size="mini" style="float: right;" @click="cancel">撤销</el-button>
         </el-col>
       </el-row>
-      <el-row justify="center" class="button-group">
+      <div class="button-group" style="overflow: hidden;">
-        <el-col :span="8" class="button-bottom-left">
+        <div class="button-bottom-left">
           <el-button :id="domIdConfirm" size="mini" style="float: left;" :loading="loading" @click="commit">发送请求</el-button>
-        </el-col>
+        </div>
-        <el-col :span="8" :offset="8" class="button-bottom-right">
+        <div class="button-bottom-right">
           <el-button :id="domIdCancel" size="mini" style="float: right;" @click="cancel">取消请求</el-button>
-        </el-col>
+        </div>
-      </el-row>
+      </div>
       <notice-info ref="noticeInfo" pop-class="xian-02__system" />
     </div>
   </div>
@@ -132,7 +132,7 @@ export default {
                 this.$store.dispatch('training/updateMapState', [deviceStatus]);
             } else {
                 operate = {
-                    send: true,
+                    over: true,
                     operation: eachCmd.operation.code,
                     cmdType: eachCmd.cmdType,
                     param: eachCmd.param // 请求栈中参数配置
@@ -168,10 +168,8 @@ export default {
         height: auto;
         position: absolute;
         bottom: 10px;
-        left: 50%;
+		left: calc(50% - 300px);
-        background: #fff;
         z-index: 10;
-        transform: translateX(-300px);
         background: #518E86;
 
         .title-box{
@@ -233,6 +231,8 @@ export default {
                     }
                 }
                 .button-bottom-left{
+					overflow: hidden;
+					float: left;
                     .el-button{
                         width: 60px;
                         padding: 0;
@@ -247,6 +247,8 @@ export default {
                     }
                 }
                 .button-bottom-right{
+					overflow: hidden;
+					float: right;
                     .el-button{
                         width: 60px;
                         padding: 0;

src/jmapNew/theme/xian_02/menus/menuSignal.vue

@@ -336,7 +336,7 @@ export default {
                         this.resetRouteSignal();
                         this.$store.dispatch('menuOperation/pushRequestList', {
                             device: this.routeData[routeCode],
-                            operation: { code: OperationEvent.Signal.arrangementRoute.menu.operation, name: '排列进路'},
+                            operation: { code: OperationEvent.Command.commandXian.confirm.operation, name: '排列进路'},
                             cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE,
                             param: step.param
                         });
@@ -363,7 +363,7 @@ export default {
                     this.resetRouteSignal();
                     this.$store.dispatch('menuOperation/pushRequestList', {
                         device: this.selected,
-                        operation: { code: OperationEvent.Signal.arrangementRoute.menu.operation, name: '取消进路'},
+                        operation: { code: OperationEvent.Command.commandXian.confirm.operation, name: '取消进路'},
                         cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE,
                         param: step.param
                     });
@@ -388,7 +388,7 @@ export default {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$store.dispatch('menuOperation/pushRequestList', {
                         device: this.selected,
-                        operation: { code: OperationEvent.Signal.lock.menu.operation, name: '终端信号封锁'},
+                        operation: { code: OperationEvent.Command.commandXian.confirm.operation, name: '终端信号封锁'},
                         param: {signalCode: this.selected.code},
                         cmdType: CMD.Signal.CMD_SIGNAL_BLOCK
                     });
@@ -414,7 +414,7 @@ export default {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$store.dispatch('menuOperation/pushRequestList', {
                         device: this.selected,
-                        operation: { code: OperationEvent.Signal.lock.menu.operation, name: '终端信号解封'},
+                        operation: { code: OperationEvent.Command.commandXian.confirm.operation, name: '终端信号解封'},
                         ciConfirm: true,
                         param: {signalCode: this.selected.code}
                     });
@@ -440,7 +440,7 @@ export default {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$store.dispatch('menuOperation/pushRequestList', {
                         device: this.selected,
-                        operation: { code: OperationEvent.Signal.guide.menu.operation, name: '引导信号'},
+                        operation: { code: OperationEvent.Command.commandXian.confirm.operation, name: '引导信号'},
                         cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE,
                         param: step.param
                     });
@@ -471,7 +471,7 @@ export default {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$store.dispatch('menuOperation/pushRequestList', {
                         device: this.selected,
-                        operation: { code: OperationEvent.Signal.humanControl.menu.operation, name: '关闭自动进路'},
+                        operation: { code: OperationEvent.Command.commandXian.confirm.operation, name: '关闭自动进路'},
                         cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING,
                         param: step.param
                     });
@@ -503,7 +503,7 @@ export default {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$store.dispatch('menuOperation/pushRequestList', {
                         device: this.selected,
-                        operation: { code: OperationEvent.Signal.atsAutoControl.menu.operation, name: '开放自动进路'},
+                        operation: { code: OperationEvent.Command.commandXian.confirm.operation, name: '开放自动进路'},
                         cmdType: CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING,
                         param: step.param
                     });
@@ -539,7 +539,7 @@ export default {
         enabledConfirm() {
             this.$store.dispatch('menuOperation/pushRequestList', {
                 device: this.selected,
-                operation: { code: OperationEvent.Signal.unlock.menu.operation, name: '终端信号解封'},
+                operation: { code: OperationEvent.Command.commandXian.confirm.operation, name: '终端信号解封'},
                 cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK,
                 param: {
                     signal: this.selected.code

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

@@ -253,7 +253,7 @@ export default {
                 if (valid) {
                     this.$store.dispatch('menuOperation/pushRequestList', {
                         device: this.selected,
-                        operation: { code: OperationEvent.Switch.locate.menu.operation, name: '道岔定位'},
+                        operation: { code: OperationEvent.Command.commandXian.confirm.operation, name: '道岔定位'},
                         cmdType: CMD.Switch.CMD_SWITCH_NORMAL_POSITION,
                         param: operate.param
                     });
@@ -266,7 +266,7 @@ export default {
                 if (valid) {
                     this.$store.dispatch('menuOperation/pushRequestList', {
                         device: this.selected,
-                        operation: { code: OperationEvent.Switch.reverse.menu.operation, name: '道岔反位'},
+                        operation: { code: OperationEvent.Command.commandXian.confirm.operation, name: '道岔反位'},
                         cmdType: CMD.Switch.CMD_SWITCH_REVERSE_POSITION,
                         param: operate.param
                     });
@@ -280,20 +280,20 @@ export default {
                 if (valid) {
                     this.$store.dispatch('menuOperation/pushRequestList', {
                         device: this.selected,
-                        operation: { code: OperationEvent.Switch.lock.menu.operation, name: '道岔单锁'},
+                        operation: { code: OperationEvent.Command.commandXian.confirm.operation, name: '道岔单锁'},
                         cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK,
                         param: operate.param
                     });
                 }
             });
         },
-        // 道岔解锁
+        // 道岔单解
         unlock() {
             commitOperate(menuOperate.Switch.unlock, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{
                 if (valid) {
                     this.$store.dispatch('menuOperation/pushRequestList', {
                         device: this.selected,
-                        operation: { code: OperationEvent.Switch.unlock.menu.operation, name: '道岔解锁'},
+                        operation: { code: OperationEvent.Command.commandXian.confirm.operation, name: '道岔解锁'},
                         // cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK,
                         ciConfirm: true,
                         param: operate.param
@@ -317,14 +317,14 @@ export default {
         //         }
         //     });
         // },
-        // 设置临时限速
+        // // 设置临时限速
-        setSpeed() {
+        // setSpeed() {
-            commitOperate(menuOperate.Switch.setSpeed, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{
+        //     commitOperate(menuOperate.Switch.setSpeed, {switchCode:this.selected.code}, 0).then(({valid, operate})=>{
-                if (valid) {
+        //         if (valid) {
-                    this.$refs.speedLimitControl.doShow(operate, this.selected);
+        //             this.$refs.speedLimitControl.doShow(operate, this.selected);
-                }
+        //         }
-            });
+        //     });
-        },
+        // },
         enabledConfirm() {
             this.$store.dispatch('menuOperation/pushRequestList', {
                 device: this.selected,

src/jmapNew/theme/xian_02/operationConfig.js

@@ -4,63 +4,35 @@ export default {
             maxDuration: 8,
             minDuration: 5,
             operateType: 'Stand_Set_Hold_Train',
-            skinCode: '06',
+            skinCode: '09',
             trainingName: '扣车({10}-{12} 站台)',
             trainingRemark: '设置扣车功能',
             trainingType: 'Stand',
             productTypes: ['01', '02'], // 产品类型 01 现地 02 行调
             stepVOList: [
                 { deviceType: '06', orderNum: 1, operateCode: '504', tip: '鼠标右键菜单选择【扣车】' },
-                { deviceType: '06', orderNum: 2, operateCode: '504', tip: '鼠标左键点击【确定】按钮' }
+                { deviceType: '06', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【发送请求】按钮' }
             ]
         },
         {
             maxDuration: 8,
             minDuration: 5,
             operateType: 'Stand_Cancel_Hold_Train',
-            skinCode: '06',
+            skinCode: '09',
             trainingName: '取消扣车({10}-{12} 站台)',
             trainingRemark: '取消扣车功能',
             trainingType: 'Stand',
             productTypes: ['01', '02'], // 产品类型 01 现地 02 行调
             stepVOList: [
                 { deviceType: '06', orderNum: 1, operateCode: '505', tip: '鼠标右键菜单选择【取消扣车】' },
-                { deviceType: '06', orderNum: 2, operateCode: '505', tip: '鼠标左键点击【确定】按钮' }
+                { deviceType: '06', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【发送请求】按钮' }
             ]
         },
         // {
-        //     maxDuration: 8,
-        //     minDuration: 5,
-        //     operateType: 'Stand_Set_Hold_Train_Batch',
-        //     skinCode: '06',
-        //     trainingName: '批量扣车({10}-{12} 站台)',
-        //     trainingRemark: '批量扣车功能',
-        //     trainingType: 'Stand',
-        //     productTypes: ['02'], // 产品类型 01 现地 02 行调
-        //     stepVOList: [
-        //         { deviceType: '06', orderNum: 1, operateCode: '515', tip: '鼠标右键菜单选择【批量扣车】' },
-        //         { deviceType: '06', orderNum: 2, operateCode: '515', tip: '鼠标左键点击【确定】按钮' }
-        //     ]
-        // },
-        // {
-        //     maxDuration: 8,
-        //     minDuration: 5,
-        //     operateType: 'Stand_Cancel_Hold_Train_Batch',
-        //     skinCode: '06',
-        //     trainingName: '取消批量扣车({10}-{12} 站台)',
-        //     trainingRemark: '取消批量扣车功能',
-        //     trainingType: 'Stand',
-        //     productTypes: ['02'], // 产品类型 01 现地 02 行调
-        //     stepVOList: [
-        //         { deviceType: '06', orderNum: 1, operateCode: '516', tip: '鼠标右键菜单选择【取消批量扣车】' },
-        //         { deviceType: '06', orderNum: 2, operateCode: '516', tip: '鼠标左键点击【确定】按钮' }
-        //     ]
-        // },
-        // {
         //     maxDuration: 15,
         //     minDuration: 8,
         //     operateType: 'Stand_Early_Depart',
-        //     skinCode: '06',
+        //     skinCode: '09',
         //     trainingName: '提前发车({10}-{12}站台)',
         //     trainingRemark: '提前发车功能',
         //     trainingType: 'Stand',
@@ -74,35 +46,35 @@ export default {
             maxDuration: 15,
             minDuration: 8,
             operateType: 'Stand_Set_Jump_Stop',
-            skinCode: '06',
+            skinCode: '09',
             trainingName: '设置跳停({10}-{12}站台)',
             trainingRemark: '设置跳停功能',
             trainingType: 'Stand',
             productTypes: ['02'],
             stepVOList: [
                 { deviceType: '06', orderNum: 1, operateCode: '502', tip: '鼠标右键菜单选择【设置跳停】' },
-                { deviceType: '06', orderNum: 2, operateCode: '502', tip: '鼠标左键点击【确定】按钮' }
+                { deviceType: '06', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【发送请求】按钮' }
             ]
         },
         {
             maxDuration: 15,
             minDuration: 8,
             operateType: 'Stand_Cancel_Jump_Stop',
-            skinCode: '06',
+            skinCode: '09',
             trainingName: '取消跳停({10}-{12}站台)',
             trainingRemark: '设置取消跳停功能',
             trainingType: 'Stand',
             productTypes: ['02'],
             stepVOList: [
                 { deviceType: '06', orderNum: 1, operateCode: '503', tip: '鼠标右键菜单选择【取消跳停】' },
-                { deviceType: '06', orderNum: 2, operateCode: '503', tip: '鼠标左键点击【确定】按钮' }
+                { deviceType: '06', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【发送请求】按钮' }
             ]
         },
         // {
         //     maxDuration: 15,
         //     minDuration: 8,
         //     operateType: 'Stand_Set_Park_Time',
-        //     skinCode: '06',
+        //     skinCode: '09',
         //     trainingName: '设置停站时间({10}-{12}站台)',
         //     trainingRemark: '设置停站时间(自动, 一直有效)',
         //     trainingType: 'Stand',
@@ -117,7 +89,7 @@ export default {
         //     maxDuration: 15,
         //     minDuration: 8,
         //     operateType: 'Stand_Set_Park_Time',
-        //     skinCode: '06',
+        //     skinCode: '09',
         //     trainingName: '设置停站时间({10}-{12}站台)',
         //     trainingRemark: '设置停站时间(人工, 20秒, 一直有效)',
         //     trainingType: 'Stand',
@@ -133,7 +105,7 @@ export default {
         //     maxDuration: 15,
         //     minDuration: 8,
         //     operateType: 'Stand_Set_Park_Time',
-        //     skinCode: '06',
+        //     skinCode: '09',
         //     trainingName: '设置停站时间({10}-{12}站台)',
         //     trainingRemark: '设置停站时间(人工, 20秒, 一次有效)',
         //     trainingType: 'Stand',
@@ -146,72 +118,11 @@ export default {
         //         { deviceType: '06', orderNum: 5, operateCode: '509', tip: '鼠标左键点击【确认】按钮' }
         //     ]
         // },
-        // {
-        //     maxDuration: 15,
-        //     minDuration: 8,
-        //     operateType: 'Stand_Set_Run_Time',
-        //     skinCode: '06',
-        //     trainingName: '设置运行等级({10}-{12} 站台)',
-        //     trainingRemark: '设置运行等级(设置区间 运行等级1，运行时间为115，一直有效)',
-        //     trainingType: 'Stand',
-        //     productTypes: ['02'],
-        //     stepVOList: [
-        //         { deviceType: '06', orderNum: 1, operateCode: '510', tip: '鼠标右键菜单选择【设置运行等级】' },
-        //         { deviceType: '06', orderNum: 2, operateCode: '5104', tip: '鼠标左键点击，选择【1】', val: '1' },
-        //         { deviceType: '06', orderNum: 3, operateCode: '5101', tip: '鼠标左键点击，选择【115】', val: '115' },
-        //         { deviceType: '06', orderNum: 4, operateCode: '5103', tip: '鼠标左键点击，选择【一直有效】', val: 'true' },
-        //         { deviceType: '06', orderNum: 5, operateCode: '510', tip: '鼠标左键点击【确认】按钮' }
-        //     ]
-        // },
-        // {
-        //     maxDuration: 15,
-        //     minDuration: 8,
-        //     operateType: 'Stand_Set_Run_Time',
-        //     skinCode: '06',
-        //     trainingName: '设置运行等级({10}-{12} 站台)',
-        //     trainingRemark: '设置运行等级(设置区间 运行等级自动，一直有效)',
-        //     trainingType: 'Stand',
-        //     productTypes: ['02'],
-        //     stepVOList: [
-        //         { deviceType: '06', orderNum: 1, operateCode: '510', tip: '鼠标右键菜单选择【设置运行等级】' },
-        //         { deviceType: '06', orderNum: 2, operateCode: '5104', tip: '鼠标左键点击，选择【自动】', val: '0' },
-        //         { deviceType: '06', orderNum: 3, operateCode: '5103', tip: '鼠标左键点击，选择【一直有效】', val: 'true' },
-        //         { deviceType: '06', orderNum: 4, operateCode: '510', tip: '鼠标左键点击【确认】按钮' }
-        //     ]
-        // },
-        // {
-        //     maxDuration: 15,
-        //     minDuration: 8,
-        //     operateType: 'Stand_Set_Hold_Train_Auto',
-        //     skinCode: '06',
-        //     trainingName: '区间列车数量限制({10}-{12}站台)',
-        //     trainingRemark: '区间列车数量限制',
-        //     trainingType: 'Stand',
-        //     productTypes: ['02'],
-        //     stepVOList: [
-        //         { deviceType: '06', orderNum: 1, operateCode: '517', tip: '鼠标右键菜单选择【区间列车数量限制】' },
-        //         { deviceType: '06', orderNum: 2, operateCode: '517', tip: '鼠标左键点击【确认】按钮' }
-        //     ]
-        // },
-        // {
-        //     maxDuration: 15,
-        //     minDuration: 8,
-        //     operateType: 'Stand_Cancel_Hold_Train_Auto',
-        //     skinCode: '06',
-        //     trainingName: '取消区间列车数量限制({10}-{12}站台)',
-        //     trainingRemark: '取消区间列车数量限制',
-        //     trainingType: 'Stand',
-        //     productTypes: ['02'],
-        //     stepVOList: [
-        //         { deviceType: '06', orderNum: 1, operateCode: '518', tip: '鼠标右键菜单选择【取消区间列车数量限制】' },
-        //         { deviceType: '06', orderNum: 2, operateCode: '518', tip: '鼠标左键点击【确认】按钮' }
-        //     ]
-        // },
         {
             maxDuration: 8,
             minDuration: 5,
             operateType: 'Stand_View_Status',
-            skinCode: '06',
+            skinCode: '09',
             trainingName: '站台详细信息({10}-{12}站台)',
             trainingRemark: '站台详细信息功能',
             trainingType: 'Stand',
@@ -226,7 +137,7 @@ export default {
             maxDuration: 15,
             minDuration: 8,
             operateType: 'Section_Fault_Unlock',
-            skinCode: '06',
+            skinCode: '09',
             trainingName: '区段故障解锁({8}{9})',
             trainingRemark: '区段故障解锁',
             trainingType: 'Section',
@@ -243,35 +154,35 @@ export default {
             maxDuration: 15,
             minDuration: 8,
             operateType: 'Section_Cut_Off',
-            skinCode: '06',
+            skinCode: '09',
             trainingName: '区段跟踪切除({8}{9})',
             trainingRemark: '区段跟踪切除',
             trainingType: 'Section',
-            productTypes: ['01', '02'],
+            productTypes: ['01'],
             stepVOList: [
                 { deviceType: '03', orderNum: 1, operateCode: '405', tip: '鼠标右键菜单选择【区段跟踪切除】' },
-                { deviceType: '03', orderNum: 2, operateCode: '405', tip: '鼠标左键点击【确定】按钮' }
+                { deviceType: '03', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【发送请求】按钮' }
             ]
         },
         {
             maxDuration: 15,
             minDuration: 8,
             operateType: 'Section_Active',
-            skinCode: '06',
+            skinCode: '09',
             trainingName: '区段跟踪激活({8}{9})',
             trainingRemark: '区段跟踪激活功能',
             trainingType: 'Section',
-            productTypes: ['01', '02'],
+            productTypes: ['01'],
             stepVOList: [
                 { deviceType: '03', orderNum: 1, operateCode: '406', tip: '鼠标右键菜单选择【区段跟踪激活】' },
-                { deviceType: '03', orderNum: 2, operateCode: '406', tip: '鼠标左键点击【确定】按钮' }
+                { deviceType: '03', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【发送请求】按钮' }
             ]
         },
         {
             maxDuration: 15,
             minDuration: 8,
             operateType: 'Section_Set_Limit_Speed',
-            skinCode: '06',
+            skinCode: '09',
             trainingName: '设置临时限速({8}{9})',
             trainingRemark: '设置临时限速功能（限速值：5）',
             trainingType: 'Section',
@@ -290,7 +201,7 @@ export default {
             maxDuration: 15,
             minDuration: 8,
             operateType: 'Section_Set_Limit_Speed',
-            skinCode: '06',
+            skinCode: '09',
             trainingName: '设置临时限速({8}{9})',
             trainingRemark: '设置临时限速功能-取消临时限速（限速值：不限速）',
             trainingType: 'Section',
@@ -309,49 +220,29 @@ export default {
             maxDuration: 15,
             minDuration: 8,
             operateType: 'Section_Block',
-            skinCode: '06',
+            skinCode: '09',
             trainingName: '区段封锁({8}{9})',
             trainingRemark: '区段封锁功能',
             trainingType: 'Section',
-            productTypes: ['01'],
+            productTypes: ['01', '02'],
             stepVOList: [
                 { deviceType: '03', orderNum: 1, operateCode: '403', tip: '鼠标右键菜单选择【区段封锁】' },
-                { deviceType: '03', orderNum: 2, operateCode: '403', tip: '鼠标左键点击【确定】按钮' }
+                { deviceType: '03', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【发送请求】按钮' }
             ]
         },
         {
             maxDuration: 15,
             minDuration: 8,
             operateType: 'Section_Unblock',
-            skinCode: '06',
+            skinCode: '09',
             trainingName: '区段解封({8}{9})',
             trainingRemark: '区段解封功能',
             trainingType: 'Section',
-            productTypes: ['01'],
+            productTypes: ['01', '02'],
             stepVOList: [
                 { deviceType: '03', orderNum: 1, operateCode: '404', tip: '鼠标右键菜单选择【区段解封】' },
-                { deviceType: '03', orderNum: 2, operateCode: '4043', tip: '鼠标左键点击【确定】按钮' },
+                { deviceType: '03', orderNum: 2, operateCode: '4042', tip: '鼠标左键点击【是】按钮' },
-                { deviceType: '03', orderNum: 3, operateCode: '4046', tip: '鼠标左键选择({8}{9})区段', val: '{19}' },
+                { deviceType: '03', orderNum: 3, operateCode: '009', tip: '鼠标左键点击【发送请求】按钮' }
-                { deviceType: '03', orderNum: 4, operateCode: '4044', tip: '鼠标左键点击【确定】按钮' },
-                { deviceType: '03', orderNum: 5, operateCode: '4042', tip: '鼠标左键点击【关闭】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: 'Section_Confirm_Axis_Valid',
-            skinCode: '06',
-            trainingName: '确认计轴有效({8}{9})',
-            trainingRemark: '确认计轴有效功能',
-            trainingType: 'Section',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '03', orderNum: 1, operateCode: '412', tip: '鼠标右键菜单选择【确认计轴有效】' },
-                { deviceType: '03', orderNum: 2, operateCode: '4123', tip: '鼠标左键选择【确认】' },
-                { deviceType: '03', orderNum: 3, operateCode: '4121', tip: '鼠标左键选择{20}', val: '{22}' },
-                { deviceType: '03', orderNum: 4, operateCode: '4122', tip: '鼠标左键选择({8}{9})', val: '{19}' },
-                { deviceType: '03', orderNum: 5, operateCode: '4124', tip: '鼠标左键点击【确认】按钮' },
-                { deviceType: '03', orderNum: 6, operateCode: '000', tip: '鼠标左键点击【关闭】按钮' }
             ]
         },
 
@@ -359,174 +250,58 @@ export default {
             maxDuration: 15,
             minDuration: 8,
             operateType: 'Switch_Normal_Position',
-            skinCode: '06',
+            skinCode: '09',
             trainingName: '定操({7})',
             trainingRemark: '定操({7})',
             trainingType: 'Switch',
             productTypes: ['01', '02'],
             stepVOList: [
-                { deviceType: '02', orderNum: 1, operateCode: '101', tip: '鼠标左键菜单选择【定操】' },
+                { deviceType: '02', orderNum: 1, operateCode: '101', tip: '鼠标左键菜单选择【道岔定位】' },
-                { deviceType: '02', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【确定】按钮' }
+                { deviceType: '02', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【发送请求】按钮' }
             ]
         },
         {
             maxDuration: 15,
             minDuration: 8,
-            operateType: 'Switch_Reverse_Position', // 0313 新增定位字典
+            operateType: 'Switch_Reverse_Position',
-            skinCode: '06',
+            skinCode: '09',
             trainingName: '反操({7})',
             trainingRemark: '反操({7})',
             trainingType: 'Switch',
             productTypes: ['01', '02'],
             stepVOList: [
-                { deviceType: '02', orderNum: 1, operateCode: '102', tip: '鼠标右键菜单选择【反操】' },
+                { deviceType: '02', orderNum: 1, operateCode: '102', tip: '鼠标右键菜单选择【道岔反位】' },
-                { deviceType: '02', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【确定】按钮' }
+                { deviceType: '02', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【发送请求】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: 'Switch_Cut_Off',
-            skinCode: '06',
-            trainingName: '区段切除({7})',
-            trainingRemark: '区段切除',
-            trainingType: 'Switch',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '02', orderNum: 1, operateCode: '111', tip: '鼠标右键菜单选择【区段切除】' },
-                { deviceType: '02', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【确定】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: 'Switch_Active',
-            skinCode: '06',
-            trainingName: '区段激活({7})',
-            trainingRemark: '区段激活功能',
-            trainingType: 'Switch',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '02', orderNum: 1, operateCode: '112', tip: '鼠标右键菜单选择【区段激活】' },
-                { deviceType: '02', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【确定】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: 'Switch_Confirm_Axis_Valid',
-            skinCode: '06',
-            trainingName: '确认计轴有效({8}{9})',
-            trainingRemark: '确认计轴有效功能',
-            trainingType: 'Switch',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '03', orderNum: 1, operateCode: '412', tip: '鼠标右键菜单选择【确认计轴有效】' },
-                { deviceType: '03', orderNum: 2, operateCode: '4123', tip: '鼠标左键选择【确认】' },
-                { deviceType: '03', orderNum: 3, operateCode: '4121', tip: '鼠标左键选择{21}', val: '{23}' },
-                { deviceType: '03', orderNum: 4, operateCode: '4122', tip: '鼠标左键选择({25})', val: '{24}' },
-                { deviceType: '03', orderNum: 5, operateCode: '4124', tip: '鼠标左键点击【确认】按钮' },
-                { deviceType: '03', orderNum: 6, operateCode: '000', tip: '鼠标左键点击【关闭】按钮' }
             ]
         },
         {
             maxDuration: 15,
             minDuration: 8,
             operateType: 'Switch_Single_Lock',
-            skinCode: '06',
+            skinCode: '09',
             trainingName: '道岔单锁({7})',
             trainingRemark: '道岔单锁功能',
             trainingType: 'Switch',
             productTypes: ['01'],
             stepVOList: [
                 { deviceType: '02', orderNum: 1, operateCode: '103', tip: '鼠标右键菜单选择【道岔单锁】' },
-                { deviceType: '02', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【确定】按钮' }
+                { deviceType: '02', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【发送请求】按钮' }
             ]
         },
         {
             maxDuration: 15,
             minDuration: 8,
             operateType: 'Switch_Single_Unlock',
-            skinCode: '06',
+            skinCode: '09',
             trainingName: '道岔单解({7})',
             trainingRemark: '道岔单解功能',
             trainingType: 'Switch',
             productTypes: ['01'],
             stepVOList: [
-                { deviceType: '03', orderNum: 1, operateCode: '104', tip: '鼠标右键菜单选择【道岔单解】' },
+                { deviceType: '02', orderNum: 1, operateCode: '104', tip: '鼠标右键菜单选择【道岔单解】' },
-                { deviceType: '03', orderNum: 2, operateCode: '1043', tip: '鼠标左键点击【确定】按钮' },
+                { deviceType: '02', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【发送请求】按钮' },
-                { deviceType: '03', orderNum: 3, operateCode: '1046', tip: '鼠标左键选择({7})区段', val: '{17}' },
+                { deviceType: '02', orderNum: 3, operateCode: '104', tip: '鼠标右键点击【E】选择使能' },
-                { deviceType: '03', orderNum: 4, operateCode: '1044', tip: '鼠标左键点击【确定】按钮' },
+                { deviceType: '02', orderNum: 4, operateCode: '009', tip: '鼠标左键点击【发送请求】按钮' }
-                { deviceType: '03', orderNum: 5, operateCode: '1042', tip: '鼠标左键点击【关闭】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: 'Switch_Block',
-            skinCode: '06',
-            trainingName: '道岔封锁({7})',
-            trainingRemark: '道岔封锁功能',
-            trainingType: 'Switch',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '02', orderNum: 1, operateCode: '105', tip: '鼠标右键菜单选择【道岔封锁】' },
-                { deviceType: '02', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【确定】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: 'Switch_Unblock',
-            skinCode: '06',
-            trainingName: '道岔解封({7})',
-            trainingRemark: '道岔解封功能',
-            trainingType: 'Switch',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '03', orderNum: 1, operateCode: '106', tip: '鼠标右键菜单选择【道岔解封】' },
-                { deviceType: '03', orderNum: 2, operateCode: '1063', tip: '鼠标左键点击【确定】按钮' },
-                { deviceType: '03', orderNum: 3, operateCode: '1066', tip: '鼠标左键选择({7})区段', val: '{17}' },
-                { deviceType: '03', orderNum: 4, operateCode: '1064', tip: '鼠标左键点击【确定】按钮' },
-                { deviceType: '03', orderNum: 5, operateCode: '1062', tip: '鼠标左键点击【关闭】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: 'Switch_Set_Limit_Speed',
-            skinCode: '06',
-            trainingName: '设置临时限速({7})',
-            trainingRemark: '设置临时限速功能（限速值：10）',
-            trainingType: 'Switch',
-            productTypes: ['01', '02'],
-            stepVOList: [
-                { deviceType: '02', orderNum: 1, operateCode: '113', tip: '鼠标右键菜单选择【设置临时限速】' },
-                { deviceType: '02', orderNum: 2, operateCode: '1136', tip: '鼠标左键选择【限速值5】', val: '10' },
-                { deviceType: '02', orderNum: 3, operateCode: '1131', tip: '鼠标左键点击【下达】按钮' },
-                { deviceType: '02', orderNum: 4, operateCode: '1132', tip: '鼠标左键点击【确认】按钮' },
-                { deviceType: '02', orderNum: 5, operateCode: '1133', tip: '鼠标左键点击【确认1】按钮' },
-                { deviceType: '02', orderNum: 6, operateCode: '1134', tip: '鼠标左键点击【确认2】按钮', val: '10' },
-                { deviceType: '02', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: 'Switch_Set_Limit_Speed',
-            skinCode: '06',
-            trainingName: '设置临时限速({7})',
-            trainingRemark: '设置临时限速功能-取消临时限速（限速值：不限速）',
-            trainingType: 'Switch',
-            productTypes: ['01', '02'],
-            stepVOList: [
-                { deviceType: '02', orderNum: 1, operateCode: '113', tip: '鼠标右键菜单选择【设置临时限速】' },
-                { deviceType: '02', orderNum: 2, operateCode: '1136', tip: '鼠标左键选择【限速值: 不限】', val: '0' },
-                { deviceType: '02', orderNum: 3, operateCode: '1131', tip: '鼠标左键点击【下达】按钮' },
-                { deviceType: '02', orderNum: 4, operateCode: '1132', tip: '鼠标左键点击【确认】按钮' },
-                { deviceType: '02', orderNum: 5, operateCode: '1133', tip: '鼠标左键点击【确认1】按钮' },
-                { deviceType: '02', orderNum: 6, operateCode: '1134', tip: '鼠标左键点击【确认2】按钮', val: '0' },
-                { deviceType: '02', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
             ]
         },
 
@@ -534,7 +309,7 @@ export default {
             maxDuration: 15,
             minDuration: 8,
             operateType: 'Signal_Set_Route',
-            skinCode: '06',
+            skinCode: '09',
             trainingName: '排列进路({3})',
             trainingRemark: '排列进路',
             trainingType: 'Signal',
@@ -549,7 +324,7 @@ export default {
             maxDuration: 15,
             minDuration: 8,
             operateType: 'Signal_Cancel_Route',
-            skinCode: '06',
+            skinCode: '09',
             trainingName: '取消进路({3})',
             trainingRemark: '取消进路',
             trainingType: 'Signal',
@@ -559,131 +334,31 @@ export default {
                 { deviceType: '04', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【确定】按钮' }
             ]
         },
-        {
-            maxDuration: 8,
-            minDuration: 5,
-            operateType: 'Signal_Reopen_Signal',
-            skinCode: '06',
-            trainingName: '信号重开({3} 进路)',
-            trainingRemark: '信号重开功能',
-            trainingType: 'Signal',
-            productTypes: ['01', '02'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '304', tip: '鼠标右键菜单选择【信号重开】' },
-                { deviceType: '04', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【确定】按钮' }
-            ]
-        },
         {
             maxDuration: 15,
             minDuration: 8,
             operateType: 'Signal_Open_Auto_Setting',
-            skinCode: '06',
+            skinCode: '09',
             trainingName: '进路交自动控({5})',
             trainingRemark: '进路交自动控',
             trainingType: 'Signal',
             productTypes: ['01', '02'],
             stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '315', tip: '鼠标右键菜单选择【进路交自动控】' },
+                { deviceType: '04', orderNum: 1, operateCode: '315', tip: '鼠标右键菜单选择【开放自动进路】' },
-                { deviceType: '04', orderNum: 2, operateCode: '3151', tip: '鼠标左键选择【{3}】进路', val: '{4}' },
+                { deviceType: '04', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【确定】按钮' }
-                { deviceType: '04', orderNum: 3, operateCode: '009', tip: '鼠标左键点击【确定】按钮' }
             ]
         },
         {
             maxDuration: 15,
             minDuration: 8,
             operateType: 'Signal_Close_Auto_Setting',
-            skinCode: '06',
+            skinCode: '09',
             trainingName: '进路交人工控({5})',
             trainingRemark: '进路交人工控',
             trainingType: 'Signal',
             productTypes: ['01', '02'],
             stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '314', tip: '鼠标右键菜单选择【进路交人工控】' },
+                { deviceType: '04', orderNum: 1, operateCode: '314', tip: '鼠标右键菜单选择【关闭自动进路】' },
-                { deviceType: '04', orderNum: 2, operateCode: '3141', tip: '鼠标左键选择【{3}】进路', val: '{4}' },
-                { deviceType: '04', orderNum: 3, operateCode: '009', tip: '鼠标左键点击【确定】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: 'Signal_Set_CI_Auto',
-            skinCode: '06',
-            trainingName: '设置通过模式({5})',
-            trainingRemark: '设置通过模式',
-            trainingType: 'Signal',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '309', tip: '鼠标右键菜单选择【设置通过模式】' },
-                { deviceType: '04', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【确定】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: 'Signal_Set_CI_Auto',
-            skinCode: '06',
-            trainingName: 'Fleet进路办理({5})',
-            trainingRemark: 'Fleet进路办理',
-            trainingType: 'Signal',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '309', tip: '鼠标右键菜单选择【Fleet进路办理】' },
-                { deviceType: '04', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【确定】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: 'Signal_Cancel_CI_Auto',
-            skinCode: '06',
-            trainingName: '取消通过模式({5})',
-            trainingRemark: '取消通过模式',
-            trainingType: 'Signal',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '310', tip: '鼠标右键菜单选择【取消通过模式】' },
-                { deviceType: '04', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【确定】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: 'Signal_Cancel_CI_Auto',
-            skinCode: '06',
-            trainingName: 'Fleet进路取消({5})',
-            trainingRemark: 'Fleet进路取消',
-            trainingType: 'Signal',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '310', tip: '鼠标右键菜单选择【Fleet进路取消】' },
-                { deviceType: '04', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【确定】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: 'Signal_Cancel_Guide',
-            skinCode: '06',
-            trainingName: '人工解锁进路({5})',
-            trainingRemark: '人工解锁进路',
-            trainingType: 'Signal',
-            productTypes: ['01', '02'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '318', tip: '鼠标右键菜单选择【人工解锁进路】' },
-                { deviceType: '04', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【确定】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: 'Signal_Set_Guide',
-            skinCode: '06',
-            trainingName: '信号机引导办理({5})',
-            trainingRemark: '信号机引导办理',
-            trainingType: 'Signal',
-            productTypes: ['01'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '308', tip: '鼠标右键菜单选择【信号机引导办理】' },
                 { deviceType: '04', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【确定】按钮' }
             ]
         },
@@ -691,53 +366,52 @@ export default {
             maxDuration: 15,
             minDuration: 8,
             operateType: 'Signal_Block',
-            skinCode: '06',
+            skinCode: '09',
             trainingName: '信号封锁({5})',
             trainingRemark: '信号封锁',
             trainingType: 'Signal',
             productTypes: ['01'],
             stepVOList: [
                 { deviceType: '04', orderNum: 1, operateCode: '306', tip: '鼠标右键菜单选择【信号封锁】' },
-                { deviceType: '04', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【确定】按钮' }
+                { deviceType: '04', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【发送请求】按钮' }
             ]
         },
         {
             maxDuration: 15,
             minDuration: 8,
             operateType: 'Signal_Unblock',
-            skinCode: '06',
+            skinCode: '09',
             trainingName: '信号解封({5})',
             trainingRemark: '信号解封功能',
             trainingType: 'Signal',
             productTypes: ['01'],
             stepVOList: [
                 { deviceType: '03', orderNum: 1, operateCode: '307', tip: '鼠标右键菜单选择【信号解封】' },
-                { deviceType: '03', orderNum: 2, operateCode: '3073', tip: '鼠标左键点击【确定】按钮' },
+                { deviceType: '03', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【发送请求】按钮' },
-                { deviceType: '03', orderNum: 3, operateCode: '3076', tip: '鼠标左键选择({5})区段', val: '{6}' },
+                { deviceType: '03', orderNum: 3, operateCode: '307', tip: '鼠标右键点击【E】选择使能' },
-                { deviceType: '03', orderNum: 4, operateCode: '3074', tip: '鼠标左键点击【确定】按钮' },
+                { deviceType: '03', orderNum: 4, operateCode: '009', tip: '鼠标左键点击【发送请求】按钮' }
-                { deviceType: '03', orderNum: 5, operateCode: '3072', tip: '鼠标左键点击【关闭】按钮' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: 'Signal_Find_Routes_Status',
-            skinCode: '06',
-            trainingName: '查询进路控制状态({5})',
-            trainingRemark: '查询进路控制状态',
-            trainingType: 'Signal',
-            productTypes: ['01', '02'],
-            stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '316', tip: '鼠标右键菜单选择【查询进路控制状态】' },
-                { deviceType: '04', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【确定】按钮' }
             ]
         },
+        // {
+        //     maxDuration: 15,
+        //     minDuration: 8,
+        //     operateType: 'Signal_Find_Routes_Status',
+        //     skinCode: '09',
+        //     trainingName: '查询进路控制状态({5})',
+        //     trainingRemark: '查询进路控制状态',
+        //     trainingType: 'Signal',
+        //     productTypes: ['01', '02'],
+        //     stepVOList: [
+        //         { deviceType: '04', orderNum: 1, operateCode: '316', tip: '鼠标右键菜单选择【查询进路控制状态】' },
+        //         { deviceType: '04', orderNum: 2, operateCode: '009', tip: '鼠标左键点击【确定】按钮' }
+        //     ]
+        // },
 
         {
             maxDuration: 20,
             minDuration: 15,
             operateType: 'CM_Apply_For_Center_Control',
-            skinCode: '06',
+            skinCode: '09',
             trainingName: '请求遥控({1})',
             trainingRemark: '控制权限转换，站控转中控',
             trainingType: 'ControlConvertMenu',
@@ -751,7 +425,7 @@ export default {
             maxDuration: 15,
             minDuration: 8,
             operateType: 'CM_Apply_For_Station_Control',
-            skinCode: '06',
+            skinCode: '09',
             trainingName: '请求站控({1})',
             trainingRemark: '控制权限转换，中控转站控',
             trainingType: 'ControlConvertMenu',
@@ -760,34 +434,6 @@ export default {
                 { deviceType: 'button', orderNum: 1, operateCode: '202', tip: '鼠标右键菜单选择【请求站控】'},
                 { deviceType: '05', orderNum: 2, operateCode: '2023', tip: '鼠标左键点击【应用】' }
             ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: 'Signal_Set_Auto_Turn_Back',
-            skinCode: '06',
-            trainingName: '设置自动折返进路({3})',
-            trainingRemark: '设置自动折返进路',
-            trainingType: 'Signal',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '05', orderNum: 1, operateCode: '900', tip: '鼠标右键菜单选择【设置自动折返】'},
-                { deviceType: '05', orderNum: 2, operateCode: '900', tip: '鼠标左键点击【应用】' }
-            ]
-        },
-        {
-            maxDuration: 15,
-            minDuration: 8,
-            operateType: 'Signal_Cancel_Auto_Turn_Back',
-            skinCode: '06',
-            trainingName: ' 取消自动折返进路({3})',
-            trainingRemark: ' 取消自动折返进路',
-            trainingType: 'Signal',
-            productTypes: ['02'],
-            stepVOList: [
-                { deviceType: '05', orderNum: 1, operateCode: '901', tip: '鼠标右键菜单选择【取消自动折返】'},
-                { deviceType: '05', orderNum: 2, operateCode: '901', tip: '鼠标左键点击【应用】' }
-            ]
         }
     ]
 };

src/scripts/cmdPlugin/OperationHandler.js

@@ -238,11 +238,11 @@ export const OperationEvent = {
         commandXian: {
             confirm: {
                 operation: '009',
-                domId: '_Tips-commandXian-confirm{TOP}'
+                domId: '_Tips-commandXian-confirm{BOTTOM}'
             },
             cancel: {
                 operation: '0091',
-                domId: '_Tips-commandXian-cancel{TOP}'
+                domId: '_Tips-commandXian-cancel{BOTTOM}'
             }
         }
     },