From 5874d8f665a0b03199a8a103fe8726fa7413bb00 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Thu, 2 Apr 2020 16:16:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E4=B8=80=E5=8F=B7=E7=BA=BF?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=AD=A5=E9=AA=A4=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../menus/dialog/standJumpStopControl.vue | 3 +- .../beijing_01/menus/dialog/standStopTime.vue | 4 +- src/scripts/OperationConfig.js | 39 ++++++++++++------- src/scripts/cmdPlugin/ValidateHandler.js | 1 + 4 files changed, 31 insertions(+), 16 deletions(-) diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/standJumpStopControl.vue b/src/jmapNew/theme/beijing_01/menus/dialog/standJumpStopControl.vue index c10462fd9..1a03fedbe 100644 --- a/src/jmapNew/theme/beijing_01/menus/dialog/standJumpStopControl.vue +++ b/src/jmapNew/theme/beijing_01/menus/dialog/standJumpStopControl.vue @@ -318,7 +318,8 @@ export default { ? OperationEvent.StationStand.setJumpStop.select.operation : OperationEvent.StationStand.cancelJumpStop.select.operation; this.model.val1 = ''; const operate = { - operation: operation + operation: operation, + val:val }; this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { if (valid) { diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/standStopTime.vue b/src/jmapNew/theme/beijing_01/menus/dialog/standStopTime.vue index c18a9c3f7..44ae28254 100644 --- a/src/jmapNew/theme/beijing_01/menus/dialog/standStopTime.vue +++ b/src/jmapNew/theme/beijing_01/menus/dialog/standStopTime.vue @@ -39,7 +39,7 @@ :min="0" size="mini" style="width: 130px; padding-left:30px;display: block; float: left; margin-top: 15px;" - @change="inputTime" + @change="changeInputTime" />
秒
@@ -196,7 +196,7 @@ export default { } }); }, - inputTime(time) { + changeInputTime(time) { const operate = { operation: OperationEvent.StationStand.setStopTime.input.operation, val: `${time}` diff --git a/src/scripts/OperationConfig.js b/src/scripts/OperationConfig.js index eaeb4fa1e..c59edbcb0 100644 --- a/src/scripts/OperationConfig.js +++ b/src/scripts/OperationConfig.js @@ -853,7 +853,7 @@ export const OperationList = { trainingType: '05', productTypes: ['02'], // 产品类型 01 现地 02 行调 stepVOList: [ - { deviceType: '06', orderNum: 1, operateCode: '504', tip: '鼠标右键菜单选择【设置扣车】' }, + { deviceType: '06', orderNum: 1, operateCode: '504', tip: '鼠标右键菜单选择【设置扣车】'}, { deviceType: '06', orderNum: 2, operateCode: '504', tip: '鼠标左键点击【确定】按钮' } ] }, @@ -867,9 +867,8 @@ export const OperationList = { trainingType: '05', productTypes: ['01'], // 产品类型 01 现地 02 行调 stepVOList: [ - { deviceType: '06', orderNum: 1, operateCode: '2993', tip: '鼠标左键点击【功能按钮】' }, - { deviceType: '06', orderNum: 2, operateCode: '504', tip: '鼠标左键点击【车站】' } - // { deviceType: '06', orderNum: 2, operateCode: '504', tip: '鼠标左键点击【确定】按钮' } + { deviceType: '06', orderNum: 1, operateCode: '2993', tip: '鼠标左键点击【功能按钮】'}, + { deviceType: '06', orderNum: 2, operateCode: '2993', tip: '鼠标左键点击【车站】', codeType:'STAND'} ] }, { @@ -880,12 +879,26 @@ export const OperationList = { trainingName: '取消扣车({10}-{12} 站台)', trainingRemark: '取消扣车功能', trainingType: '05', - productTypes: ['01', '02'], // 产品类型 01 现地 02 行调 + productTypes: ['02'], // 产品类型 01 现地 02 行调 stepVOList: [ - { deviceType: '06', orderNum: 1, operateCode: '505', tip: '鼠标右键菜单选择【取消扣车】' }, + { deviceType: '06', orderNum: 1, operateCode: '505', tip: '鼠标右键菜单选择【取消扣车】'}, { deviceType: '06', orderNum: 2, operateCode: '505', tip: '鼠标左键点击【确定】按钮' } ] }, + { + maxDuration: 8, + minDuration: 5, + operateType: '0502', + skinCode: '03', + trainingName: '取消扣车({10}-{12} 站台)', + trainingRemark: '取消扣车功能', + trainingType: '05', + productTypes: ['01'], // 产品类型 01 现地 02 行调 + stepVOList: [ + { deviceType: '06', orderNum: 1, operateCode: '2994', tip: '鼠标左键点击【总取消】' }, + { deviceType: '06', orderNum: 2, operateCode: '2994', tip: '鼠标左键点击【车站】', codeType:'STAND' } + ] + }, { maxDuration: 15, minDuration: 8, @@ -894,7 +907,7 @@ export const OperationList = { trainingName: '设置跳停({10}-{12} 站台)', trainingRemark: '设置跳停功能', trainingType: '05', - productTypes: ['01', '02'], // 产品类型 01 现地 02 行调 + productTypes: ['02'], // 产品类型 01 现地 02 行调 stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '502', tip: '鼠标右键菜单选择【设置跳停】' }, { deviceType: '06', orderNum: 2, operateCode: '502', tip: '鼠标左键点击【确定】按钮' } @@ -908,7 +921,7 @@ export const OperationList = { trainingName: '设置跳停({10}-{12} 站台)', trainingRemark: '设置指定001号列车跳停功能', trainingType: '05', - productTypes: ['01', '02'], // 产品类型 01 现地 02 行调 + productTypes: ['02'], // 产品类型 01 现地 02 行调 stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '502', tip: '鼠标右键菜单选择【设置跳停】' }, { deviceType: '06', orderNum: 2, operateCode: '5024', tip: '鼠标左键点击' }, @@ -924,7 +937,7 @@ export const OperationList = { trainingName: '取消跳停({10}-{12} 站台)', trainingRemark: '取消跳停功能', trainingType: '05', - productTypes: ['01', '02'], // 产品类型 01 现地 02 行调 + productTypes: ['02'], // 产品类型 01 现地 02 行调 stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '503', tip: '鼠标右键菜单选择【取消跳停】' }, { deviceType: '06', orderNum: 2, operateCode: '503', tip: '鼠标左键点击【确定】按钮' } @@ -938,7 +951,7 @@ export const OperationList = { trainingName: '取消跳停({10}-{12} 站台)', trainingRemark: '取消指定001号列车跳停功能', trainingType: '05', - productTypes: ['01', '02'], // 产品类型 01 现地 02 行调 + productTypes: ['02'], // 产品类型 01 现地 02 行调 stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '503', tip: '鼠标右键菜单选择【取消跳停】' }, { deviceType: '06', orderNum: 2, operateCode: '5034', tip: '鼠标左键点击' }, @@ -3093,7 +3106,7 @@ export const OperationList = { minDuration: 8, operateType: '0303', skinCode: '07', - trainingName: '区段封锁({8}{9})', + trainingName: '道岔区段封锁({7})', trainingRemark: '区段封锁功能', trainingType: '03', productTypes: ['01'], // 产品类型 01 现地 02 行调 @@ -3108,7 +3121,7 @@ export const OperationList = { minDuration: 8, operateType: '0304', skinCode: '07', - trainingName: '区段解封({8}{9})', + trainingName: '道岔区段解封({7})', trainingRemark: '区段解封功能', trainingType: '03', productTypes: ['01'], @@ -3123,7 +3136,7 @@ export const OperationList = { minDuration: 8, operateType: '0306', skinCode: '02', - trainingName: '区段故障解锁({8}{9})', + trainingName: '道岔区段故障解锁({7})', trainingRemark: '故障解锁功能', trainingType: '03', productTypes: ['01'], diff --git a/src/scripts/cmdPlugin/ValidateHandler.js b/src/scripts/cmdPlugin/ValidateHandler.js index 1e69bf282..dc4cc1c74 100644 --- a/src/scripts/cmdPlugin/ValidateHandler.js +++ b/src/scripts/cmdPlugin/ValidateHandler.js @@ -48,6 +48,7 @@ class ValidateHandler { /** 判断操作步骤是否正确 */ judge (operate) { + debugger; const steps = Handler.getSteps(); const order = Handler.getOrder();