From 60f8eb7d3896f030974d7ecac70a5ae24c0b29aa Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 31 Mar 2022 09:55:22 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-1756=20fix=EF=BC=9Aexplore=20table=20time?=
 =?UTF-8?q?=20=E5=88=97=E6=97=B6=E5=8C=BA=E8=BD=AC=E6=8D=A2=E4=B8=8D?=
 =?UTF-8?q?=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/page/dashboard/explore/exploreItem.vue    | 2 +-
 nezha-fronted/src/main.js                                    | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
index 24ce8145b..f84854a4e 100644
--- a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
+++ b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
@@ -134,7 +134,7 @@
                       show-overflow-tooltip
                     >
                       <template slot-scope="scope" :column="item">
-                        <template v-if="item.prop === 'time'">{{utcTimeToTimezoneStr(scope.row.time)}}</template>
+                        <template v-if="item.prop === 'time'">{{timeFormate(scope.row.time)}}</template>
                         <span v-else-if="scope.row[item.prop]">{{scope.row[item.prop]}}</span>
                         <template v-else>-</template>
                       </template>
diff --git a/nezha-fronted/src/main.js b/nezha-fronted/src/main.js
index 579138526..17c4111c8 100644
--- a/nezha-fronted/src/main.js
+++ b/nezha-fronted/src/main.js
@@ -104,7 +104,7 @@ Vue.mixin({
     },
     utcTimeToTimezoneStr: function (time) {
       if (time) {
-        return bus.timeFormate(time, localStorage.getItem('nz-default-dateFormat') || 'YYYY-MM-DD HH:mm:ss')
+        return bus.timeFormate(bus.UTCTimeToConfigTimezone(time), localStorage.getItem('nz-default-dateFormat') || 'YYYY-MM-DD HH:mm:ss')
       } else {
         return '-'
       }
@@ -135,6 +135,9 @@ Vue.mixin({
         return '-'
       }
     },
+    timeFormate (time) {
+      return bus.timeFormate(time)
+    },
     hasButton (code) {
       return hasButton(this.$store.getters.buttonList, code)
     },