diff --git a/src/jmapNew/theme/components/utils/menuOperate.js b/src/jmapNew/theme/components/utils/menuOperate.js
index f8fccb4ad..d69b5b325 100644
--- a/src/jmapNew/theme/components/utils/menuOperate.js
+++ b/src/jmapNew/theme/components/utils/menuOperate.js
@@ -624,6 +624,21 @@ export const menuOperate = {
operation: OperationEvent.CTCCommand.cancleBlock.menu.operation,
cmdType: CMD.CTC.CTC_LOG_CANCEL_BLOCK
},
+ // 设置重点列车
+ setKeyTrains:{
+ operation: OperationEvent.CTCCommand.setKeyTrains.menu.operation,
+ cmdType: CMD.CTC.CTC_LOG_SET_KEY_TRAINS
+ },
+ // 设置允许出入口与基本路径不一致
+ setEntryOutDiscordant:{
+ operation: OperationEvent.CTCCommand.setEntryOutDiscordant.menu.operation,
+ cmdType: CMD.CTC.CTC_LOG_SET_ENTRY_OUT_DISCORDANT
+ },
+ // 设置允许股道与基本路径不一致
+ setTrackDiscordant:{
+ operation: OperationEvent.CTCCommand.setTrackDiscordant.menu.operation,
+ cmdType: CMD.CTC.CTC_LOG_SET_TRACK_DISCORDANT
+ },
// 增加列车固定径路
addTrainFixedPath:{
diff --git a/src/jmapNew/theme/datie_02/menus/runplanPane.vue b/src/jmapNew/theme/datie_02/menus/runplanPane.vue
index 90b043c32..6efdba711 100644
--- a/src/jmapNew/theme/datie_02/menus/runplanPane.vue
+++ b/src/jmapNew/theme/datie_02/menus/runplanPane.vue
@@ -418,11 +418,14 @@
31
-
+
计
划
属
性
32
+
+ {{ scope.row.planProperties }}
+
@@ -446,6 +449,10 @@
+
+
+
+
@@ -876,6 +883,66 @@ export default {
});
}
},
+ // 设置重点列车
+ setKeyTrains() {
+ if (this.currentRow) {
+ event.stopPropagation();
+ this.rpMenuPopShow = false;
+ const params = {stationCode:this.currentRow.stationCode, runPlanCode: this.currentRow.code};
+ params.status = this.currentRow.keyTrains ? 0 : 1;
+ commitOperate(menuOperate.CTC.setKeyTrains, params, 3).then(({valid})=>{
+ this.loading = false;
+ this.clearRpRow();
+ if (valid) {
+ // this.doClose();
+ }
+ }).catch(() => {
+ this.loading = false;
+ this.clearRpRow();
+ this.noticeInfo();
+ });
+ }
+ },
+ // 设置允许出入口与基本路径不一致
+ setEntryOutDiscordant() {
+ if (this.currentRow) {
+ event.stopPropagation();
+ this.rpMenuPopShow = false;
+ const params = {stationCode:this.currentRow.stationCode, runPlanCode: this.currentRow.code};
+ params.status = this.currentRow.entryOutDiscordant ? 0 : 1;
+ commitOperate(menuOperate.CTC.setEntryOutDiscordant, params, 3).then(({valid})=>{
+ this.loading = false;
+ this.clearRpRow();
+ if (valid) {
+ // this.doClose();
+ }
+ }).catch(() => {
+ this.loading = false;
+ this.clearRpRow();
+ this.noticeInfo();
+ });
+ }
+ },
+ // 设置允许股道与基本路径不一致
+ setTrackDiscordant() {
+ if (this.currentRow) {
+ event.stopPropagation();
+ this.rpMenuPopShow = false;
+ const params = {stationCode:this.currentRow.stationCode, runPlanCode: this.currentRow.code};
+ params.status = this.currentRow.trackDiscordant ? 0 : 1;
+ commitOperate(menuOperate.CTC.setTrackDiscordant, params, 3).then(({valid})=>{
+ this.loading = false;
+ this.clearRpRow();
+ if (valid) {
+ // this.doClose();
+ }
+ }).catch(() => {
+ this.loading = false;
+ this.clearRpRow();
+ this.noticeInfo();
+ });
+ }
+ },
// 发送发车预告
sendNotcie() {
// && this.currentRow.departRunPlan && this.currentRow.departRunPlan.adjacentMessage == 0
diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js
index 71ccdbe0c..95c7730bd 100644
--- a/src/scripts/cmdPlugin/CommandEnum.js
+++ b/src/scripts/cmdPlugin/CommandEnum.js
@@ -409,6 +409,9 @@ export default {
CTC_LOG_CANCEL_ARRIVE:{value: 'CTC_LOG_CANCEL_ARRIVE', label: '取消到达'},
CTC_LOG_CANCEL_DEPARTURE:{value: 'CTC_LOG_CANCEL_DEPARTURE', label: '取消出发'},
CTC_LOG_CANCEL_BLOCK:{value: 'CTC_LOG_CANCEL_BLOCK', label: '取消闭塞'},
+ CTC_LOG_SET_KEY_TRAINS:{value: 'CTC_LOG_SET_KEY_TRAINS', label: '设置重点列车'},
+ CTC_LOG_SET_ENTRY_OUT_DISCORDANT:{value: 'CTC_LOG_SET_ENTRY_OUT_DISCORDANT', label: '设置允许出入口与基本路径不一致'},
+ CTC_LOG_SET_TRACK_DISCORDANT:{value: 'CTC_LOG_SET_TRACK_DISCORDANT', 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 a39f36429..4c6eeeee9 100644
--- a/src/scripts/cmdPlugin/OperationHandler.js
+++ b/src/scripts/cmdPlugin/OperationHandler.js
@@ -3876,8 +3876,28 @@ export const OperationEvent = {
operation: '1139',
domId: '_Tips-CTC-cancleBlock-Menu{TOP}'
}
+ },
+ // 设置重点列车
+ setKeyTrains:{
+ menu: {
+ operation: '1140',
+ domId: '_Tips-CTC-setKeyTrains-Menu{TOP}'
+ }
+ },
+ // 设置允许出入口与基本路径不一致
+ setEntryOutDiscordant:{
+ menu: {
+ operation: '1140',
+ domId: '_Tips-CTC-setEntryOutDiscordant-Menu{TOP}'
+ }
+ },
+ // 设置允许股道与基本路径不一致
+ setTrackDiscordant:{
+ menu: {
+ operation: '1140',
+ domId: '_Tips-CTC-setTrackDiscordant-Menu{TOP}'
+ }
}
-
// CTC_ZONE_SAVE_TRIP_NUMBER
// CTC_ZONE_SAVE_STATION
},