From c893dbac8e76f27036df9a0ce89cae303494af3d Mon Sep 17 00:00:00 2001
From: "SERVERM-0FVHDNN\\Administrator" <942005050@qq.com>
Date: Thu, 30 Mar 2023 18:03:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F=E5=8C=96?=
 =?UTF-8?q?=E8=A1=A58=E5=B0=8F=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/currenDescriptions/index.vue   |  7 ++---
 fe/PC/src/components/currenTable/index.vue    |  5 ++--
 fe/PC/src/components/umyTable/index.vue       |  8 ++---
 fe/PC/src/utils/formatTime.js                 | 30 +++++++++++++++++++
 4 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/fe/PC/src/components/currenDescriptions/index.vue b/fe/PC/src/components/currenDescriptions/index.vue
index e9a96eb04..829b3d40a 100644
--- a/fe/PC/src/components/currenDescriptions/index.vue
+++ b/fe/PC/src/components/currenDescriptions/index.vue
@@ -66,6 +66,7 @@
 </template>
 <script>
 import { parseTime } from "@/utils/index"
+import { formatDateTime } from "@/utils/formatTime"
 import { fileStorage } from "@/api/wms-api"
 
 let that
@@ -83,11 +84,7 @@ export default {
   },
   filters: {
     formatDate (time) {
-      if(!time){
-        return "-"
-      }
-      var date = new Date(time);
-      return parseTime(date)
+      return formatDateTime(time)
     },
     formatOnlyDate (time) {
       var date = new Date(time);
diff --git a/fe/PC/src/components/currenTable/index.vue b/fe/PC/src/components/currenTable/index.vue
index a1795a20c..35345717f 100644
--- a/fe/PC/src/components/currenTable/index.vue
+++ b/fe/PC/src/components/currenTable/index.vue
@@ -307,7 +307,7 @@
 </template>
 <script>
 import Sortable from "sortablejs";
-import { parseTime, debounce } from "@/utils/index";
+import { formatDateTime } from "@/utils/formatTime";
 import { getMatchRegConformValue } from "@/utils/index"
 import _ from "lodash";
 export default {
@@ -317,8 +317,7 @@ export default {
       if (time == null) {
         return '-'
       }
-      var date = new Date(time)
-      return parseTime(date)
+      return formatDateTime(time)
     },
   },
   props: {
diff --git a/fe/PC/src/components/umyTable/index.vue b/fe/PC/src/components/umyTable/index.vue
index da1aa4a59..dd2719025 100644
--- a/fe/PC/src/components/umyTable/index.vue
+++ b/fe/PC/src/components/umyTable/index.vue
@@ -320,18 +320,14 @@
   </u-table>
 </template>
 <script>
-import { parseTime } from "@/utils/index";
+import { formatDateTime } from "@/utils/formatTime";
 import _ from "lodash";
 import { getMatchRegConformValue } from "@/utils/index"
 export default {
   name: "currenTable",
   filters: {
     formatDate(time) {
-      if (time == null) {
-        return '-'
-      }
-      var date = new Date(time)
-      return parseTime(date)
+      return formatDateTime(time)
     },
   },
   props: {
diff --git a/fe/PC/src/utils/formatTime.js b/fe/PC/src/utils/formatTime.js
index 542bab375..4019a2b42 100644
--- a/fe/PC/src/utils/formatTime.js
+++ b/fe/PC/src/utils/formatTime.js
@@ -1,5 +1,35 @@
+/**
+ * 格林威治的时间差 补8小时
+ */
+export function formatDateTime(dateTime) {
+    dateTime = formatTimeStrToStr(dateTime)
+    if (!dateTime) {
+    	return '-'
+    }
+    var nowDate = new Date(dateTime).getTime();
+    // var timezone = 8; //目标时区时间，东八区
+    var offset_GMT = new Date().getTimezoneOffset(); // 本地时间和格林威治的时间差，单位为分钟
+    // var nowDate = new Date().getTime(); // 本地时间距 1970 年 1 月 1 日午夜（GMT 时间）之间的毫秒数
+    // var targetDate = new Date(nowDate + offset_GMT * 60 * 1000 + timezone * 60 * 60 * 1000);
+    var targetDate = new Date(nowDate - offset_GMT * 60 * 1000);
+    let datae = new Date(targetDate);
+    var YY = datae.getFullYear() + '-';
+    var MM =(datae.getMonth() + 1 < 10
+    ? '0' + (datae.getMonth() + 1)
+    : datae.getMonth() + 1) + '-';
+    var DD = datae.getDate() < 10 ? '0' + datae.getDate() : datae.getDate();
+    var hh =(datae.getHours() < 10 ? '0' + datae.getHours() : datae.getHours())+':';
+    var mm =(datae.getMinutes() < 10 ? '0' + datae.getMinutes() : datae.getMinutes()) +':';
+    var ss =datae.getSeconds() < 10 ? '0' + datae.getSeconds() : datae.getSeconds();
+    let mydatavalue = `${YY}${MM}${DD} ${hh}${mm}${ss}`;
+    return mydatavalue
+  }
+  
 // 2022-08-31T09:45:51.9340433  转 2022-08-31 09:45:51
 export function formatTimeStrToStr(timeStr) {
+    if (!timeStr || !new Date(timeStr)) {
+      return ''
+    }
     if (timeStr.lastIndexOf('.') == -1) {
         return timeStr.replace('T',' ').substring(0,timeStr.length)
     }