From 24ead781dca198c6588a9c8b3f1e4aeb27273cbb Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Fri, 27 Aug 2021 17:13:26 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/assets/stylus/main.scss            |  2 +-
 .../components/common/alert/selectAlertSilence.vue   |  5 +----
 .../src/components/common/popBox/selectPanel.vue     |  7 +------
 .../page/dashboard/explore/exploreItem.vue           | 10 ----------
 .../page/dashboard/explore/promqlInput.vue           | 12 ++++++++----
 5 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss
index f4685088c..2493cac5f 100644
--- a/nezha-fronted/src/assets/stylus/main.scss
+++ b/nezha-fronted/src/assets/stylus/main.scss
@@ -1047,7 +1047,7 @@ li{
   padding: 0 20px 20px 20px;
   border-radius: 10px;
 }
-.nz-pop-select-panel {
+.nz-pop-select-panel__dropdown {
   z-index: 1999 !important;
 }
 .nz-pop-select-area, .nz-pop-select-panel {
diff --git a/nezha-fronted/src/components/common/alert/selectAlertSilence.vue b/nezha-fronted/src/components/common/alert/selectAlertSilence.vue
index 2d1708b66..70ebae333 100644
--- a/nezha-fronted/src/components/common/alert/selectAlertSilence.vue
+++ b/nezha-fronted/src/components/common/alert/selectAlertSilence.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-popover :placement="placement" popper-class="nz-pop nz-pop-select-panel nz-pop-select-silence" ref="selectSilencePopBox" transition="slide" v-model="popBox.show" width="400">
+  <el-popover :placement="placement" popper-class="nz-pop nz-pop-select-panel nz-pop-select-silence" ref="selectSilencePopBox" transition="slide" v-model="popBox.show" width="320">
     <div>
       <div class="pop-item-wider">
 
@@ -186,7 +186,4 @@ export default {
   .panel-dropdown-btn-delete:hover {
     color: #D96D7A;
   }
-  .nz-pop-select-silence /deep/ .panel-select-header{
-    text-align: center;
-  }
 </style>
diff --git a/nezha-fronted/src/components/common/popBox/selectPanel.vue b/nezha-fronted/src/components/common/popBox/selectPanel.vue
index 72796a085..a0aae7fae 100644
--- a/nezha-fronted/src/components/common/popBox/selectPanel.vue
+++ b/nezha-fronted/src/components/common/popBox/selectPanel.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-popover :placement="placement" popper-class="nz-pop nz-pop-select-panel" ref="selectPanelPopBox" transition="slide" v-model="popBox.show" width="310" :disabled="disabled">
+  <el-popover :placement="placement" popper-class="nz-pop nz-pop-select-panel nz-pop-select-panel__dropdown" ref="selectPanelPopBox" transition="slide" v-model="popBox.show" width="310" :disabled="disabled">
     <div>
       <div class="pop-item-wider">
 
@@ -230,8 +230,3 @@ export default {
   color: #D96D7A;
 }
 </style>
-<style scoped lang="scss">
-.nz-pop-select-panel {
-  z-index: 1999 !important;
-}
-</style>
diff --git a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
index 04290bb78..6f578a32f 100644
--- a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
+++ b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue
@@ -8,16 +8,6 @@
         </div>
         <!-- 顶部工具栏 -->
         <div class="top-tools" style="z-index: 1">
-<!--          <div class="top-tool-left">-->
-<!--            <el-select v-model="fromData.status" size="small" style="width: 120px;" @change="changeType">-->
-<!--              <el-option-->
-<!--                v-for="item in searchMetrics"-->
-<!--                :key="item.value"-->
-<!--                :label="item.label"-->
-<!--                :value="item.value">-->
-<!--              </el-option>-->
-<!--            </el-select>-->
-<!--          </div>-->
           <el-row class="block-col-2" style="width: 300px;">
             <el-col>
               <el-dropdown trigger="click">
diff --git a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
index b97d94fe6..0f61eefcb 100644
--- a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
+++ b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
@@ -23,7 +23,7 @@
                                v-model="cascaderValue" v-clickoutside="closeDropdown" v-loading="tempBoxShowLoading"
                                :loading="loading" :props="cascaderProps" @change="logLabelChange">
               <template slot-scope="{ node, data }">
-                <div :title="data.label" class="nz-cascade">
+<div :title="data.label" class="nz-cascade">
                   {{data.label}}
                 </div>
               </template>
@@ -118,10 +118,10 @@
                 <!--</el-option>-->
               <!--</el-select>-->
               <select-alert-silence :filter-silence="filterSilence" :silence-data="format(item).arr" :panel-lock="false" :placement="'bottom-start'" :typeContentLoading="typeContentLoading"
-                                    @selectSilence="(val)=>{silenceChange(val,item)}" ref="selectPanel" style="width: 300px;">
+                                    @selectSilence="(val)=>{silenceChange(val,item)}" ref="selectPanel" style="width: 240px;">
                 <template v-slot:header>
-                  <div class="panel-select-header">
-                    <el-input :placeholder="$t('overall.search')" clearable size="mini" style="width: 340px; margin-right: 5px;" v-model="filterSilence" id="panel-list-search"></el-input>
+                  <div class="explore-select-header">
+                    <el-input :placeholder="$t('overall.search')" clearable size="mini" style="width: 300px;padding: 0 10px;" v-model="filterSilence" id="panel-list-search"></el-input>
                   </div>
                 </template>
 
@@ -742,6 +742,10 @@ export default {
   .temp-form-box .temp-form-box-col{
     margin-right: 10px;
   }
+  .explore-select-header {
+    text-align: center;
+    margin-bottom: 14px;
+  }
 </style>
 <style>
   .metric-selector-pop {