From 0f5176cd48ab4d1febcd9673c60b554e1e6ce6cb Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 19 May 2021 18:41:00 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=20alertMessage?=
 =?UTF-8?q?=20endTIme=20=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/table/alert/alertMessageTable.vue | 6 +++---
 nezha-fronted/src/components/page/alert/alertMessage.vue    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
index 7683e5248..71f6a7ced 100644
--- a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
@@ -60,12 +60,12 @@
           <span v-else-if="item.prop === 'severity'&&scope.row[item.prop]" class="severity">
             <i class="nz-icon nz-icon-circle" :style="{color:scope.row[item.prop].color,'font-size':'12px','margin-right':'5px'}"></i> {{scope.row[item.prop].name}}
           </span>
-          <span v-else-if="item.prop === 'startAt'">{{utcTimeToTimezoneStr(scope.row[item.prop])}}</span>
+          <span v-else-if="item.prop === 'startAt'">{{utcTimeToTimezoneStr(scope.row.startAt)}}</span>
           <template v-else-if="item.prop === 'duration'">
             <el-tooltip :disabled="!scope.row.endAt" effect="light" placement="right">
               <div slot="content">
                 {{$t('config.terminallog.endTime')}}<br/>
-                {{scope.row.endAt}}
+                {{utcTimeToTimezoneStr(scope.row.endAt)}}
               </div>
               <span>{{getDuration(scope.row)}}</span>
             </el-tooltip>
@@ -236,7 +236,7 @@ export default {
     },
     getDuration () {
       return function (record) {
-        if (record.endTime) {
+        if (record.endAt) {
           return calcDurationByStringTimeB(record.startAt, record.endAt)
         }
         return calcDurationByStringTimeB(record.startAt, this.nowTime)
diff --git a/nezha-fronted/src/components/page/alert/alertMessage.vue b/nezha-fronted/src/components/page/alert/alertMessage.vue
index 58169a73d..4dce6eb2a 100644
--- a/nezha-fronted/src/components/page/alert/alertMessage.vue
+++ b/nezha-fronted/src/components/page/alert/alertMessage.vue
@@ -144,7 +144,7 @@ export default {
             id: 26,
             name: this.$t('alert.list.id'),
             type: 'id',
-            label: 'id',
+            label: 'ids',
             disabled: false
           },
           {
@@ -244,7 +244,7 @@ export default {
     },
     queryChartDate () {
       const $temp = this
-      const start = this.searchTime[0] ? this.searchTime[0] : bus.computeTimezoneTime(new Date().getTime() - 1 * 30 * 60* 1000)
+      const start = this.searchTime[0] ? this.searchTime[0] : bus.computeTimezoneTime(new Date().getTime() - 1 * 30 * 60 * 1000)
       const end = this.searchTime[1] ? this.searchTime[1] : bus.computeTimezoneTime(new Date().getTime())
       this.searchTimeDialog = [start, end]
       const timeDiff = (new Date(end).getTime() - new Date(start).getTime()) / 1000 / (24 * 60 * 60)