From ffd6e1da7b8d5a486812362c2e4f5b2a3c91b962 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Mon, 17 Apr 2023 11:29:53 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-2777=20=20fix=EF=BC=9AAlert=20rule=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2=20=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/assets/css/components/common/project/meta2dMain.scss  | 2 +-
 .../src/assets/css/components/common/project/topology.scss    | 2 +-
 nezha-fronted/src/components/common/rightBox/alertRuleBox.vue | 1 -
 nezha-fronted/src/components/common/table/nzDataList.vue      | 4 ++--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/nezha-fronted/src/assets/css/components/common/project/meta2dMain.scss b/nezha-fronted/src/assets/css/components/common/project/meta2dMain.scss
index ef2b03d28..fad5a0be0 100644
--- a/nezha-fronted/src/assets/css/components/common/project/meta2dMain.scss
+++ b/nezha-fronted/src/assets/css/components/common/project/meta2dMain.scss
@@ -222,7 +222,7 @@
     position: absolute;
     right: 0;
     top: 50px;
-    z-index: 1;
+    z-index: 11;
   }
 
   .facade-top{
diff --git a/nezha-fronted/src/assets/css/components/common/project/topology.scss b/nezha-fronted/src/assets/css/components/common/project/topology.scss
index 8a5cf8b34..a2c9ce50a 100644
--- a/nezha-fronted/src/assets/css/components/common/project/topology.scss
+++ b/nezha-fronted/src/assets/css/components/common/project/topology.scss
@@ -195,7 +195,7 @@
     position: absolute;
     right: 0;
     top: 50px;
-    z-index: 1;
+    z-index: 11;
   }
 
   .facade-top{
diff --git a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
index 80da14039..5225263b6 100644
--- a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
@@ -92,7 +92,6 @@
                         <el-option v-for="subItem in filterOperators" :id="'operator-'+subItem.key" :key="'Result' + subItem.value" :label="subItem.label" :value="subItem.value"></el-option>
                       </el-select>
                     </div>
-                    {{$t('alert.config.enterRegular')}}
                     <el-input v-model="item.value" :placeholder="item.operator==='=~'?$t('alert.config.enterRegular'):$t('alert.config.enterThreshold')" size="small" type="text" style="flex:1"/>
                   </div>
                 </el-form-item>
diff --git a/nezha-fronted/src/components/common/table/nzDataList.vue b/nezha-fronted/src/components/common/table/nzDataList.vue
index 38d042bc1..690b28ef7 100644
--- a/nezha-fronted/src/components/common/table/nzDataList.vue
+++ b/nezha-fronted/src/components/common/table/nzDataList.vue
@@ -11,8 +11,8 @@
           </div>
           <div :class="{'top-tool-main-right-to-left': bottomBox.showSubList}" class="top-tool-right">
             <div v-if="showLayout.indexOf('searchInput') > -1" class="top-tool-search margin-r-20" :class="{'project-search alert-table asset-table endpoint-table': searchRight}">
-              <search-input ref="searchInput" :from="from" :position='from' :inTransform="bottomBox.inTransform" :searchMsg="searchMsg" @search="search"></search-input>
-<!--              <search-box :from="from" :position='from' :inTransform="bottomBox.inTransform" :searchMsg="searchMsg" @search="search"></search-box>-->
+<!--              <search-input ref="searchInput" :from="from" :position='from' :inTransform="bottomBox.inTransform" :searchMsg="searchMsg" @search="search"></search-input>-->
+              <search-box :from="from" :position='from' :inTransform="bottomBox.inTransform" :searchMsg="searchMsg" @search="search"></search-box>
             </div>
             <template>
               <slot name="top-tool-right"></slot>