From 1ca22fa6edf60e26f3d5d1727488b6e0c9141919 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 23 Feb 2021 16:21:49 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E4=BF=AE=E6=94=B9alert=20rule?=
 =?UTF-8?q?=E7=9A=84=E8=BF=90=E7=AE=97=E7=AC=A6=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/assets/stylus/main.scss     |  2 +-
 .../common/rightBox/alertConfigBox.vue        | 26 ++++++++++++++-----
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss
index b9c966ed7..f14bb560a 100644
--- a/nezha-fronted/src/assets/stylus/main.scss
+++ b/nezha-fronted/src/assets/stylus/main.scss
@@ -1620,7 +1620,7 @@ li{
   margin-bottom: 0 !important;
 }
 .config-dropdown { /* 若宽度不合适，自行增加新类覆盖宽度 */
-  width: 490px;
+  width: 75px;
 }
 .asset-dropdown {
   width: 370px;
diff --git a/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue b/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue
index dfb8297bf..c3c9c88bf 100644
--- a/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue
@@ -30,15 +30,16 @@
             id="alert-box-input-promql"
           ></promql-input>
         </div>
-        <!--operator-->
-        <el-form-item :label="$t('alert.config.operator')" prop="operator" style="display: inline-block;">
-          <el-select popper-class="config-dropdown" v-model="editAlertRule.operator" placeholder=""  size="small" id="alert-box-input-operator">
-            <el-option :id="'operator-'+item.key" v-for="item in operators" :key="item.value" :label="item.label" :value="item.value"></el-option>
-          </el-select>
-        </el-form-item>
+        <!--&lt;!&ndash;operator&ndash;&gt;-->
+        <!--<el-form-item :label="$t('alert.config.operator')" prop="operator" style="display: inline-block;">-->
+
+        <!--</el-form-item>-->
         <!--threshold-->
         <el-form-item :label="$t('alert.config.threshold')" prop="threshold" style="display: inline-block;">
           <el-input type="text" placeholder="" v-model="editAlertRule.threshold" size="small" id="alert-box-input-threshold">
+            <el-select popper-class="config-dropdown" v-model="editAlertRule.operator" placeholder=""  size="small" id="alert-box-input-operator" slot="prepend" class="input-with-select">
+              <el-option :id="'operator-'+item.key" v-for="item in operators" :key="item.value" :label="item.label" :value="item.value"></el-option>
+            </el-select>
           </el-input>
         </el-form-item>
         <!--unit-->
@@ -298,6 +299,19 @@
   .unit-popper-class{
     z-index: 2052 !important;
   }
+  .input-with-select{
+    width: 70px !important;
+  }
+  .input-with-select #alert-box-input-operator{
+    padding: 0;
+    text-align: center;
+    border-top:1px solid #d0d4dC;
+    border-bottom:1px solid #d0d4dC;
+    border-radius: 4px 0 0 4px;
+  }
+  .input-with-select #alert-box-input-operator + .el-input__suffix{
+    display: none;
+  }
 </style>
 <style scoped>
   .rule-severity-remark{