From b762506cd543ecd771910663ac6b1b8f90ca2732 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 1 Jun 2022 12:03:23 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-1801=20fix=EF=BC=9A=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F=E5=90=8EExplore=E5=86=85?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=9B=BE=E8=A1=A8=E4=BF=A1=E6=81=AF=E4=B8=8B?=
 =?UTF-8?q?=E6=96=B9=E6=97=A5=E6=9C=9F=E6=9C=AA=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/table/settings/agentTable.vue  |  6 +++++-
 .../page/dashboard/explore/exploreItem.vue           |  4 ++--
 .../src/components/page/dashboard/overview/chart.vue | 12 +++++++++---
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/nezha-fronted/src/components/common/table/settings/agentTable.vue b/nezha-fronted/src/components/common/table/settings/agentTable.vue
index e387feda2..96b15bb8a 100644
--- a/nezha-fronted/src/components/common/table/settings/agentTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/agentTable.vue
@@ -41,7 +41,7 @@
                 {{findServerType(scope.row[item.prop]).text}}
               </span>
         <span v-else-if="item.prop === 'checkTime'">{{utcTimeToTimezoneStr(scope.row[item.prop])}}</span>
-        <span v-else-if="item.prop === 'ts'">{{scope.row[item.prop]?utcTimeToTimezoneStr(scope.row[item.prop]):'-'}}</span>
+        <span v-else-if="item.prop === 'ts'">{{scope.row[item.prop]?timeFormate(computeTimezoneTime(scope.row[item.prop])):'-'}}</span>
         <span v-else-if="item.prop === 'status'">
           <el-popover :content="$t('asset.assetStatPre')+(scope.row.checkTime?utcTimeToTimezoneStr(scope.row.checkTime):$t('asset.assetStatDown'))" placement="right" trigger="hover" width="200">
             <div slot="reference" style="width: 60px">
@@ -87,6 +87,7 @@
 </template>
 
 <script>
+import bus from '@/libs/bus'
 import table from '@/components/common/mixin/table'
 import { agent } from '@/components/common/js/constants'
 export default {
@@ -168,6 +169,9 @@ export default {
       return this.promServerType.find(item => {
         return item.value == type
       })
+    },
+    computeTimezoneTime (time) {
+      return bus.computeTimezoneTime(time)
     }
   }
 }
diff --git a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
index 2529ac76f..74ff72322 100644
--- a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
+++ b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
@@ -88,7 +88,7 @@
             <template v-if="showMetrics">
               <el-collapse-item name="1" :title="$t('explore.graph')" class="el-collapse-item__height">
                 <div class="chart-room">
-                  <chart ref="exploreChart" :unit="chartUnit"></chart>
+                  <chart ref="exploreChart" :unit="chartUnit" :timeRange="filterTime"></chart>
                 </div>
               </el-collapse-item>
               <el-collapse-item class="el-collapse-item__height" name="2" title="Table">
@@ -158,7 +158,7 @@
             <template v-else>
               <el-collapse-item v-if="showTab.indexOf('1') > -1" name="1" :title="$t('explore.graph')" class="el-collapse-item__height">
                 <div class="chart-room">
-                  <chart ref="logChart" :unit="chartUnit" v-my-loading="chartLoading"></chart>
+                  <chart ref="logChart" :unit="chartUnit" v-my-loading="chartLoading" :timeRange="filterTime"></chart>
                 </div>
               </el-collapse-item>
               <el-collapse-item v-if="showTab.indexOf('2') > -1" name="2" title="Logs">
diff --git a/nezha-fronted/src/components/page/dashboard/overview/chart.vue b/nezha-fronted/src/components/page/dashboard/overview/chart.vue
index ffc587b95..998daa544 100644
--- a/nezha-fronted/src/components/page/dashboard/overview/chart.vue
+++ b/nezha-fronted/src/components/page/dashboard/overview/chart.vue
@@ -41,7 +41,8 @@ export default {
     yAxisFormatter: Function,
     map: {},
     axisTooltip: { type: String }, // x/y
-    minusTime: {} // 用于比较图表时的时间差值
+    minusTime: {}, // 用于比较图表时的时间差值
+    timeRange: {}
   },
   data () {
     return {
@@ -388,6 +389,8 @@ export default {
       const hour = tData.getHours() > 9 ? tData.getHours() : '0' + tData.getHours()
       const minute = tData.getMinutes() > 9 ? tData.getMinutes() : '0' + tData.getMinutes()
       const dateFormatStr = this.timeFormatMain.split(' ')[0]
+      const diffSec = (this.timezoneToUtcTime(this.timeRange[1]) - this.timezoneToUtcTime(this.timeRange[0]))
+      const secOneDay = 24 * 60 * 60 * 1000// 1天的毫秒数
       let str = ''
       if (dateFormatStr === 'DD/MM/YYYY') {
         str += [day, month].join('/')
@@ -396,8 +399,11 @@ export default {
       } else {
         str += [month, day].join('-')
       }
-      return str + '\n' +
-          [hour, minute].join(':')
+      if (diffSec <= secOneDay) { // 同一天
+        return [hour, minute].join(':')
+      } else { // 大于1天，小于30天
+        return str + '\n' + [hour, minute].join(':')
+      }
     },
     defaultToolBoxFormatter (params) {
       if (params.name === 'stack') {