diff --git a/src/jmapNew/theme/datie_02/menus/dialog/addDispatcherLogerRunplan.vue b/src/jmapNew/theme/datie_02/menus/dialog/addDispatcherLogerRunplan.vue index 8a539af65..976daf1f2 100644 --- a/src/jmapNew/theme/datie_02/menus/dialog/addDispatcherLogerRunplan.vue +++ b/src/jmapNew/theme/datie_02/menus/dialog/addDispatcherLogerRunplan.vue @@ -12,7 +12,7 @@ > - + { return each.stationCode == stationCode; }); + this.filterDepMapStationDirectionList = this.mapStationDirectionList.filter(each=>{ return each.stationCode == stationCode; }); + this.filterArrSectionList = this.filterSectionList.filter(each=>{ return each.stationCode == stationCode; }); + this.filterDepSectionList = this.filterSectionList.filter(each=>{ return each.stationCode == stationCode; }); + }, doClose() { this.loading = false; this.dialogShow = false; @@ -276,6 +286,8 @@ export default { transfinite:'NO' // 超限等级 NO：不超限 TRANSFINITE_SUPER：超级超限 TRANSFINITE_ONE_LEVEL：一级超限 TRANSFINITE_TWO_LEVEL：二级超限 }; + this.filterArrMapStationDirectionList = []; + this.filterDepMapStationDirectionList = []; this.$store.dispatch('training/emitTipFresh'); }, commit() { diff --git a/src/jmapNew/theme/datie_02/menus/index.vue b/src/jmapNew/theme/datie_02/menus/index.vue index 501c9b096..44feee8f2 100644 --- a/src/jmapNew/theme/datie_02/menus/index.vue +++ b/src/jmapNew/theme/datie_02/menus/index.vue @@ -26,7 +26,7 @@
调度命令
-
阶段计划
+
阶段计划
阶段记事
{{ dateString1 + ' ' + time }}
同步站机通信中断
@@ -55,6 +55,8 @@ + +
@@ -70,6 +72,8 @@ import MenuStation from './menuStation'; import MenuBar from './menuBar'; import MenuButtonCtc from './menuButtonCtc'; import RunplanPane from './runplanPane'; +import StageRunplan from './dialog/stageRunplan'; +import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'; // import DispatcherLoger from './dispatcherLoger'; import PassiveAlarm from './passiveDialog/alarm'; import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control'; @@ -113,6 +117,8 @@ export default { PassiveTimeout, MenuButtonCtc, RunplanPane, + StageRunplan, + NoticeInfo, // DispatcherLoger, BottomTable, MenuPanel @@ -127,6 +133,7 @@ export default { }, data() { return { + currentRailwaySimulationRunplan:{}, alarmMessages: [ { id: 1, message: '这是告警信息一' }, { id: 2, message: '这是告警信息二' }, @@ -190,6 +197,14 @@ export default { this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${timeFormat(time)}`)); const date = new Date(+new Date(`${new Date().toLocaleDateString()} ${timeFormat(time)}`)); this.initDate(date); + }, + '$store.state.socket.railwaySimulationRunplanSendChange': function (val) { + this.getRailwaySimulationRunplanSend(); + }, + '$store.state.training.roleDeviceCode': function (val) { + if (this.isCtc) { + this.getRailwaySimulationRunplanSend(); + } } }, mounted() { @@ -213,6 +228,18 @@ export default { window.onclick = function (e) {}; }, 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('stageRunplanOut').classList.add('active'); + this.currentRailwaySimulationRunplan = railwaySimulationRunplanSendMap; + } else { + const sendRunplan = document.getElementById('stageRunplanOut').className; + document.getElementById('stageRunplanOut').className = sendRunplan.replace('active', ''); + } + }, initDate(date) { this.time = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}:${prefixIntrger(date.getSeconds(), 2)}`; const years = date.getFullYear() + ''; @@ -225,6 +252,21 @@ export default { }, handleRunplan() { this.$refs.runplanPane.doShow(); + }, + stageRunplan() { + if (document.getElementById('stageRunplanOut').className.includes('active')) { + const stationCode = this.$store.state.training.roleDeviceCode; + this.$refs.stageRunplan.doShow(this.currentRailwaySimulationRunplan[stationCode]); + } + }, + noticeInfo() { + this.$refs.noticeInfo.doShow(); + }, + closeStageFlash() { + const sendRunplan = document.getElementById('stageRunplanOut').className; + document.getElementById('stageRunplanOut').className = sendRunplan.replace('active', ''); + const stationCode = this.$store.state.training.roleDeviceCode; + this.$store.dispatch('socket/deleteRailwaySimulationRunplan', stationCode); } // goDispatcherLoger() { // this.$refs.dispatcherLoger.doShow(); @@ -757,4 +799,30 @@ export default { .img-box:hover{ border: 2px #ccc inset; } + #stageRunplanOut{ + width: 100px;height: 25px;line-height: 21px;text-align: center;margin-left: 100px; + } + #stageRunplanOut.active{ + animation:changeColor 1s infinite; + -moz-animation:changeColor 1s infinite; /* Firefox */ + -webkit-animation:changeColor 1s infinite; /* Safari and Chrome */ + } + @keyframes changeColor + { + 0% {background:#f0f0f0;} + 50% {background:#ff1900;} + 100% {background:#f0f0f0;} + } + @-moz-keyframes changeColor /* Firefox */ + { + 0% {background:#f0f0f0;} + 50% {background:#ff1900;} + 100% {background:#f0f0f0;} + } + @-webkit-keyframes changeColor /* Safari and Chrome */ + { + 0% {background:#f0f0f0;} + 50% {background:#ff1900;} + 100% {background:#f0f0f0;} + } diff --git a/src/jmapNew/theme/datie_02/menus/runplanPane.vue b/src/jmapNew/theme/datie_02/menus/runplanPane.vue index bc90c7a11..036da1041 100644 --- a/src/jmapNew/theme/datie_02/menus/runplanPane.vue +++ b/src/jmapNew/theme/datie_02/menus/runplanPane.vue @@ -572,6 +572,9 @@ export default { // 阶段计划 document.getElementById('stageRunplan').classList.add('active'); this.currentRailwaySimulationRunplan = railwaySimulationRunplanSendMap; + } else { + const sendRunplan = document.getElementById('stageRunplan').className; + document.getElementById('stageRunplan').className = sendRunplan.replace('active', ''); } }, loadData() { diff --git a/src/store/modules/socket.js b/src/store/modules/socket.js index a13d33fca..d1ced1992 100644 --- a/src/store/modules/socket.js +++ b/src/store/modules/socket.js @@ -536,6 +536,7 @@ const socket = { }, deleteRailwaySimulationRunplan: (state, stationCode) => { delete state.railwaySimulationRunplanSendMap[stationCode]; + state.railwaySimulationRunplanSendChange++; } },