diff --git a/src/jmapNew/theme/components/utils/menuOperate.js b/src/jmapNew/theme/components/utils/menuOperate.js
index d69b5b325..4550976b0 100644
--- a/src/jmapNew/theme/components/utils/menuOperate.js
+++ b/src/jmapNew/theme/components/utils/menuOperate.js
@@ -639,6 +639,16 @@ export const menuOperate = {
operation: OperationEvent.CTCCommand.setTrackDiscordant.menu.operation,
cmdType: CMD.CTC.CTC_LOG_SET_TRACK_DISCORDANT
},
+ // 设置始发
+ setStartRunplan:{
+ operation: OperationEvent.CTCCommand.setStartRunplan.menu.operation,
+ cmdType: CMD.CTC.CTC_LOG_SET_START_RUN_PLAN
+ },
+ // 设置终到
+ setEndRunplan:{
+ operation: OperationEvent.CTCCommand.setEndRunplan.menu.operation,
+ cmdType: CMD.CTC.CTC_LOG_SET_END_RUN_PLAN
+ },
// 增加列车固定径路
addTrainFixedPath:{
diff --git a/src/jmapNew/theme/datie_02/menus/runplanPane.vue b/src/jmapNew/theme/datie_02/menus/runplanPane.vue
index 6efdba711..9361e5725 100644
--- a/src/jmapNew/theme/datie_02/menus/runplanPane.vue
+++ b/src/jmapNew/theme/datie_02/menus/runplanPane.vue
@@ -89,7 +89,9 @@
width="100"
>
- {{ scope.row.tripNumber }} {{ scope.row.delete?'(删)':scope.row.twinkle?'(*)':'' }}
+
+ {{ scope.row.tripNumber }} {{ scope.row.delete?'(删)':scope.row.twinkle?'(*)':scope.row.keyTrains?'(重)':'' }}
+
@@ -439,8 +441,14 @@
-
-
+
+
@@ -451,8 +459,14 @@
-
-
+
+
@@ -572,6 +586,10 @@ export default {
Rph:Rph,
tableData:[],
filterSectionList:[],
+ startRunplan:false,
+ endRunplan:false,
+ trackDiscordant:false,
+ entryOutDiscordant:false,
// activeDepartRunPlan:{},
// activeArriveRunPlan:{},
currentRailwaySimulationRunplan:{},
@@ -823,6 +841,10 @@ export default {
selectedTripNumber(row, column, cell, event) {
if (column.property == 'tripNumber') {
if (this.currentRow && this.currentRow.code == row.code) {
+ this.startRunplan = row.startRunPlan;
+ this.endRunplan = row.endRunPlan;
+ this.trackDiscordant = row.trackDiscordant;
+ this.entryOutDiscordant = row.entryOutDiscordant;
this.rpMenuPopShow = true;
const offsetTop = cell.offsetTop - document.querySelector('#runplanContentTable .el-table__body-wrapper').scrollTop;
this.rpMenuPopTop = offsetTop - 202 > 0 ? offsetTop - 380 > 0 ? offsetTop - 202 + 100 : offsetTop - 202 + 190 : offsetTop + 180;
@@ -834,6 +856,10 @@ export default {
} else {
this.currentRow = null;
// this.rpMenuPopShow = false;
+ this.startRunplan = false;
+ this.endRunplan = false;
+ this.trackDiscordant = false;
+ this.entryOutDiscordant = false;
this.$refs.runplanContentTable.setCurrentRow();
}
},
@@ -846,6 +872,10 @@ export default {
closeRpMenu() {
this.clearRpRow();
this.rpMenuPopShow = false;
+ this.startRunplan = false;
+ this.endRunplan = false;
+ this.trackDiscordant = false;
+ this.entryOutDiscordant = false;
},
// 修改车次号
modifyTripNumber(event) {
@@ -943,6 +973,46 @@ export default {
});
}
},
+ // 设置始发
+ setStartRunplan() {
+ if (this.currentRow) {
+ event.stopPropagation();
+ this.rpMenuPopShow = false;
+ const params = {stationCode:this.currentRow.stationCode, runPlanCode: this.currentRow.code};
+ params.status = this.currentRow.startRunPlan ? 0 : 1;
+ commitOperate(menuOperate.CTC.setStartRunplan, params, 3).then(({valid})=>{
+ this.loading = false;
+ this.clearRpRow();
+ if (valid) {
+ // this.doClose();
+ }
+ }).catch(() => {
+ this.loading = false;
+ this.clearRpRow();
+ this.noticeInfo();
+ });
+ }
+ },
+ // 设置终到
+ setEndRunplan() {
+ if (this.currentRow) {
+ event.stopPropagation();
+ this.rpMenuPopShow = false;
+ const params = {stationCode:this.currentRow.stationCode, runPlanCode: this.currentRow.code};
+ params.status = this.currentRow.endRunPlan ? 0 : 1;
+ commitOperate(menuOperate.CTC.setEndRunplan, 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
@@ -1034,6 +1104,8 @@ export default {
}
},
+ // startRunplan
+ // endRunplan
noticeInfo() {
this.$refs.noticeInfo.doShow();
},
@@ -1321,7 +1393,9 @@ export default {
top:0;
}
.eachRpMenu{
- padding: 5px 20px;font-size:14px;cursor: pointer;
+ padding: 5px 30px;
+ font-size:14px;
+ cursor: pointer;
}
.eachRpMenu:hover{
background:#fff;
@@ -1385,4 +1459,16 @@ export default {
.fontBlack{color:#000}
.fontPink{color: #FF1493;}
.fontLightBlue{color: #87CEFA;}
+.eachRpMenuSelect{
+ display: inline-block;
+ padding: 3px 5px 0px 5px;
+ border: 1px #94c0fb solid;
+ border-radius: 3px;
+ background: rgba(148,192,251,0.3);
+ color: #0f1aff;
+ font-size: 12px;
+ line-height: 12px;
+ position: absolute;
+ left: 10px;
+}
diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js
index 95c7730bd..7ceb8d4ee 100644
--- a/src/scripts/cmdPlugin/CommandEnum.js
+++ b/src/scripts/cmdPlugin/CommandEnum.js
@@ -412,6 +412,8 @@ export default {
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_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_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 4c6eeeee9..8d0b5a72d 100644
--- a/src/scripts/cmdPlugin/OperationHandler.js
+++ b/src/scripts/cmdPlugin/OperationHandler.js
@@ -3887,14 +3887,28 @@ export const OperationEvent = {
// 设置允许出入口与基本路径不一致
setEntryOutDiscordant:{
menu: {
- operation: '1140',
+ operation: '1141',
domId: '_Tips-CTC-setEntryOutDiscordant-Menu{TOP}'
}
},
// 设置允许股道与基本路径不一致
setTrackDiscordant:{
menu: {
- operation: '1140',
+ operation: '1142',
+ domId: '_Tips-CTC-setTrackDiscordant-Menu{TOP}'
+ }
+ },
+ // 设置始发
+ setStartRunplan:{
+ menu: {
+ operation: '1145',
+ domId: '_Tips-CTC-setTrackDiscordant-Menu{TOP}'
+ }
+ },
+ // 设置终到
+ setEndRunplan:{
+ menu: {
+ operation: '1146',
domId: '_Tips-CTC-setTrackDiscordant-Menu{TOP}'
}
}