joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

线路：宁波1，成都3

Browse Source 
问题：补充缺失部分实训，成都的全线取消扣车，宁波的设置折返
This commit is contained in:
lVAL 2021-02-03 17:07:05 +08:00
parent 3a91ccfa0a
commit ff7e32ec0d
5 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/jmapNew/theme/chengdu_03/menus/dialog/standControl.vue
View File

@ -26,23 +26,26 @@
> >
<span class="base-label" style="left: -5px; top: -22px; background: #ECE9D8; padding: 0 4px;">范围</span> <span class="base-label" style="left: -5px; top: -22px; background: #ECE9D8; padding: 0 4px;">范围</span>
<el-row style="margin-top: -13px;"> <el-row style="margin-top: -13px;">
<el-radio-group :id="domIdDetainCar" v-model="radio" @change="choose"> <el-radio-group v-model="radio" @change="choose">
<el-col :span="24"> <el-col :span="24">
<el-radio <el-radio
:id="domIdDetainCar"
label="01" label="01"
style="display: block; text-align: left; float: left; margin-right: 10px;" style="display: block; text-align: left; float: left; margin-right: 10px;"
>本站台 >本站台
</el-radio> </el-radio>
<el-radio <el-radio
:id="isUpDirection? domIdDetainChoose: ''"
v-if="radio1 == 2" v-if="radio1 == 2"
:disabled="!isUpDirection" :disabled="!isUpDirection"
label="02" :label="`${isUpDirection}`"
style="display: block; text-align: left; float: left; margin-right: 10px;" style="display: block; text-align: left; float: left; margin-right: 10px;"
>上行全线 >上行全线
</el-radio> </el-radio>
<el-radio <el-radio
:id="isUpDirection ? '': domIdDetainChoose"
v-if="radio1 == 2" v-if="radio1 == 2"
label="03" :label="`${!isUpDirection}`"
:disabled="isUpDirection" :disabled="isUpDirection"
style="display: block; text-align: left; float: left;" style="display: block; text-align: left; float: left;"
>下行全线</el-radio> >下行全线</el-radio>
@ -296,7 +299,10 @@ export default {
}, },
domIdDetainCar() { domIdDetainCar() {
return this.dialogShow ? OperationEvent.StationStand.cancelDetainTrain.choose.domId : ''; return this.dialogShow ? OperationEvent.StationStand.cancelDetainTrain.choose.domId : '';
}, },
domIdDetainChoose() {
return this.dialogShow ? OperationEvent.Command.common.choose.domId : '';
},
domIdChoose() { domIdChoose() {
if (this.radio1 == '1') { // 跳停 if (this.radio1 == '1') { // 跳停
return this.dialogShow ? OperationEvent.StationStand.setJumpStop.select.domId : ''; return this.dialogShow ? OperationEvent.StationStand.setJumpStop.select.domId : '';
@ -429,7 +435,9 @@ export default {
}, },
choose(upDown) { // 取消扣车 请求code码 choose(upDown) { // 取消扣车 请求code码
const operate = { const operate = {
operation: OperationEvent.StationStand.cancelDetainTrain.choose.operation, operation: upDown == '01'
? OperationEvent.StationStand.cancelDetainTrain.choose.operation
: OperationEvent.Command.common.choose.operation,
val: this.radio val: this.radio
}; };
if (this.radio == '02' || this.radio == '03') { if (this.radio == '02' || this.radio == '03') {

10
src/jmapNew/theme/chengdu_03/operationConfig.js
View File

@ -641,16 +641,16 @@ export default {
{ {
maxDuration: 15, maxDuration: 15,
minDuration: 8, minDuration: 8,
operateType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN.value, operateType: CMD.Stand.CMD_STAND_WHOLE_LINE_CANCEL_HOLD_TRAIN.value,
skinCode: '04', skinCode: '04',
trainingName: '取消扣车({10}-{12}站台)', trainingName: '全线取消扣车',
trainingRemark: '设置取消扣车功能(上行全线)', trainingRemark: '设置取消扣车功能({12}全线)',
trainingType: 'Stand', trainingType: 'Stand',
productTypes: ['02'], productTypes: ['02'],
stepVOList: [ stepVOList: [
{ deviceType: '06', orderNum: 1, operateCode: '505', tip: '鼠标右键菜单选择【取消扣车】' }, { deviceType: '06', orderNum: 1, operateCode: '505', tip: '鼠标右键菜单选择【取消扣车】' },
{ deviceType: '06', orderNum: 2, operateCode: '5051', tip: '鼠标左键点击【上行全线】按钮', val: '02' }, { deviceType: '06', orderNum: 2, operateCode: 'com01', tip: '鼠标左键点击【{12}全线】按钮', val: 'true' },
{ deviceType: '06', orderNum: 3, operateCode: '508', tip: '鼠标左键点击【确定】按钮' } { deviceType: '06', orderNum: 3, operateCode: '505', tip: '鼠标左键点击【确定】按钮' }
] ]
}, },
{ {

7
src/jmapNew/theme/ningbo_01/menus/dialog/stationBackStrategy.vue
View File

@ -111,12 +111,14 @@ export default {
this.dialogShow = true; this.dialogShow = true;
this.$nextTick(function () { this.$nextTick(function () {
this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('training/emitTipFresh');
}); });
}, },
clickEvent(row, column, event) { clickEvent(row, column, event) {
const operate = { const operate = {
operation: OperationEvent.Station.setBackStrategy.choose.operation operation: OperationEvent.Station.setBackStrategy.choose.operation,
val: row.id
}; };
this.strategyId = row.id; this.strategyId = row.id;
this.isConfirm = true; this.isConfirm = true;
@ -143,7 +145,8 @@ export default {
}, },
doClose() { doClose() {
this.loading = false; this.loading = false;
this.dialogShow = false; this.dialogShow = false;
this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('training/emitTipFresh');
}, },
commit() { commit() {

10
src/jmapNew/theme/ningbo_01/menus/menuStationTurnBack.vue
View File

@ -100,11 +100,17 @@ export default {
}, },
// 设置折返策略 // 设置折返策略
setBackStrategy() { 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) { if (valid) {
this.$refs.stationBackStrategy.doShow(operate, this.selected); this.$refs.stationBackStrategy.doShow(operate, this.selected);
} }
}); });
} }
} }
}; };

14
src/jmapNew/theme/ningbo_01/operationConfig.js
View File

@ -680,7 +680,7 @@ export default {
{ {
maxDuration: 15, maxDuration: 15,
minDuration: 8, minDuration: 8,
operateType: 'Signal_Cancel_Guide', operateType: 'Signal_Human_Release_Route',
skinCode: '06', skinCode: '06',
trainingName: '人工解锁进路({5})', trainingName: '人工解锁进路({5})',
trainingRemark: '人工解锁进路', trainingRemark: '人工解锁进路',
@ -789,12 +789,8 @@ export default {
trainingType: 'ControlConvertMenu', trainingType: 'ControlConvertMenu',
productTypes: ['01'], productTypes: ['01'],
stepVOList: [ stepVOList: [
{ deviceType: 'bar', orderNum: 1, operateCode: '002', codeType:'NULL', tip: '鼠标左键点击【系统】' }, { deviceType: 'button', orderNum: 1, operateCode: '201', tip: '鼠标右键菜单选择【紧急站控】' },
{ deviceType: '05', orderNum: 2, operateCode: '0024', tip: '鼠标左键点击【站遥控】' }, { deviceType: '05', orderNum: 2, operateCode: '2013', 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: '鼠标左键点击【确认】' }
] ]
}, },
{ {
@ -908,8 +904,8 @@ export default {
productTypes: ['02'], productTypes: ['02'],
stepVOList: [ stepVOList: [
{ deviceType: '05', orderNum: 1, operateCode: '610', tip: '鼠标右键菜单选择【设置折返策略】', codeType: 'BUTTON'}, { deviceType: '05', orderNum: 1, operateCode: '610', tip: '鼠标右键菜单选择【设置折返策略】', codeType: 'BUTTON'},
{ deviceType: '05', orderNum: 2, operateCode: '6101', tip: '选择折返策略【{31}】', val: '2' }, { deviceType: '05', orderNum: 2, operateCode: '6101', tip: '选择折返策略【{31}】', val: '1' }, // 1为选项中的第一个，和后台默认保持一致
{ deviceType: '05', orderNum: 3, operateCode: '6102', tip: '鼠标左键点击【确定】' } { deviceType: '05', orderNum: 3, operateCode: '610', tip: '鼠标左键点击【确定】' }
], ],
config:{tbStrategyBT:true} config:{tbStrategyBT:true}
}, },