From e59e2ec8d4ceb4e8e7a128e994c6a660cb9fa91e Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Fri, 8 Jul 2022 17:45:07 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=82=A1=E9=81=93=E8=A7=86=E5=9B=BE?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newMap/displayCity/lineBoard.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/views/newMap/displayCity/lineBoard.vue b/src/views/newMap/displayCity/lineBoard.vue
index 7a4c8cf2e..dd4eb4892 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) {

From 03e8b90893f6cccd907ac62e35508024a914208b Mon Sep 17 00:00:00 2001
From: weizhihong <weizhihong@joylink.club>
Date: Mon, 11 Jul 2022 15:02:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E8=BF=90=E8=A1=8C=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E6=97=B6=E9=97=B4=E8=87=AA=E5=8A=A8=E5=8F=98=E5=8C=96?=
 =?UTF-8?q?=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../theme/datie_02/menus/runplanPane.vue      | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/jmapNew/theme/datie_02/menus/runplanPane.vue b/src/jmapNew/theme/datie_02/menus/runplanPane.vue
index 6efdba711..9eb86fdb6 100644
--- a/src/jmapNew/theme/datie_02/menus/runplanPane.vue
+++ b/src/jmapNew/theme/datie_02/menus/runplanPane.vue
@@ -49,7 +49,7 @@
         <div class="runplanClickBtn">阶段记事</div>
       </div>
       <div class="runplanStatusGroup">
-        <div class="eachRunplanStatus">2020年11月15日22:23:21</div>
+        <div class="eachRunplanStatus">{{ dateString1 + '  ' + time }}</div>
         <div class="eachRunplanStatus">与中心通信正常</div>
         <div class="eachRunplanStatus">与车站服务器通信正常</div>
       </div>
@@ -534,6 +534,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';
@@ -555,6 +557,9 @@ export default {
     },
     data() {
         return {
+            time: '00:00:00',
+            dateString: '',
+            dateString1: '',
             isShow:false,
             rpMenuPopShow:false,
             rpMenuPopTop:0,
@@ -585,6 +590,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();
         },
@@ -601,6 +611,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') {