From c19f8436e64b628c6628ad2556380c93b46105d6 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 17 Nov 2021 13:51:28 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-1258=20fix:=20Asset=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=97=B6=EF=BC=8C=E5=A4=9A=E4=B8=AA=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E7=82=B9=E7=9A=84=E6=90=9C=E7=B4=A2=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/bottomBox/nzBottomDataList.vue       | 3 ++-
 .../components/common/bottomBox/tabs/alertMessageTabNew.vue    | 1 +
 .../src/components/common/bottomBox/tabs/alertRuleEvalLog.vue  | 3 ++-
 .../src/components/common/bottomBox/tabs/assetSubTab.vue       | 1 +
 .../src/components/common/bottomBox/tabs/assetTab.vue          | 1 +
 .../src/components/common/bottomBox/tabs/cabinetTab.vue        | 1 +
 .../src/components/common/bottomBox/tabs/endpointQuery.vue     | 1 +
 .../src/components/common/bottomBox/tabs/endpointTabNew.vue    | 1 +
 .../src/components/common/bottomBox/tabs/logBottomTab.vue      | 1 +
 .../src/components/common/bottomBox/tabs/operationLogTab.vue   | 1 +
 .../src/components/common/bottomBox/tabs/panelTabNew.vue       | 1 +
 .../src/components/common/bottomBox/tabs/terminalLogCMDTab.vue | 3 ++-
 .../components/common/bottomBox/tabs/terminalLogMonitorTab.vue | 3 ++-
 .../components/common/bottomBox/tabs/terminalLogRecordTab.vue  | 3 ++-
 .../src/components/common/bottomBox/tabs/terminalLogTab.vue    | 3 ++-
 nezha-fronted/src/components/page/dashboard/chartBox.vue       | 3 +++
 16 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/nzBottomDataList.vue b/nezha-fronted/src/components/common/bottomBox/nzBottomDataList.vue
index 49837de93..13b7a1dfa 100644
--- a/nezha-fronted/src/components/common/bottomBox/nzBottomDataList.vue
+++ b/nezha-fronted/src/components/common/bottomBox/nzBottomDataList.vue
@@ -9,7 +9,7 @@
       </div>
       <div class="top-tool-right" v-if="!customTool">
         <div v-if="layout.indexOf('searchInput') > -1" class="top-tool-search margin-r-20">
-          <search-input :searchMsg="searchMsg" position="endpoint-bottom" @search="search" :targetTab="targetTab"></search-input>
+          <search-input :searchMsg="searchMsg" :position="'bottom' + targetTab + obj.id" @search="search" :targetTab="targetTab"></search-input>
         </div>
         <slot name="top-tool-right"></slot>
         <button v-if="layout.indexOf('elementSet') > -1" id="account-column-setting" class="top-tool-btn margin-r-20"
@@ -71,6 +71,7 @@ export default {
       type: String,
       default: ''
     },
+    obj: { },
     tabs: {
       type: Array
     },
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
index 2b5ebe4f7..924345901 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
@@ -2,6 +2,7 @@
   <div class="full-width-height">
     <nz-bottom-data-list
       :showTitle='showTitle'
+      :obj='obj'
       :api="url"
       :custom-table-title.sync="tools.customTableTitle"
       :layout="['searchInput', 'elementSet']"
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertRuleEvalLog.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertRuleEvalLog.vue
index 6a1b3ba95..0e9c6fac7 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/alertRuleEvalLog.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertRuleEvalLog.vue
@@ -1,6 +1,7 @@
 <template>
   <nz-bottom-data-list
-    :showTitle='showTitle'
+      :showTitle='showTitle'
+      :obj='obj'
     :api="url"
     :custom-table-title.sync="tools.customTableTitle"
     :layout="['elementSet']"
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/assetSubTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/assetSubTab.vue
index 6e4a922cc..e09e8ca30 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/assetSubTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/assetSubTab.vue
@@ -2,6 +2,7 @@
   <div>
     <nz-bottom-data-list
       :showTitle='showTitle'
+      :obj='obj'
       :api="url"
       style="height: 100%"
       :custom-table-title.sync="tools.customTableTitle"
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue
index b236fffda..5f4f4d1af 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/assetTab.vue
@@ -2,6 +2,7 @@
   <div>
     <nz-bottom-data-list
       :showTitle='showTitle'
+      :obj='obj'
       :targetTab.sync="targetTab"
       :api="url"
       style="height: 100%"
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
index fb2d3c55e..ad6735b0f 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
@@ -2,6 +2,7 @@
   <div>
     <nz-bottom-data-list
       :showTitle='showTitle'
+      :obj='obj'
       :api="url"
       style="height: 100%"
       :custom-table-title.sync="tools.customTableTitle"
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue
index 30d9f33e0..1762ca02e 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue
@@ -2,6 +2,7 @@
   <div class="full-width-height endpoint-tab-new">
     <nz-bottom-data-list
       :showTitle='showTitle'
+      :obj='obj'
       :api="url"
       :layout="['searchInput', 'elementSet']"
       :search-msg="searchMsg"
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTabNew.vue
index f651a732d..5e645d60c 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTabNew.vue
@@ -2,6 +2,7 @@
   <div class="full-width-height">
    <nz-bottom-data-list
       :showTitle='showTitle'
+      :obj='obj'
       :api="url"
       :custom-table-title.sync="tools.customTableTitle"
       :layout="['searchInput', 'elementSet']"
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue
index e15f11f73..20c19ecd1 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue
@@ -1,6 +1,7 @@
 <template>
  <nz-bottom-data-list
       :showTitle='showTitle'
+      :obj='obj'
     :custom-tool="true"
     :layout="[]"
     :show-pagination="false"
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/operationLogTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/operationLogTab.vue
index d94783f34..fad5f5e18 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/operationLogTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/operationLogTab.vue
@@ -1,6 +1,7 @@
 <template>
  <nz-bottom-data-list
       :showTitle='showTitle'
+      :obj='obj'
     :api="url"
     :custom-table-title.sync="tools.customTableTitle"
     :layout="['searchInput', 'elementSet']"
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
index 12be0e6f1..6bcd83060 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
@@ -2,6 +2,7 @@
   <div class="full-width-height chart-list asset-detail">
     <nz-bottom-data-list
       :showTitle='showTitle'
+      :obj='obj'
       :layout="[]"
       :tabs="tabs"
       :targetTab="targetTab"
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogCMDTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogCMDTab.vue
index 3500bd81e..6ba626876 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogCMDTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogCMDTab.vue
@@ -1,6 +1,7 @@
 <template>
  <nz-bottom-data-list
-    :showTitle='showTitle'
+      :showTitle='showTitle'
+      :obj='obj'
     :layout="[]"
     :tabs="tabs"
     @changeTab="changeTab"
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogMonitorTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogMonitorTab.vue
index 8ac791da0..7dfe2168e 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogMonitorTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogMonitorTab.vue
@@ -1,6 +1,7 @@
 <template>
  <nz-bottom-data-list
-    :showTitle='showTitle'
+      :showTitle='showTitle'
+      :obj='obj'
     :layout="[]"
     :tabs="tabs"
     @changeTab="changeTab"
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogRecordTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogRecordTab.vue
index 4339ece5d..d3e1ce17a 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogRecordTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogRecordTab.vue
@@ -1,6 +1,7 @@
 <template>
  <nz-bottom-data-list
-    :showTitle='showTitle'
+      :showTitle='showTitle'
+      :obj='obj'
     :layout="[]"
     :tabs="tabs"
     @changeTab="changeTab"
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogTab.vue
index d14f29d64..8ff819687 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogTab.vue
@@ -1,6 +1,7 @@
 <template>
  <nz-bottom-data-list
-    :showTitle='showTitle'
+      :showTitle='showTitle'
+      :obj='obj'
     :api="url"
     :custom-table-title.sync="tools.customTableTitle"
     :layout="['searchInput', 'elementSet']"
diff --git a/nezha-fronted/src/components/page/dashboard/chartBox.vue b/nezha-fronted/src/components/page/dashboard/chartBox.vue
index c057c08b4..ae611235f 100644
--- a/nezha-fronted/src/components/page/dashboard/chartBox.vue
+++ b/nezha-fronted/src/components/page/dashboard/chartBox.vue
@@ -670,6 +670,9 @@ export default {
       spanList: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
       limitOptions: [100, 200, 500, 1000, 2000],
       nullTypeList: [{
+        label: 'connected',
+        value: 'connected'
+      }, {
         label: 'null',
         value: 'null'
       }, {