diff --git a/src/jmapNew/theme/components/utils/menuOperate.js b/src/jmapNew/theme/components/utils/menuOperate.js index 4550976b0..d3696a300 100644 --- a/src/jmapNew/theme/components/utils/menuOperate.js +++ b/src/jmapNew/theme/components/utils/menuOperate.js @@ -584,10 +584,15 @@ export const menuOperate = { operation: OperationEvent.CTCCommand.stationCancleTwinkle.menu.operation, cmdType: CMD.CTC.CTC_CANCEL_TWINKLE }, - // 移除行车日志 - deleteRunplan:{ - operation: OperationEvent.CTCCommand.deleteRunplan.menu.operation, - cmdType: CMD.CTC.CTC_REMOVE_RUN_PLAN + // // 移除行车日志 + // deleteRunplan:{ + // operation: OperationEvent.CTCCommand.deleteRunplan.menu.operation, + // cmdType: CMD.CTC.CTC_REMOVE_RUN_PLAN + // }, + // 设置删除标识 + setDeleteRunplanLabel:{ + operation: OperationEvent.CTCCommand.setDeleteRunplanLabel.menu.operation, + cmdType: CMD.CTC.CTC_LOG_SET_DELETE_LABEL }, // 修改行车计划的邻站信息 modifyAdjacentStation:{ diff --git a/src/jmapNew/theme/datie_02/menus/dialog/deleteRunplan.vue b/src/jmapNew/theme/datie_02/menus/dialog/deleteRunplan.vue index 0b9134b52..2cddd04cb 100644 --- a/src/jmapNew/theme/datie_02/menus/dialog/deleteRunplan.vue +++ b/src/jmapNew/theme/datie_02/menus/dialog/deleteRunplan.vue @@ -46,7 +46,8 @@ export default { return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : ''; }, domIdConfirm() { - return this.dialogShow ? OperationEvent.CTCCommand.deleteRunplan.menu.domId : ''; + // deleteRunplan + return this.dialogShow ? OperationEvent.CTCCommand.setDeleteRunplanLabel.menu.domId : ''; }, title() { return '警告'; @@ -69,7 +70,9 @@ export default { }, commit() { this.loading = true; - commitOperate(menuOperate.CTC.deleteRunplan, this.model, 2).then(({valid})=>{ + // 设置删除标识 + // deleteRunplan; + commitOperate(menuOperate.CTC.setDeleteRunplanLabel, this.model, 2).then(({valid})=>{ this.loading = false; this.$emit('clearRpRow'); if (valid) { diff --git a/src/jmapNew/theme/datie_02/menus/runplanPane.vue b/src/jmapNew/theme/datie_02/menus/runplanPane.vue index afbdb2b30..11d4db140 100644 --- a/src/jmapNew/theme/datie_02/menus/runplanPane.vue +++ b/src/jmapNew/theme/datie_02/menus/runplanPane.vue @@ -90,7 +90,7 @@ > @@ -453,7 +453,9 @@
上报速报信息
修改车次号
修改相关邻站
-
删除
+ +
设置删除标识
+
清除闪烁
全体信息
diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js index 7ceb8d4ee..95f5f3df2 100644 --- a/src/scripts/cmdPlugin/CommandEnum.js +++ b/src/scripts/cmdPlugin/CommandEnum.js @@ -401,7 +401,7 @@ export default { CTC_STATION_SEND_OUT_RUN_PLAN:{value: 'CTC_STATION_SEND_OUT_RUN_PLAN', label: '车站发送计划'}, CTC_CANCEL_TWINKLE:{value: 'CTC_CANCEL_TWINKLE', label: '车站取消红闪'}, - CTC_REMOVE_RUN_PLAN:{value: 'CTC_REMOVE_RUN_PLAN', label: '移除行车日志'}, + // CTC_REMOVE_RUN_PLAN:{value: 'CTC_REMOVE_RUN_PLAN', label: '移除行车日志'}, CTC_MODIFY_ADJACENT_STATION:{value: 'CTC_MODIFY_ADJACENT_STATION', label: '修改邻站信息'}, CTC_MODIFY_TRIP_NUMBER:{value: 'CTC_MODIFY_TRIP_NUMBER', label: '修改车次号(大铁CTC)'}, CTC_SEND_NOTICE:{value: 'CTC_SEND_NOTICE', label: '发送发车预告'}, @@ -414,6 +414,7 @@ export default { CTC_LOG_SET_TRACK_DISCORDANT:{value: 'CTC_LOG_SET_TRACK_DISCORDANT', label: '设置允许股道与基本路径不一致'}, CTC_LOG_SET_START_RUN_PLAN:{value: 'CTC_LOG_SET_START_RUN_PLAN', label: '设置始发'}, CTC_LOG_SET_END_RUN_PLAN:{value: 'CTC_LOG_SET_END_RUN_PLAN', label: '设置终到'}, + CTC_LOG_SET_DELETE_LABEL:{value: 'CTC_LOG_SET_DELETE_LABEL', label: '设置删除标识'}, CTC_ADD_RUN_PLAN_LIST_TO_EDIT_AREA:{value: 'CTC_ADD_RUN_PLAN_LIST_TO_EDIT_AREA', label: '增加列车固定径路'}, CTC_COVER_RUN_PLAN_LIST_TO_EDIT_AREA:{value: 'CTC_COVER_RUN_PLAN_LIST_TO_EDIT_AREA', label: '导入列车固定径路'}, diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js index 8d0b5a72d..ef0506962 100644 --- a/src/scripts/cmdPlugin/OperationHandler.js +++ b/src/scripts/cmdPlugin/OperationHandler.js @@ -3681,13 +3681,13 @@ export const OperationEvent = { domId: '_Tips-CTC-modifyTrackSection-Menu{TOP}' } }, - // 移除行车日志 - deleteRunplan:{ - menu: { - operation: '1112', - domId: '_Tips-CTC-deleteRunplan-Menu{TOP}' - } - }, + // // 移除行车日志 + // deleteRunplan:{ + // menu: { + // operation: '1112', + // domId: '_Tips-CTC-deleteRunplan-Menu{TOP}' + // } + // }, // 修改行车计划的邻站信息 modifyAdjacentStation:{ menu: { @@ -3911,7 +3911,15 @@ export const OperationEvent = { operation: '1146', domId: '_Tips-CTC-setTrackDiscordant-Menu{TOP}' } + }, + // 设置删除标识 + setDeleteRunplanLabel:{ + menu: { + operation: '1147', + domId: '_Tips-CTC-setDeleteRunplanLabel-Menu{TOP}' + } } + // // CTC_ZONE_SAVE_TRIP_NUMBER // CTC_ZONE_SAVE_STATION }, diff --git a/src/views/dispatcherLoger/deleteDispatcherLoger.vue b/src/views/dispatcherLoger/deleteDispatcherLoger.vue index 413fdc13f..1f357064d 100644 --- a/src/views/dispatcherLoger/deleteDispatcherLoger.vue +++ b/src/views/dispatcherLoger/deleteDispatcherLoger.vue @@ -46,7 +46,7 @@ export default { return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : ''; }, domIdConfirm() { - return this.dialogShow ? OperationEvent.CTCCommand.deleteRunplan.menu.domId : ''; + return this.dialogShow ? OperationEvent.CTCCommand.deleteDispatcherLogerRp.menu.domId : ''; }, title() { return '警告';