From 1b90f0f9ae9aac0ce7a4d152fa1dc20a8afd61d6 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 15 Feb 2022 11:23:10 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-1537=20fix=EF=BC=9A=E4=BF=AE=E6=94=B9=20ass?=
 =?UTF-8?q?et=20=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=20group=E5=86=85?=
 =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E6=9C=AA=E6=9B=B4=E6=96=B0=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../css/components/common/rightBox/locationCascader.scss  | 5 +++--
 .../src/components/common/bottomBox/tabs/panelTabNew.vue  | 8 ++++++++
 .../src/components/common/globalSearch/searchItemInfo.vue | 2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/nezha-fronted/src/assets/css/components/common/rightBox/locationCascader.scss b/nezha-fronted/src/assets/css/components/common/rightBox/locationCascader.scss
index 24deeb462..6f7e6cca1 100644
--- a/nezha-fronted/src/assets/css/components/common/rightBox/locationCascader.scss
+++ b/nezha-fronted/src/assets/css/components/common/rightBox/locationCascader.scss
@@ -7,7 +7,7 @@
 .dropdown{
   position: absolute;
   width: 616px;
-  padding:5px;
+  padding: 0px;
   background-color: $--background-color-empty;
   display: none;
   z-index: 2020;
@@ -28,12 +28,13 @@
   flex: 1;
   width: 0;
   border-right: 1px solid $--border-color-light;
-  padding-left: 5px;
+  //padding-left: 5px;
 }
 .container-item-content{
   display: flex;
   justify-content: space-between;
   padding:5px;
+  padding-left: 15px;
 }
 .container-item-content .container-item-content_label{
   overflow: hidden;
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
index 7325f40d6..8119960b9 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
@@ -492,6 +492,10 @@ export default {
         this.filter.end_time = bus.timeFormate(this.searchTime[1], 'YYYY-MM-DD HH:mm:ss')
         this.filter.panelId = this.showPanel.id
         this.getData(this.filter)
+        this.$store.dispatch('dispatchPanelTime', {
+          time: this.searchTime,
+          nowTimeType: this.nowTimeType
+        })
       }
     },
     /* 时间条件查询--end */
@@ -724,6 +728,10 @@ export default {
     this.onScroll()
     document.querySelector('#tableList').addEventListener('mouseenter', this.tableListEnter)
     document.querySelector('#tableList').addEventListener('mouseleave', this.tableListLeave)
+    this.$store.dispatch('dispatchPanelTime', {
+      time: this.searchTime,
+      nowTimeType: this.nowTimeType
+    })
   },
   watch: {
     'filter.searchName' (n, o) {
diff --git a/nezha-fronted/src/components/common/globalSearch/searchItemInfo.vue b/nezha-fronted/src/components/common/globalSearch/searchItemInfo.vue
index 63f74caef..03c59b7be 100644
--- a/nezha-fronted/src/components/common/globalSearch/searchItemInfo.vue
+++ b/nezha-fronted/src/components/common/globalSearch/searchItemInfo.vue
@@ -65,7 +65,7 @@
           </div>
           <div class="search-item-value-box" v-else>
             <i v-if="(item.icon&&getPathContent(item.key)!=='--') || item.key === 'pingInfo.rtt'" class="nz-icon" :class="searchItemClass(item)" :style="searchItemStyle(item)"/>
-            <span class="search-item-value" v-if="item.key !== 'pingInfo.rtt' || (item.key === 'pingInfo.rtt'&& alertLabelData.pingInfo&&alertLabelData.pingInfo.status === 'green')">
+            <span class="search-item-value" v-if="item.key !== 'pingInfo.rtt' || (item.key === 'pingInfo.rtt'&& alertLabelData.pingInfo&&alertLabelData.pingInfo.status == 1)">
               {{getPathContent(item.key)}}
             </span>
           </div>