diff --git a/src/jmapNew/theme/datie_02/menus/menuButton.vue b/src/jmapNew/theme/datie_02/menus/menuButton.vue index 1745c0d22..325702657 100644 --- a/src/jmapNew/theme/datie_02/menus/menuButton.vue +++ b/src/jmapNew/theme/datie_02/menus/menuButton.vue @@ -6,10 +6,10 @@ - - - - + + + + - - - + + + - - - + + + - - - + + + @@ -395,7 +395,7 @@ export default { if (valid) { this.commandTypeList = []; this.$store.dispatch('menuOperation/setButtonOperation', null); - this.guideLockRightFlag = false; + this.guideLockRightFlag = false; } }); } @@ -650,7 +650,7 @@ export default { this.clearOperate(); } } else if (!buttonOperation) { - const signalButtonList = ['ASSIST', 'CHANGE_DIRECTION', 'PICK_ASSIST', 'DEPART_ASSIST', 'OCCLUSION', 'RECOVERY']; + const signalButtonList = ['ASSIST', 'CHANGE_DIRECTION', 'PICK_ASSIST', 'DEPART_ASSIST', 'OCCLUSION', 'RECOVERY', 'ACCIDENT']; if (model._type === 'SignalButton' && !this.checkSignalBlock(model.signalCode) && model.type === 'GUIDE' ) { this.handleGuideSignal(model); } else if (model._type === 'SignalButton' && signalButtonList.includes(model.type)) { @@ -736,7 +736,18 @@ export default { labelEnum:model.labelEnum, stationCode:model.stationCode } + }, + // 事故按钮 + 'ACCIDENT':{ + operation:this.CTCCommand.assistPressAccident.menu.operation, + nextCmdType:CMD.CTC.CTC_ASSIST_PRESS_ACCIDENT, + param:{ + labelEnum:model.labelEnum, + stationCode:model.stationCode, + pressDown:model.pressDown ? 0 : 1 // 1按下、0弹起 + } } + }; const operate = { operation: modelTypeMap[model.type].operation, diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js index cd08cf924..b8c47184a 100644 --- a/src/scripts/cmdPlugin/CommandEnum.js +++ b/src/scripts/cmdPlugin/CommandEnum.js @@ -376,6 +376,7 @@ export default { CTC_ASSIST_PRESS_RECEIVE_ASSIST:{value: 'ASSIST_PRESS_RECEIVE_ASSIST', label: '接辅助'}, CTC_ASSIST_PRESS_DELIVER_ASSIST:{value: 'ASSIST_PRESS_DELIVER_ASSIST', label: '发辅助'}, CTC_ASSIST_PRESS_BLOCK:{value: 'ASSIST_PRESS_BLOCK', label: '阻塞'}, - CTC_ASSIST_PRESS_RESTORE:{value: 'ASSIST_PRESS_RESTORE', label: '复原'} + CTC_ASSIST_PRESS_RESTORE:{value: 'ASSIST_PRESS_RESTORE', label: '复原'}, + CTC_ASSIST_PRESS_ACCIDENT:{value: 'ASSIST_PRESS_ACCIDENT', label: '事故'} } }; diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js index cbbaf2f59..b6e3e6d4f 100644 --- a/src/scripts/cmdPlugin/OperationHandler.js +++ b/src/scripts/cmdPlugin/OperationHandler.js @@ -3591,6 +3591,12 @@ export const OperationEvent = { operation: '1108', domId: '_Tips-CTC-AssistPressRestore-Menu{TOP}' } + }, + assistPressAccident:{ + menu: { + operation: '1109', + domId: '_Tips-CTC-AssistPressAccident-Menu{TOP}' + } } }