From 4426f0609917a34003f81f4f4cf3d6ec1591d63f Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 2 Nov 2022 11:30:05 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-2351=20=20fix=EF=BC=9Aterminal=20log=20comm?=
 =?UTF-8?q?and=20=E4=BA=8C=E7=BA=A7=E9=A1=B5=E9=9D=A2=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=97=B6=E5=8C=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/bottomBox/tabs/terminalLogCMDTab.vue   | 5 ++---
 .../common/bottomBox/tabs/terminalLogMonitorTab.vue          | 1 -
 .../common/bottomBox/tabs/terminalLogRecordTab.vue           | 1 -
 nezha-fronted/src/components/common/mixin/dataList.js        | 3 +++
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogCMDTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogCMDTab.vue
index 27d0c6631..248da7b15 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogCMDTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogCMDTab.vue
@@ -1,7 +1,6 @@
 <template>
   <nz-bottom-data-list
     :showTitle='showTitle'
-    :tableId="tableId"
     :obj='obj'
     :layout="[]"
     :tabs="tabs"
@@ -51,10 +50,10 @@ export default {
     calcTime () {
       return function (time) {
         if (this.obj.startTime) {
-          const startTime = new Date(this.obj.startTime).getTime()
+          const startTime = new Date(this.utcTimeToTimezoneStr(this.obj.startTime)).getTime()
           if (startTime) {
             const thisTime = startTime + time
-            return this.dateFormat(thisTime)
+            return this.momentTz(thisTime)
           }
         }
         return '-'
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogMonitorTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogMonitorTab.vue
index b147e9acc..f511f07a3 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogMonitorTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogMonitorTab.vue
@@ -6,7 +6,6 @@
     :tabs="tabs"
       :targetTab="targetTab"
     @changeTab="changeTab"
-      :tableId="tableId"
     :title="'Session ID'"
   >
     <template v-slot:title><span :title="obj.uuid.substring(0, 8).toUpperCase()">{{obj.uuid.substring(0, 8).toUpperCase()}}</span></template>
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogRecordTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogRecordTab.vue
index 0e545d601..341e0002d 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogRecordTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogRecordTab.vue
@@ -2,7 +2,6 @@
   <nz-bottom-data-list
     :showTitle='showTitle'
     :obj='obj'
-    :tableId="tableId"
     :layout="[]"
     :tabs="tabs"
     :targetTab="targetTab"
diff --git a/nezha-fronted/src/components/common/mixin/dataList.js b/nezha-fronted/src/components/common/mixin/dataList.js
index a9da10084..e1397491d 100644
--- a/nezha-fronted/src/components/common/mixin/dataList.js
+++ b/nezha-fronted/src/components/common/mixin/dataList.js
@@ -1321,6 +1321,9 @@ export default {
     } else if (this.$refs.dataDetail) {
       tableTitle = this.$refs.dataDetail.tableTitle
     }
+    if (!tableTitle || !this.tableId) {
+      return
+    }
     let localStorageTableTitle = localStorage.getItem('nz-tableTitle-' + localStorage.getItem('nz-username') + '-' + this.tableId)
     localStorageTableTitle = localStorageTableTitle ? JSON.parse(localStorageTableTitle) : tableTitle
     this.tools.customTableTitle = tableTitle.map((item, index) => { // 修复切换中英文的问题