From f45b0a32f5484df97e53589c64c04f733aed7746 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 11 Mar 2021 14:01:59 +0800
Subject: [PATCH] =?UTF-8?q?style=EF=BC=9A=E6=96=B0=E5=A2=9E=E5=91=8A?=
 =?UTF-8?q?=E8=AD=A6=E9=9D=99=E9=BB=98=E5=BC=B9=E7=AA=97=20=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E6=97=B6=E7=9A=84=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=20=E4=BB=A5=E5=8F=8A=E8=A1=A5=E5=85=85=E4=B8=AD=E8=8B=B1?=
 =?UTF-8?q?=E6=96=87=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/language/cn.js |  4 +++-
 nezha-fronted/src/components/common/language/en.js |  4 +++-
 .../components/common/rightBox/alertSilenceBox.vue | 14 ++++++++------
 .../src/components/page/alert/silence.vue          |  2 +-
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js
index 0c012a7b2..8d88e7dd6 100644
--- a/nezha-fronted/src/components/common/language/cn.js
+++ b/nezha-fronted/src/components/common/language/cn.js
@@ -395,7 +395,7 @@ const cn = {
   },
   tip: {
     confirmDelete: "确认删除吗？",
-    confirmOvertime: "确定要使这个超时?", //Are you sure you want to delete?
+    confirmOvertime: "确定关闭吗?", //Are you sure you want to delete?
     killTerm:'确认关闭 terminal 吗？',
     confirmBatchDelete:'确定删除这{0}条数据吗？',
     assetConfirmDelete: "关联的Endpoint和告警将会被删除，确认删除吗？",
@@ -922,6 +922,8 @@ const cn = {
       time:'时间',
       matcher:'Matcher',
       reason:'原因',
+      selectTime:'请选择时间',
+      selectMather:'必填项'
     },
     P1Rule:'P1: 万分紧急，可导致业务瘫痪的告警',
     P2Rule:'P2: 急需处理，但不影响业务的告警',
diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js
index 4b07f523b..b92ef109f 100644
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -398,7 +398,7 @@ const en = {
   },
   tip: {
     confirmDelete: "Are you sure you want to delete?", //Are you sure you want to delete?
-    confirmOvertime: "Are you sure you want this to time out?",
+    confirmOvertime: "Are you sure it's off?",
     killTerm:'Are you sure you want to kill terminal?',
     confirmBatchDelete:'Are you sure to delete these {0} pieces of data',
     assetConfirmDelete: 'Related endpoints and alerts will be removed, are you sure you want to delete this asset?',//Related endpoints and alerts will be removed, are you sure you want to delete this asset?
@@ -927,6 +927,8 @@ const en = {
       time:'Time',
       matcher:'Matcher',
       reason:'Reason',
+      selectTime:'Please select time',
+      selectMather:'Required'
     },
     P1Rule:'P1: Critical, alarm that can cause business paralysis',
     P2Rule:'P2: Major, alarm that do not affect the business',
diff --git a/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue b/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue
index 024785636..ab6c02b75 100644
--- a/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue
@@ -59,7 +59,7 @@
           </div>
 
           <div class="matcher-type">
-            <el-select class="matcher-type-title" v-model="editAlertSilence.type" :popper-append-to-body="false" size="small" @change="typeChange">
+            <el-select class="matcher-type-title matcher-type-header" v-model="editAlertSilence.type" :popper-append-to-body="false" size="small" @change="typeChange">
               <el-option
                 v-for="item in typeList"
                 :key="item.type"
@@ -169,10 +169,10 @@
         },
         rules:{
           time: [
-            { required: true, message: '请选择时间', trigger: 'change' },
+            { required: true, message: this.$t('alert.silence.selectTime'), trigger: 'change' },
           ],
           matcher:[
-            { required: true, message: '请选择Mather', trigger: 'change' },
+            { required: true, message: this.$t('alert.silence.selectMather'), trigger: 'change' },
           ]
         },
         rangeTime:'',
@@ -469,11 +469,12 @@
     }
   }
   .matcher{
-    /deep/ .el-input--prefix .el-input__inner{
-    }
     /deep/ .el-input__prefix{
       left: 0;
-
+    }
+    /deep/ .el-form-item__error{
+      left: 126px;
+      padding-top: 10px;
     }
     .matcher-type{
       display: flex;
@@ -497,6 +498,7 @@
         letter-spacing: 0;
         font-weight: 400;
         text-align: center;
+        border: none;
       }
       .matcher-type-content{
         flex: 1;
diff --git a/nezha-fronted/src/components/page/alert/silence.vue b/nezha-fronted/src/components/page/alert/silence.vue
index 2b0eda0ce..2d0ca4090 100644
--- a/nezha-fronted/src/components/page/alert/silence.vue
+++ b/nezha-fronted/src/components/page/alert/silence.vue
@@ -502,7 +502,7 @@
     }
   }
   .nz-silence-tag{
-    min-width: 120px;
+    min-width: 80px;
     margin-right: 5px;
     border-radius: 4px;
     display: inline-flex;