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:
lVAL 2021-02-22 10:56:50 +08:00
parent 48b1bc9ae4
commit 9b42af2dd6
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -281,7 +281,7 @@ export default {
routeParamList: [], routeParamList: [],
paramConfirm: false, paramConfirm: false,
secondConfirm: false, secondConfirm: false,
paramIndex: -1, commandInfo: {},
banIcon: BanIcon, banIcon: BanIcon,
timer: null, timer: null,
trainOperationShow: false, trainOperationShow: false,
@ -742,14 +742,17 @@ export default {
}); });
} }
}, },
clickCommand(row, index) { clickCommand(row) {
const step = {}; const step = {};
this.rightClickDialogVisible = false; this.rightClickDialogVisible = false;
this.paramIndex = row.next ? index : -1;
if (![OperationEvent.Command.common.choose].includes(row.operate)) {
this.commandInfo = row;
}
if (row.commandTip) { if (row.commandTip) {
EventBus.$emit('sendMsg', {message: row.name}); EventBus.$emit('sendMsg', {message: row.commandTip});
} }
if (this.tempData.length) { if (this.tempData.length) {
@ -804,14 +807,14 @@ export default {
that.cancle(); that.cancle();
}, 15000); }, 15000);
} else if (valid) { } else if (valid) {
EventBus.$emit('sendMsg', {message: `${this.cmdType.label}成功`});
this.doClose(); this.doClose();
this.handleClose(); this.handleClose();
EventBus.$emit('sendMsg', {message: `${this.commandInfo.name}成功`});
} }
}).catch((error) => { }).catch((error) => {
EventBus.$emit('sendMsg', {message: `${this.cmdType.label}失败`});
this.doClose(); this.doClose();
this.handleClose(); this.handleClose();
EventBus.$emit('sendMsg', {message: `${this.commandInfo.name}失败`});
}); });
}, },
clickCr1Confirm() { clickCr1Confirm() {
@ -843,16 +846,16 @@ export default {
this.$store.dispatch('training/nextNew', step).then(({ valid }) => { this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) { if (valid) {
EventBus.$emit('sendMsg', {message: `${this.cmdType.label}成功`});
this.doClose(); this.doClose();
this.handleDeviceMenu(); this.handleDeviceMenu();
this.handleClose(); this.handleClose();
EventBus.$emit('sendMsg', {message: `${this.commandInfo.name}成功`});
} }
}).catch((error) => { }).catch((error) => {
EventBus.$emit('sendMsg', {message: `${this.cmdType.label}失败`});
this.doClose(); this.doClose();
this.handleDeviceMenu(); this.handleDeviceMenu();
this.handleClose(); this.handleClose();
EventBus.$emit('sendMsg', {message: `${this.commandInfo.name}失败`});
}); });
}, },
handleRightClickClose() { handleRightClickClose() {
@ -1111,8 +1114,8 @@ export default {
{ name: '交出控制', commandTip: '交出控制权', cmdType: CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menuButton, disabledCb: (stationControl) => ['Local', 'None'].includes(stationControl.controlMode) } { name: '交出控制', commandTip: '交出控制权', cmdType: CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menuButton, disabledCb: (stationControl) => ['Local', 'None'].includes(stationControl.controlMode) }
]; ];
this.routeParamList = [ this.routeParamList = [
{ name: '排列进路', cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE, operate: OperationEvent.Signal.arrangementRoute.menuButton, disabledCb: (stationControl) => !this.modeMatch }, { name: '排列进路', commandTip: '进路排列', cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE, operate: OperationEvent.Signal.arrangementRoute.menuButton, disabledCb: (stationControl) => !this.modeMatch },
{ name: '取消进路', cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE, operate: OperationEvent.Signal.cancelTrainRoute.menuButton, disabledCb: (stationControl) => !this.modeMatch } { name: '取消进路', commandTip: '取消排列', cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE, operate: OperationEvent.Signal.cancelTrainRoute.menuButton, disabledCb: (stationControl) => !this.modeMatch }
]; ];
} }
} }