diff --git a/src/jmapNew/theme/datie_02/menus/dialog/addDispatcherLogerRunplan.vue b/src/jmapNew/theme/datie_02/menus/dialog/addDispatcherLogerRunplan.vue index ace2715c1..8a539af65 100644 --- a/src/jmapNew/theme/datie_02/menus/dialog/addDispatcherLogerRunplan.vue +++ b/src/jmapNew/theme/datie_02/menus/dialog/addDispatcherLogerRunplan.vue @@ -42,13 +42,13 @@ - + - + - + - + - + - + - + 始发 - + 终到 diff --git a/src/jmapNew/theme/datie_02/menus/dialog/stageRunplan.vue b/src/jmapNew/theme/datie_02/menus/dialog/stageRunplan.vue new file mode 100644 index 000000000..d062cc84c --- /dev/null +++ b/src/jmapNew/theme/datie_02/menus/dialog/stageRunplan.vue @@ -0,0 +1,179 @@ + + + diff --git a/src/jmapNew/theme/datie_02/menus/dispatcherLoger.vue b/src/jmapNew/theme/datie_02/menus/dispatcherLoger.vue index cd15a4248..56e7ad6f8 100644 --- a/src/jmapNew/theme/datie_02/menus/dispatcherLoger.vue +++ b/src/jmapNew/theme/datie_02/menus/dispatcherLoger.vue @@ -85,6 +85,7 @@ v-model="tableData[scope.$index].arriveSectionCode" placeholder="" size="mini" + :disabled="scope.row.status==-1" popper-class="stationSelect" @change="changeArriveRunPlan($event,scope.row,scope.$index)" > @@ -112,6 +113,7 @@ passenger placeholder="" size="mini" popper-class="stationSelect" + :disabled="scope.row.status==-1" @change="changeDepartRunPlan($event,scope.row,scope.$index)" >
调度命令
-
阶段计划(F8)
+
阶段计划(F8)
发送计划
阶段记事
@@ -484,6 +484,7 @@ + @@ -505,6 +506,7 @@ import Rpwp from '@/assets/ctc_icon/rpwp.png'; import Rph from '@/assets/ctc_icon/rph.png'; import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'; import SendRunplan from './dialog/sendRunplan'; +import StageRunplan from './dialog/stageRunplan'; import DeleteRunplan from './dialog/deleteRunplan'; import ModifyAdjacentStation from './dialog/modifyAdjacentStation'; import ModifyTripNumber from './dialog/modifyTripNumber'; @@ -515,6 +517,7 @@ export default { name:'RunplanPane', components: { SendRunplan, + StageRunplan, DeleteRunplan, ModifyAdjacentStation, ModifyTripNumber, @@ -541,6 +544,7 @@ export default { filterSectionList:[], activeDepartRunPlan:{}, activeArriveRunPlan:{}, + currentRailwaySimulationRunplan:{}, // radioSelected:'' currentRow:null }; @@ -553,9 +557,23 @@ export default { watch:{ '$store.state.socket.railCtcRunplanChange': function (val) { this.loadData(); + }, + '$store.state.socket.railwaySimulationRunplanSendChange': function (val) { + this.getRailwaySimulationRunplanSend(); } + // railwaySimulationRunplanSendMap + // railwaySimulationRunplanSendChange }, methods:{ + getRailwaySimulationRunplanSend() { + const stationCode = this.$store.state.training.roleDeviceCode; + const railwaySimulationRunplanSendMap = this.$store.state.socket.railwaySimulationRunplanSendMap; + if (railwaySimulationRunplanSendMap[stationCode] && railwaySimulationRunplanSendMap[stationCode].dataList.length > 0) { + // 阶段计划 + document.getElementById('stageRunplan').classList.add('active'); + this.currentRailwaySimulationRunplan = railwaySimulationRunplanSendMap; + } + }, loadData() { this.tableData = []; const railCtcRunplanInitMsg = copyAssign({}, this.$store.state.socket.railCtcRunplanInitMsg); @@ -589,6 +607,7 @@ export default { this.tableData = []; this.loadData(); this.isShow = true; + this.getRailwaySimulationRunplanSend(); window.addEventListener('keydown', this.handleKeyDown); // arriveRunPlan: Object // code: "00110010" @@ -622,6 +641,11 @@ export default { this.agreeNotcie(); break; } + case 'F8': { + event.preventDefault(); + this.stageRunplan(); + break; + } } } }, @@ -630,6 +654,12 @@ export default { this.$refs.sendRunplan.doShow(this.tableData, this.activeDepartRunPlan, this.activeArriveRunPlan, this.filterSectionList); } }, + stageRunplan() { + if (document.getElementById('stageRunplan').className.includes('active')) { + const stationCode = this.$store.state.training.roleDeviceCode; + this.$refs.stageRunplan.doShow(this.currentRailwaySimulationRunplan[stationCode], this.filterSectionList); + } + }, focusDepartRunPlan(event, row) { this.activeDepartRunPlan[row.code] = {sectionCode:event, code:row.code}; }, @@ -680,6 +710,10 @@ export default { const sendRunplan = document.getElementById('sendRunplan').className; document.getElementById('sendRunplan').className = sendRunplan.replace('active', ''); }, + closeStageFlash() { + const sendRunplan = document.getElementById('stageRunplan').className; + document.getElementById('stageRunplan').className = sendRunplan.replace('active', ''); + }, selectedTripNumber(row, column, cell, event) { if (column.property == 'tripNumber') { if (this.currentRow && this.currentRow.code == row.code) { @@ -984,7 +1018,7 @@ export default { .runplanTwo1Level{line-height: 28px;} .runplanTwo3Level{line-height: 70px;} .runplanZhe{width: 16px;display: inline-block;vertical-align: top;} -#sendRunplan.active{ +#sendRunplan.active,#stageRunplan.active{ animation:changeColor 1s infinite; -moz-animation:changeColor 1s infinite; /* Firefox */ -webkit-animation:changeColor 1s infinite; /* Safari and Chrome */ diff --git a/src/store/modules/socket.js b/src/store/modules/socket.js index 30510fa50..c4ed18178 100644 --- a/src/store/modules/socket.js +++ b/src/store/modules/socket.js @@ -233,9 +233,12 @@ function handle(state, data) { }); state.railCtcRunplanChange++; break; - // 大铁项目 ctc 调度下发消息 + // 大铁项目 ctc 调度发布行车计划 给车站下发消息 case 'SIMULATION_RAILWAY_RUN_PLAN_SEND': - // TODO + msg.forEach(each=>{ + state.railwaySimulationRunplanSendMap[each.stationCode] = each; + }); + state.railwaySimulationRunplanSendChange++; break; // 大铁项目 ctc 车务管理端 初始化消息 case 'SIMULATION_CTC_MANAGER_RUN_PLAN_EDIT_INIT': @@ -440,7 +443,9 @@ const socket = { railCtcRunplanInitMsg:{}, // 大铁项目 ctc 运行图初始化信息 railCtcRunplanChange:0, // 大铁项目 ctc 运行图信息变化 railCtcStationManageRpMsg:{}, // 大铁项目 ctc 车务管理 端运行图信息 - railCtcStationManageRpChange:0 // 大铁项目 ctc 车务管理 运行图信息变化 + railCtcStationManageRpChange:0, // 大铁项目 ctc 车务管理 运行图信息变化 + railwaySimulationRunplanSendMap:{}, // 大铁项目 调度台 发布 行车计划 + railwaySimulationRunplanSendChange:0 // 大铁项目 调度台 发布 行车计划变化 // railwaySimulationRpMsg:{}, // 大铁项目 调度台 调度台 // railwaySimulationRpChange:0 // 大铁项目 调度台 运行图信息变化 },