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

预复位调整

Browse Source
This commit is contained in:
fan 2021-01-22 18:33:21 +08:00
parent 3407d4d13b
commit 0d8a6df9de
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jmapNew/theme/foshan_01/menus/menuButton.vue
View File

@ -144,7 +144,7 @@
<button
id="mbm_14"
:style="{display: 'block', float: 'left', width: width+'px', backgroundColor:buttonUpColor}"
@click="buttonDown('Section.axlePreReset.button.operation')"
@click="buttonDown(Section.axlePreReset.button.operation)"
>
<span style="color: red">
<center>

8
src/jmapNew/theme/foshan_01/menus/menuSection.vue
View File

@ -194,15 +194,15 @@ export default {
},
operationHandler(buttonOperation, selectType) {
switch (buttonOperation) {
case OperationEvent.Switch.locate.button.operation: {
// 道岔总定
case OperationEvent.Section.fault.button.operation: {
// 事故解锁
if (!selectType.normalPosition && selectType.reversePosition) {
this.locate(selectType);
}
break;
}
case OperationEvent.Switch.reverse.button.operation: {
// 道岔总反
case OperationEvent.Section.axlePreReset.button.operation: {
// 计轴复零
if (selectType.normalPosition && !selectType.reversePosition) {
this.reverse(selectType);
}

5
src/jmapNew/theme/nanjing_02/menus/menuButton.vue
View File

@ -659,7 +659,6 @@ export default {
signalCode: this.route.startSignalCode
};
}
if (this.operate == OperationEvent.Signal.humanControl.menuButton.operation || this.operate == OperationEvent.Signal.atsAutoControl.menuButton.operation) {
const routeCodeList = [];
this.routeList.forEach(item => {
@ -738,7 +737,6 @@ export default {
operation: OperationEvent.Command.commandHaerbin.confirm.operation,
param: this.param
};
if (!this.securityCommand) {
step.over = true;
step.cmdType = this.cmdType;
@ -791,7 +789,6 @@ export default {
cmdType: this.cmdType,
operation: OperationEvent.Command.commandHaerbin.confrimCr2.operation
};
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.pushTempData([{ name: `${this.cmdType.label}成功` }]);
@ -1014,7 +1011,7 @@ export default {
{ name: '挤岔恢复', cmdType: '', operate: OperationEvent.Section.fault.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch },
{ name: '单独锁定', cmdType: CMD.Switch.CMD_SWITCH_SINGLE_LOCK, operate: OperationEvent.Switch.lock.menuButton, disabledCb: (selectedObj) => !this.modeMatch },
{ name: '取消锁定', cmdType: CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK, operate: OperationEvent.Switch.unlock.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch },
{ name: '预复位', cmdType: CMD.Switch.CMD_SWITCH_AXLE_PRE_RESET, operate: OperationEvent.Switch.unlock.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch },
{ name: '预复位', cmdType: CMD.Switch.CMD_SWITCH_AXLE_PRE_RESET, operate: OperationEvent.Switch.axlePreReset.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch },
{ name: '封锁道岔', cmdType: CMD.Switch.CMD_SWITCH_BLOCK, operate: OperationEvent.Switch.block.menuButton, disabledCb: (selectedObj) => !this.modeMatch },
{ name: '解封道岔', cmdType: CMD.Switch.CMD_SWITCH_UNBLOCK, operate: OperationEvent.Switch.unblock.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch },
{ name: '强行消限', cmdType: CMD.Switch.CMD_SWITCH_CANCEL_LIMIT_SPEED, operate: OperationEvent.Switch.cancelSpeed.menuButton, securityCommand: true, disabledCb: (selectedObj) => !this.modeMatch }

2
src/scripts/cmdPlugin/CommandEnum.js
View File

@ -17,7 +17,7 @@ export default {
/** 取消临时限速 */
CMD_SWITCH_CANCEL_LIMIT_SPEED: {value:'Switch_Cancel_Limit_Speed', label: '取消临时限速'},
/** 计轴预复位 */
CMD_SWITCH_AXLE_PRE_RESET: {value:' Switch_Axle_Pre_Reset', label: '计轴预复位'},
CMD_SWITCH_AXLE_PRE_RESET: {value:'Switch_Axle_Pre_Reset', label: '计轴预复位'},
/** 故障解锁 */
CMD_SWITCH_FAULT_UNLOCK: {value:'Switch_Fault_Unlock', label: '故障解锁'},
/** 强解道岔*/