From e31b355b18d082c5548d435cc2b003236d024903 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 9 Sep 2022 16:03:54 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-2186=20fix=EF=BC=9Aasset=20log=20=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE=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/bottomBox/tabs/logBottomTab.vue    | 2 +-
 nezha-fronted/src/components/common/mixin/detailViewMixin.js | 4 +++-
 nezha-fronted/src/components/common/table/nzDataList.vue     | 5 +++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue
index 27b2e8865..662cee828 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue
@@ -32,7 +32,7 @@
       </pick-time>
     </template>
     <template v-slot>
-      <log-tab ref="logDetail" v-my-loading="loading" :loading-bottom="endpointLoading" :log-data="logData" :tab-index="9" @exportLog="exportLog" @limitChange="queryLogData"></log-tab>
+      <log-tab ref="logDetail" v-my-loading="loading" :loading-bottom="endpointLoading" :time-range="filterTime" :log-data="logData" :tab-index="9" @exportLog="exportLog" @limitChange="queryLogData"></log-tab>
 <!--      <div v-my-loading="loading" v-if="!logData" style="height: 300px; width: 100%; display: flex; justify-content: center; align-items: center; color: #999;">No Data</div>-->
     </template>
   </nz-bottom-data-list>
diff --git a/nezha-fronted/src/components/common/mixin/detailViewMixin.js b/nezha-fronted/src/components/common/mixin/detailViewMixin.js
index 1043999f5..71a176a9d 100644
--- a/nezha-fronted/src/components/common/mixin/detailViewMixin.js
+++ b/nezha-fronted/src/components/common/mixin/detailViewMixin.js
@@ -5,7 +5,9 @@ export default {
       immediate: true,
       handler (n) {
         if (n) {
-          this.updatePath(this.$route.query, this.$route.path, 'nzDetailList')
+          if (this.detailType !== 'list') {
+            this.updatePath(this.$route.query, this.$route.path, 'nzDetailList')
+          }
         }
       }
     }
diff --git a/nezha-fronted/src/components/common/table/nzDataList.vue b/nezha-fronted/src/components/common/table/nzDataList.vue
index 1fafe9299..b9bacfce2 100644
--- a/nezha-fronted/src/components/common/table/nzDataList.vue
+++ b/nezha-fronted/src/components/common/table/nzDataList.vue
@@ -240,6 +240,11 @@ export default {
       bottomBoxWindow.showSubListWatch(vm, n)
       this.updatePath(this.$route.query, this.$route.path, 'nzDatalist')
     },
+    'bottomBox.object': function (n) {
+      const vm = this
+      bottomBoxWindow.showSubListWatch(vm, n)
+      this.updatePath(this.$route.query, this.$route.path, 'nzDatalist')
+    },
     layout: {
       immediate: true,
       deep: true,