From ff7e32ec0d585b8647420520add4973b90218b80 Mon Sep 17 00:00:00 2001 From: lVAL Date: Wed, 3 Feb 2021 17:07:05 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E8=B7=AF=EF=BC=9A=E5=AE=81=E6=B3=A21?= =?UTF-8?q?=EF=BC=8C=E6=88=90=E9=83=BD3=20=E9=97=AE=E9=A2=98=EF=BC=9A?= =?UTF-8?q?=E8=A1=A5=E5=85=85=E7=BC=BA=E5=A4=B1=E9=83=A8=E5=88=86=E5=AE=9E?= =?UTF-8?q?=E8=AE=AD=EF=BC=8C=E6=88=90=E9=83=BD=E7=9A=84=E5=85=A8=E7=BA=BF?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=89=A3=E8=BD=A6=EF=BC=8C=E5=AE=81=E6=B3=A2?= =?UTF-8?q?=E7=9A=84=E8=AE=BE=E7=BD=AE=E6=8A=98=E8=BF=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chengdu_03/menus/dialog/standControl.vue | 18 +++++++++++++----- .../theme/chengdu_03/operationConfig.js | 10 +++++----- .../menus/dialog/stationBackStrategy.vue | 7 +++++-- .../ningbo_01/menus/menuStationTurnBack.vue | 10 ++++++++-- src/jmapNew/theme/ningbo_01/operationConfig.js | 14 +++++--------- 5 files changed, 36 insertions(+), 23 deletions(-) diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/standControl.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/standControl.vue index 2cf88c397..c6c29c830 100644 --- a/src/jmapNew/theme/chengdu_03/menus/dialog/standControl.vue +++ b/src/jmapNew/theme/chengdu_03/menus/dialog/standControl.vue @@ -26,23 +26,26 @@ > 范围 - + 本站台 上行全线 下行全线 @@ -296,7 +299,10 @@ export default { }, domIdDetainCar() { return this.dialogShow ? OperationEvent.StationStand.cancelDetainTrain.choose.domId : ''; - }, + }, + domIdDetainChoose() { + return this.dialogShow ? OperationEvent.Command.common.choose.domId : ''; + }, domIdChoose() { if (this.radio1 == '1') { // 跳停 return this.dialogShow ? OperationEvent.StationStand.setJumpStop.select.domId : ''; @@ -429,7 +435,9 @@ export default { }, choose(upDown) { // 取消扣车 请求code码 const operate = { - operation: OperationEvent.StationStand.cancelDetainTrain.choose.operation, + operation: upDown == '01' + ? OperationEvent.StationStand.cancelDetainTrain.choose.operation + : OperationEvent.Command.common.choose.operation, val: this.radio }; if (this.radio == '02' || this.radio == '03') { diff --git a/src/jmapNew/theme/chengdu_03/operationConfig.js b/src/jmapNew/theme/chengdu_03/operationConfig.js index d9881205e..8fdb9bb75 100644 --- a/src/jmapNew/theme/chengdu_03/operationConfig.js +++ b/src/jmapNew/theme/chengdu_03/operationConfig.js @@ -641,16 +641,16 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN.value, + operateType: CMD.Stand.CMD_STAND_WHOLE_LINE_CANCEL_HOLD_TRAIN.value, skinCode: '04', - trainingName: '取消扣车({10}-{12}站台)', - trainingRemark: '设置取消扣车功能(上行全线)', + trainingName: '全线取消扣车', + trainingRemark: '设置取消扣车功能({12}全线)', trainingType: 'Stand', productTypes: ['02'], stepVOList: [ { deviceType: '06', orderNum: 1, operateCode: '505', tip: '鼠标右键菜单选择【取消扣车】' }, - { deviceType: '06', orderNum: 2, operateCode: '5051', tip: '鼠标左键点击【上行全线】按钮', val: '02' }, - { deviceType: '06', orderNum: 3, operateCode: '508', tip: '鼠标左键点击【确定】按钮' } + { deviceType: '06', orderNum: 2, operateCode: 'com01', tip: '鼠标左键点击【{12}全线】按钮', val: 'true' }, + { deviceType: '06', orderNum: 3, operateCode: '505', tip: '鼠标左键点击【确定】按钮' } ] }, { diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/stationBackStrategy.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/stationBackStrategy.vue index f1af95fa6..bdf975809 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/stationBackStrategy.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/stationBackStrategy.vue @@ -111,12 +111,14 @@ export default { this.dialogShow = true; this.$nextTick(function () { + this.$refs.table.setCurrentRow(); this.$store.dispatch('training/emitTipFresh'); }); }, clickEvent(row, column, event) { const operate = { - operation: OperationEvent.Station.setBackStrategy.choose.operation + operation: OperationEvent.Station.setBackStrategy.choose.operation, + val: row.id }; this.strategyId = row.id; this.isConfirm = true; @@ -143,7 +145,8 @@ export default { }, doClose() { this.loading = false; - this.dialogShow = false; + this.dialogShow = false; + this.$refs.table.setCurrentRow(); this.$store.dispatch('training/emitTipFresh'); }, commit() { diff --git a/src/jmapNew/theme/ningbo_01/menus/menuStationTurnBack.vue b/src/jmapNew/theme/ningbo_01/menus/menuStationTurnBack.vue index 57fd3c2e5..e32b7dcf2 100644 --- a/src/jmapNew/theme/ningbo_01/menus/menuStationTurnBack.vue +++ b/src/jmapNew/theme/ningbo_01/menus/menuStationTurnBack.vue @@ -100,11 +100,17 @@ export default { }, // 设置折返策略 setBackStrategy() { - commitOperate(menuOperate.StationControl.setBackStrategy, {stationCode: this.selected.stationCode}, 0).then(({valid, operate})=>{ + const operate = { + operation: menuOperate.StationControl.setBackStrategy.operation, + code: this.selected.code, + param: {stationCode: this.selected.stationCode} + }; + + this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { if (valid) { this.$refs.stationBackStrategy.doShow(operate, this.selected); } - }); + }); } } }; diff --git a/src/jmapNew/theme/ningbo_01/operationConfig.js b/src/jmapNew/theme/ningbo_01/operationConfig.js index fc72f8198..de1b723f9 100644 --- a/src/jmapNew/theme/ningbo_01/operationConfig.js +++ b/src/jmapNew/theme/ningbo_01/operationConfig.js @@ -680,7 +680,7 @@ export default { { maxDuration: 15, minDuration: 8, - operateType: 'Signal_Cancel_Guide', + operateType: 'Signal_Human_Release_Route', skinCode: '06', trainingName: '人工解锁进路({5})', trainingRemark: '人工解锁进路', @@ -789,12 +789,8 @@ export default { trainingType: 'ControlConvertMenu', productTypes: ['01'], stepVOList: [ - { deviceType: 'bar', orderNum: 1, operateCode: '002', codeType:'NULL', tip: '鼠标左键点击【系统】' }, - { deviceType: '05', orderNum: 2, operateCode: '0024', tip: '鼠标左键点击【站遥控】' }, - { deviceType: '05', orderNum: 3, operateCode: '0071', tip: '选择车站-【{1}】', val: '{2}'}, - { deviceType: '05', orderNum: 4, operateCode: '007', tip: '选择【紧急站控】', val: '{2}' }, - { deviceType: '05', orderNum: 5, operateCode: '201', tip: '鼠标左键点击【设置】' }, - { deviceType: '05', orderNum: 6, operateCode: '2013', tip: '鼠标左键点击【确认】' } + { deviceType: 'button', orderNum: 1, operateCode: '201', tip: '鼠标右键菜单选择【紧急站控】' }, + { deviceType: '05', orderNum: 2, operateCode: '2013', tip: '鼠标左键点击【确认】' } ] }, { @@ -908,8 +904,8 @@ export default { productTypes: ['02'], stepVOList: [ { deviceType: '05', orderNum: 1, operateCode: '610', tip: '鼠标右键菜单选择【设置折返策略】', codeType: 'BUTTON'}, - { deviceType: '05', orderNum: 2, operateCode: '6101', tip: '选择折返策略【{31}】', val: '2' }, - { deviceType: '05', orderNum: 3, operateCode: '6102', tip: '鼠标左键点击【确定】' } + { deviceType: '05', orderNum: 2, operateCode: '6101', tip: '选择折返策略【{31}】', val: '1' }, // 1为选项中的第一个，和后台默认保持一致 + { deviceType: '05', orderNum: 3, operateCode: '610', tip: '鼠标左键点击【确定】' } ], config:{tbStrategyBT:true} },