From 3197641b975ef248f86eeaf24ac6e3095f651f15 Mon Sep 17 00:00:00 2001
From: joylink_fanyuhong <18706759286@163.com>
Date: Tue, 25 Feb 2020 10:36:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BF=E7=9C=9F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../theme/beijing_01/planSchedule/schedule.vue |  5 +++--
 .../theme/chengdu_03/planSchedule/schedule.vue |  4 +++-
 .../theme/haerbin_01/planSchedule/schedule.vue |  6 +++---
 .../theme/ningbo_01/planSchedule/schedule.vue  |  5 +++--
 src/store/modules/socket.js                    |  2 +-
 src/utils/date.js                              | 18 ++++++++----------
 6 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/jmapNew/theme/beijing_01/planSchedule/schedule.vue b/src/jmapNew/theme/beijing_01/planSchedule/schedule.vue
index a96498b1c..82a3c9ed3 100644
--- a/src/jmapNew/theme/beijing_01/planSchedule/schedule.vue
+++ b/src/jmapNew/theme/beijing_01/planSchedule/schedule.vue
@@ -25,7 +25,7 @@
 <script>
 import { mapGetters } from 'vuex';
 import { timeFormat } from '@/utils/date';
-import { runDiagramGetTime } from '@/api/simulation';
+import {toTimeStamp, formatDuring} from '@/utils/date';
 import DataTable from '../menusPlan/components/dataTable';
 import echarts from 'echarts';
 
@@ -350,7 +350,8 @@ export default {
                     this.destroy();
                     let startValue = 3600 + this.PlanConvert.TranslationTime;
                     const offsetTime = 3600;
-                    startValue = this.$store.state.training.initTime - this.PlanConvert.TranslationTime;
+                    const initTime = toTimeStamp(formatDuring(this.$store.state.training.initTime));
+                    startValue = initTime - this.PlanConvert.TranslationTime;
                     this.option.dataZoom[0].startValue = this.option.dataZoom[1].startValue = startValue - offsetTime;
                     this.option.dataZoom[0].endValue = this.option.dataZoom[1].endValue = startValue + offsetTime;
                     this.option.series = series;
diff --git a/src/jmapNew/theme/chengdu_03/planSchedule/schedule.vue b/src/jmapNew/theme/chengdu_03/planSchedule/schedule.vue
index 57008bbed..243166af0 100644
--- a/src/jmapNew/theme/chengdu_03/planSchedule/schedule.vue
+++ b/src/jmapNew/theme/chengdu_03/planSchedule/schedule.vue
@@ -27,6 +27,7 @@ import { mapGetters } from 'vuex';
 import { timeFormat } from '@/utils/date';
 import DataTable from '../menusPlan/components/dataTable';
 import echarts from 'echarts';
+import {toTimeStamp, formatDuring} from '@/utils/date';
 
 export default {
     name: 'PlanSchedule',
@@ -360,7 +361,8 @@ export default {
                     this.destroy();
                     let startValue = 3600 + this.PlanConvert.TranslationTime;
                     const offsetTime = 3600;
-                    startValue = this.$store.state.training.initTime - this.PlanConvert.TranslationTime;
+                    const initTime = toTimeStamp(formatDuring(this.$store.state.training.initTime));
+                    startValue = initTime - this.PlanConvert.TranslationTime;
                     this.option.dataZoom[0].startValue = this.option.dataZoom[1].startValue = startValue - offsetTime;
                     this.option.dataZoom[0].endValue = this.option.dataZoom[1].endValue = startValue + offsetTime;
                     this.option.series = series;
diff --git a/src/jmapNew/theme/haerbin_01/planSchedule/schedule.vue b/src/jmapNew/theme/haerbin_01/planSchedule/schedule.vue
index d59110421..2f066549a 100644
--- a/src/jmapNew/theme/haerbin_01/planSchedule/schedule.vue
+++ b/src/jmapNew/theme/haerbin_01/planSchedule/schedule.vue
@@ -25,7 +25,7 @@
 <script>
 import { mapGetters } from 'vuex';
 import { timeFormat } from '@/utils/date';
-import { runDiagramGetTime } from '@/api/simulation';
+import {toTimeStamp, formatDuring} from '@/utils/date';
 import DataTable from '../menusPlan/components/dataTable';
 import echarts from 'echarts';
 
@@ -360,10 +360,10 @@ export default {
             return new Promise((resolve, reject) => {
                 try {
                     this.destroy();
-
                     let startValue = 3600 + this.PlanConvert.TranslationTime;
                     const offsetTime = 3600;
-                    startValue = this.$store.state.training.initTime - this.PlanConvert.TranslationTime;
+                    const initTime = toTimeStamp(formatDuring(this.$store.state.training.initTime));
+                    startValue = initTime - this.PlanConvert.TranslationTime;
                     this.option.dataZoom[0].startValue = this.option.dataZoom[1].startValue = startValue - offsetTime;
                     this.option.dataZoom[0].endValue = this.option.dataZoom[1].endValue = startValue + offsetTime;
                     this.option.series = series;
diff --git a/src/jmapNew/theme/ningbo_01/planSchedule/schedule.vue b/src/jmapNew/theme/ningbo_01/planSchedule/schedule.vue
index a96498b1c..82a3c9ed3 100644
--- a/src/jmapNew/theme/ningbo_01/planSchedule/schedule.vue
+++ b/src/jmapNew/theme/ningbo_01/planSchedule/schedule.vue
@@ -25,7 +25,7 @@
 <script>
 import { mapGetters } from 'vuex';
 import { timeFormat } from '@/utils/date';
-import { runDiagramGetTime } from '@/api/simulation';
+import {toTimeStamp, formatDuring} from '@/utils/date';
 import DataTable from '../menusPlan/components/dataTable';
 import echarts from 'echarts';
 
@@ -350,7 +350,8 @@ export default {
                     this.destroy();
                     let startValue = 3600 + this.PlanConvert.TranslationTime;
                     const offsetTime = 3600;
-                    startValue = this.$store.state.training.initTime - this.PlanConvert.TranslationTime;
+                    const initTime = toTimeStamp(formatDuring(this.$store.state.training.initTime));
+                    startValue = initTime - this.PlanConvert.TranslationTime;
                     this.option.dataZoom[0].startValue = this.option.dataZoom[1].startValue = startValue - offsetTime;
                     this.option.dataZoom[0].endValue = this.option.dataZoom[1].endValue = startValue + offsetTime;
                     this.option.series = series;
diff --git a/src/store/modules/socket.js b/src/store/modules/socket.js
index a076be2e4..04bc6bab8 100644
--- a/src/store/modules/socket.js
+++ b/src/store/modules/socket.js
@@ -2,7 +2,7 @@ import store from '@/store';
 import { Notification } from 'element-ui';
 
 function handle(state, data) {
-    console.log(data, 'socket订阅');
+    // console.log(data, 'socket订阅');
     const msg = data.body;
     const path = window.location.href;
     switch (data.type) {
diff --git a/src/utils/date.js b/src/utils/date.js
index 5d1596c8a..85295ccb0 100644
--- a/src/utils/date.js
+++ b/src/utils/date.js
@@ -39,9 +39,9 @@ export function timeFormat(usedTime) {
 
 export function toTimeStamp(time) {
     let s = 0;
-    let hour = time.split(':')[0];
-    let min = time.split(':')[1];
-    let sec = time.split(':')[2];
+    const hour = time.split(':')[0];
+    const min = time.split(':')[1];
+    const sec = time.split(':')[2];
     s = Number(hour * 3600) + Number(min * 60) + Number(sec);
     return s;
 }
@@ -49,13 +49,11 @@ export function toTimeStamp(time) {
 // 时间戳的只转为时分秒
 
 export function formatDuring(mss) {
-    let hours = parseInt((mss % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60));
-    let minutes = parseInt((mss % (1000 * 60 * 60)) / (1000 * 60));
-    let seconds = (mss % (1000 * 60)) / 1000;
-    hours = hours < 10 ? ('0' + hours) : hours;
-    minutes = minutes < 10 ? ('0' + minutes) : minutes;
-    seconds = seconds < 10 ? ('0' + seconds) : seconds;
-    return hours + ":" + minutes + ":" + seconds;
+    const now = new Date(mss);
+    const hour = now.getHours(); // 返回日期中的小时数（0到23）
+    const minute = now.getMinutes(); // 返回日期中的分钟数（0到59）
+    const second = now.getSeconds(); // 返回日期中的秒数（0到59）
+    return hour + ':' + minute + ':' + second;
 }
 
 export function prefixIntrger(num, length) {