优化提示问题

This commit is contained in:
lVAL 2021-02-22 10:56:50 +08:00
parent 48b1bc9ae4
commit 9b42af2dd6

View File

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