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

Merge remote-tracking branch 'origin/develop' into local-test
local-test分支构建发布到本地服务器 / Build-Publish (push) Successful in 11m36s Details

This commit is contained in:
joylink_fanyuhong 2024-09-10 16:21:30 +08:00
parent 0212e1af47 eff99d3609
commit b85e8c0074
1 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/jmapNew/theme/datie_02/menus/menuButton.vue
View File

@ -168,7 +168,8 @@ export default {
routeDataMap: null, // btnCodeList 为key routeDataMap: null, // btnCodeList 为key
routeButtonCodeList: [], // btnCodeList 拼接code list routeButtonCodeList: [], // btnCodeList 拼接code list
guideLockRightFlag: false, guideLockRightFlag: false,
guideLockLeftFlag: false guideLockLeftFlag: false,
continueSectionFault: false
}; };
}, },
computed: { computed: {
@ -330,6 +331,9 @@ export default {
if (operate.operationPre === this.Station.powerUnLock.button.operation || operate.cmdType) { if (operate.operationPre === this.Station.powerUnLock.button.operation || operate.cmdType) {
this.clearOperate(); this.clearOperate();
} }
if (operate.operationPre === this.Section.fault.button.operation) {
this.continueSectionFault = true;
}
} }
}).catch(e =>{ }).catch(e =>{
console.error(e); console.error(e);
@ -417,6 +421,7 @@ export default {
operation: operation, operation: operation,
userOperationType: UserOperationType.LEFTCLICK userOperationType: UserOperationType.LEFTCLICK
}; };
// 以下 会弹出密码框 （总人解，区故解） 铅封按钮 // 以下 会弹出密码框 （总人解，区故解） 铅封按钮
const operationList = [this.Signal.humanTrainRoute.button.operation, const operationList = [this.Signal.humanTrainRoute.button.operation,
this.Section.fault.button.operation, this.Section.fault.button.operation,
@ -437,12 +442,30 @@ export default {
// ]; // ];
this.$store.dispatch('trainingNew/next', operate).then(({valid}) => { this.$store.dispatch('trainingNew/next', operate).then(({valid}) => {
if (valid) { if (valid) {
if (operation === this.Command.cancel.clearMbm.operation) { if (operation == this.Section.fault.button.operation) {
this.operation = operation;
this.commandTypeList = commandTypeList;
this.$store.dispatch('menuOperation/setButtonOperation', operation);
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
// 判断是否需要 弹窗密码框
if (!this.continueSectionFault) {
operate['operateNext'] = this.Command.close.password.operation;
if (operation === this.Station.powerUnLock.button.operation) {
operate.nextCmdType = CMD.Station.CMD_STATION_POWER_ON_UNLOCK;
operate.param = {stationCode: this.$store.state.training.roleDeviceCode};
}
this.$refs.password.doShow(operate, operationMap[operation]);
}
this.timeNode = this.$store.state.socket.simulationTimeSync;
this.$store.dispatch('training/emitTipFresh');
} else if (operation === this.Command.cancel.clearMbm.operation) {
this.continueSectionFault = false;
this.commandTypeList = []; this.commandTypeList = [];
this.$store.dispatch('menuOperation/setButtonOperation', null); this.$store.dispatch('menuOperation/setButtonOperation', null);
this.guideLockRightFlag = false; this.guideLockRightFlag = false;
this.guideLockLeftFlag = false; this.guideLockLeftFlag = false;
} else { } else {
this.continueSectionFault = false;
this.operation = operation; this.operation = operation;
this.commandTypeList = commandTypeList; this.commandTypeList = commandTypeList;
this.$store.dispatch('menuOperation/setButtonOperation', operation); this.$store.dispatch('menuOperation/setButtonOperation', operation);
@ -781,6 +804,9 @@ export default {
if (this.selected._event !== MouseEvent.Left || (!model._type && !model._code)) { if (this.selected._event !== MouseEvent.Left || (!model._type && !model._code)) {
return; return;
} }
if (this.continueSectionFault && model._type !== 'Section') {
this.continueSectionFault = false;
}
const buttonOperation = this.$store.state.menuOperation.buttonOperation; const buttonOperation = this.$store.state.menuOperation.buttonOperation;
const switchOperation = [ const switchOperation = [
this.Switch.lock.button.operation, this.Switch.lock.button.operation,