diff --git a/src/jmapNew/theme/components/utils/menuOperate.js b/src/jmapNew/theme/components/utils/menuOperate.js index 5869d2970..8b9137464 100644 --- a/src/jmapNew/theme/components/utils/menuOperate.js +++ b/src/jmapNew/theme/components/utils/menuOperate.js @@ -519,15 +519,45 @@ export const menuOperate = { } }, CTC: { - // 接预 + // 完成接预 receivingNotice: { operation: OperationEvent.CTCCommand.receivingNotice.menu.operation, - cmdType: CMD.CTC.CTC_RECEIVING_NOTICE + cmdType: CMD.CTC.CTC_FINISH_RECEIVING_NOTICE }, - // 发预 + // 取消接预 + cancelReceivingNotice: { + operation: OperationEvent.CTCCommand.cancelReceivingNotice.menu.operation, + cmdType: CMD.CTC.CTC_CANCEL_RECEIVING_NOTICE + }, + // 完成到点 + finishArrive: { + operation: OperationEvent.CTCCommand.finishArrive.menu.operation, + cmdType: CMD.CTC.CTC_FINISH_ARRIVE + }, + // 取消到点 + cancelArrive: { + operation: OperationEvent.CTCCommand.cancelArrive.menu.operation, + cmdType: CMD.CTC.CTC_CANCEL_ARRIVE + }, + // 完成发预 departureNotice: { operation: OperationEvent.CTCCommand.departureNotice.menu.operation, - cmdType: CMD.CTC.CTC_DEPARTURE_NOTICE + cmdType: CMD.CTC.CTC_FINISH_DEPARTURE_NOTICE + }, + // 取消发预 + cancelDepartureNotice: { + operation: OperationEvent.CTCCommand.cancelDepartureNotice.menu.operation, + cmdType: CMD.CTC.CTC_CANCEL_DEPARTURE_NOTICE + }, + // 完成发点 + finishDeparture: { + operation: OperationEvent.CTCCommand.finishDeparture.menu.operation, + cmdType: CMD.CTC.CTC_FINISH_DEPARTURE + }, + // 取消发点 + cancelDeparture: { + operation: OperationEvent.CTCCommand.cancelDeparture.menu.operation, + cmdType: CMD.CTC.CTC_CANCEL_DEPARTURE }, // 自动触发 autoTrigger: { diff --git a/src/jmapNew/theme/datie_02/menus/dialog/recDep.vue b/src/jmapNew/theme/datie_02/menus/dialog/recDep.vue index d30bf974a..591b71b29 100644 --- a/src/jmapNew/theme/datie_02/menus/dialog/recDep.vue +++ b/src/jmapNew/theme/datie_02/menus/dialog/recDep.vue @@ -13,20 +13,24 @@
- + - + + + + - - - -
完成接预
-
完成发预
-
取消接预
-
取消接预
- 关闭 +
完成接预
+
完成发预
+
取消接预
+
取消发预
+
完成到点
+
取消到点
+
完成发点
+
取消发点
+ 关闭
@@ -34,8 +38,6 @@ diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js index 3d4b1b6fc..d08ee32e2 100644 --- a/src/scripts/cmdPlugin/CommandEnum.js +++ b/src/scripts/cmdPlugin/CommandEnum.js @@ -379,8 +379,14 @@ export default { CMD_DIRECTION_CHANGE: {value: 'Direction_Change', label: '切换方向'} }, CTC: { - CTC_RECEIVING_NOTICE: {value: 'CTC_RECEIVING_NOTICE', label: '接预'}, - CTC_DEPARTURE_NOTICE: {value: 'CTC_DEPARTURE_NOTICE', label: '发预'}, + CTC_FINISH_RECEIVING_NOTICE: {value: 'CTC_FINISH_RECEIVING_NOTICE', label: '完成接预'}, + CTC_CANCEL_RECEIVING_NOTICE: {value: 'CTC_CANCEL_RECEIVING_NOTICE', label: '取消接预'}, + CTC_FINISH_ARRIVE: {value: 'CTC_FINISH_ARRIVE', label: '完成到点'}, + CTC_CANCEL_ARRIVE: {value: 'CTC_CANCEL_ARRIVE', label: '取消到点'}, + CTC_FINISH_DEPARTURE_NOTICE: {value: 'CTC_FINISH_DEPARTURE_NOTICE', label: '完成发预'}, + CTC_CANCEL_DEPARTURE_NOTICE: {value: 'CTC_CANCEL_DEPARTURE_NOTICE', label: '取消发预'}, + CTC_FINISH_DEPARTURE: {value: 'CTC_FINISH_DEPARTURE', label: '完成发点'}, + CTC_CANCEL_DEPARTURE: {value: 'CTC_CANCEL_DEPARTURE', label: '取消发点'}, CTC_ASSIST_PRESS_DOWN_TURN_DIRECTION:{value:'ASSIST_PRESS_DOWN_TURN_DIRECTION', label:'改方'}, CTC_AUTO_TRIGGER: {value: 'CTC_AUTO_TRIGGER', label: '自动触发'}, CTC_ASSIST_PRESS_MAIN_ASSIST:{value: 'ASSIST_PRESS_MAIN_ASSIST', label: '总辅助'}, diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js index e3d07b472..4439f39a5 100644 --- a/src/scripts/cmdPlugin/OperationHandler.js +++ b/src/scripts/cmdPlugin/OperationHandler.js @@ -3607,15 +3607,15 @@ export const OperationEvent = { } }, CTCCommand: { - receivingNotice: { - menu: { - operation: '1100', + receivingNotice: { + menu: { + operation: '1100', domId: '_Tips-CTC-ReceivingNotice-Menu{TOP}' } }, departureNotice: { - menu: { - operation: '1101', + menu: { + operation: '1101', domId: '_Tips-CTC-DepartureNotice-Menu{TOP}' } }, @@ -3626,65 +3626,65 @@ export const OperationEvent = { } }, autoTrigger: { - menu: { - operation: '1103', + menu: { + operation: '1103', domId: '_Tips-CTC-AutoTrigger-Menu{TOP}' } }, assistPressMainAssist:{ menu: { - operation: '1104', + operation: '1104', domId: '_Tips-CTC-AssistPressMainAssist-Menu{TOP}' } }, assistPressReceiveAssist:{ menu: { - operation: '1105', + operation: '1105', domId: '_Tips-CTC-AssistPressReceiveAssist-Menu{TOP}' } }, assistPressDeliverAssist:{ menu: { - operation: '1106', + operation: '1106', domId: '_Tips-CTC-AssistPressDeliverAssist-Menu{TOP}' } }, assistPressBlock:{ menu: { - operation: '1107', + operation: '1107', domId: '_Tips-CTC-AssistPressBlock-Menu{TOP}' } }, assistPressRestore:{ menu: { - operation: '1108', + operation: '1108', domId: '_Tips-CTC-AssistPressRestore-Menu{TOP}' } }, assistPressAccident:{ menu: { - operation: '1109', + operation: '1109', domId: '_Tips-CTC-AssistPressAccident-Menu{TOP}' } }, // 批量修改股道 batchModifyTrackSection:{ menu: { - operation: '1111', + operation: '1111', domId: '_Tips-CTC-batchModifyTrackSection-Menu{TOP}' } }, // 移除行车日志 deleteRunplan:{ menu: { - operation: '1112', + operation: '1112', domId: '_Tips-CTC-deleteRunplan-Menu{TOP}' } }, // 修改行车计划的邻站信息 modifyAdjacentStation:{ menu: { - operation: '1113', + operation: '1113', domId: '_Tips-CTC-modifyAdjacentStation-Menu{TOP}' } }, @@ -3708,6 +3708,48 @@ export const OperationEvent = { operation: '1116', domId: '_Tips-CTC-agreeNotcie-Menu{TOP}' } + }, + // 取消接预 + cancelReceivingNotice: { + menu: { + operation: '1117', + domId: '_Tips-CTC-CancelReceivingNotice-Menu{TOP}' + } + }, + // 取消发预 + cancelDepartureNotice: { + menu: { + operation: '1118', + domId: '_Tips-CTC-CancelDepartureNotice-Menu{TOP}' + } + }, + // 完成到点 FINISH_ARRIVE + finishArrive: { + menu: { + operation: '1119', + domId: '_Tips-CTC-FinishArrive-Menu{TOP}' + } + }, + // 取消到点 + cancelArrive: { + menu: { + operation: '1120', + domId: '_Tips-CTC-CancelArrive-Menu{TOP}' + } + }, + // 完成发点 CTC_FINISH_DEPARTURE + finishDeparture: { + menu: { + operation: '1121', + domId: '_Tips-CTC_FinishDeparture-Menu{TOP}' + } + }, + // 取消发点 + cancelDeparture: { + menu: { + operation: '1122', + domId: '_Tips-CTC_CancelDeparture-Menu{TOP}' + } } } diff --git a/src/views/newMap/displayCity/lineBoard.vue b/src/views/newMap/displayCity/lineBoard.vue index aa383462d..9ad1a3b60 100644 --- a/src/views/newMap/displayCity/lineBoard.vue +++ b/src/views/newMap/displayCity/lineBoard.vue @@ -48,7 +48,7 @@ > {{ '接路' + (item.receivingRouteLock ? '':getRouteName(item.receivingRouteCode)) }} -
到点
+
到点
{{ item.arriveTime }}
@@ -69,7 +69,7 @@ > {{ '发路' + (item.departureRouteLock ? '':getRouteName(item.departureRouteCode)) }}
-
发点
+
发点
{{ item.tripNumber }}
{{ item.trackName }}
@@ -303,9 +303,7 @@ export default { }); this.readOnlyMap[item.stationCode] = item.readOnly; } - console.log(item.trackView, '******************'); if (item && item.trackView && item.trackView.trackLineMap) { - console.log(item.trackView.trackLineMap, '******************'); for (const key in item.trackView.trackLineMap) { this.standTrackSectionMap[key].lines = item.trackView.trackLineMap[key]; } @@ -338,11 +336,9 @@ export default { } } } - console.log(this.trackList, 'trackList', this.standTrackSectionMap); } }, '$store.state.map.mapDataLoadedCount': function (val) { // 地图数据加载完成 - console.log(this.sectionList, 'sectionList'); this.sectionList.forEach(item => { if (item.standTrack) { this.standTrackSectionMap[item.code] = { trackName: item.name, occupied: false, belongStation:item.belongStation, lines: [] }; @@ -438,7 +434,6 @@ export default { }, setTrigger() { const param = { ...this.triggerParam, trigger: true }; - commitOperate(menuOperate.CTC.autoTrigger, param, 3).then(({valid, operate})=>{ this.loading = false; this.triggerParam = {}; @@ -456,7 +451,6 @@ export default { }, cancelTrigger() { const param = { ...this.triggerParam, trigger: false }; - console.log(menuOperate.CTC.autoTrigger, 'trigger'); commitOperate(menuOperate.CTC.autoTrigger, param, 3).then(({valid, operate})=>{ this.triggerParam = {}; if (valid) {