diff --git a/src/jmapNew/theme/datie_02/menus/runplanPane.vue b/src/jmapNew/theme/datie_02/menus/runplanPane.vue index 9361e5725..afbdb2b30 100644 --- a/src/jmapNew/theme/datie_02/menus/runplanPane.vue +++ b/src/jmapNew/theme/datie_02/menus/runplanPane.vue @@ -49,7 +49,7 @@
阶段记事
-
2020年11月15日22:23:21
+
{{ dateString1 + ' ' + time }}
与中心通信正常
与车站服务器通信正常
@@ -548,6 +548,8 @@ import Rpsa from '@/assets/ctc_icon/rpsa.png'; import Rpb from '@/assets/ctc_icon/rpb.png'; import Rpwp from '@/assets/ctc_icon/rpwp.png'; import Rph from '@/assets/ctc_icon/rph.png'; +import { timeFormat } from '@/utils/date'; +import { prefixIntrger } from '@/utils/date'; import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'; import SendRunplan from './dialog/sendRunplan'; import StageRunplan from './dialog/stageRunplan'; @@ -569,6 +571,9 @@ export default { }, data() { return { + time: '00:00:00', + dateString: '', + dateString1: '', isShow:false, rpMenuPopShow:false, rpMenuPopTop:0, @@ -603,6 +608,11 @@ export default { ]) }, watch:{ + '$store.state.socket.simulationTimeSync': function (time) { // 仿真时间更新 + 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.railCtcRunplanChange': function (val) { this.loadData(); }, @@ -619,6 +629,16 @@ export default { } }, methods:{ + initDate(date) { + this.time = `${prefixIntrger(date.getHours(), 2)}:${prefixIntrger(date.getMinutes(), 2)}:${prefixIntrger(date.getSeconds(), 2)}`; + const years = date.getFullYear() + ''; + let months = date.getMonth() + 1 + ''; + let dates = date.getDate() + ''; + if (months.length < 2) { months = '0' + months; } + if (dates.length < 2) { dates = '0' + dates; } + this.dateString = years + months + dates; + this.dateString1 = years + '年' + months + '月' + dates + '日'; + }, judgeColor({row, rowIndex}) { if (row.effect) { if (row.passenger == 'PASSENGER') { diff --git a/src/views/newMap/displayCity/lineBoard.vue b/src/views/newMap/displayCity/lineBoard.vue index 3ffa1a879..5307377fe 100644 --- a/src/views/newMap/displayCity/lineBoard.vue +++ b/src/views/newMap/displayCity/lineBoard.vue @@ -351,6 +351,11 @@ export default { this.readOnlyMap = {}; this.standTrackSectionMap = {}; this.trackList = []; + this.sectionList.forEach(item => { + if (item.standTrack) { + this.standTrackSectionMap[item.code] = { trackName: item.name, occupied: false, belongStation:item.belongStation, lineMap: {}}; + } + }); }, '$store.state.socket.railCtcStatusMsg': function (val) { if (val && val.length) {