From e38bdd4e1974d8c01fc7fb1ff852a6fab43b5b5d Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Tue, 2 Nov 2021 11:04:06 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-1156=20fix:=20=E4=BF=AE=E5=A4=8Dalert=20rul?=
 =?UTF-8?q?e=20type=E5=AD=97=E6=AE=B5=E6=9C=AA=E6=AD=A3=E7=A1=AE=E7=BF=BB?=
 =?UTF-8?q?=E8=AF=91=E4=B8=BA=20metrics.logs.snmp=20trap?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/alert/alertLabel.vue        |  2 --
 .../src/components/common/alert/alertRuleInfo.vue     | 11 ++++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/nezha-fronted/src/components/common/alert/alertLabel.vue b/nezha-fronted/src/components/common/alert/alertLabel.vue
index 8586fa098..d7dd06ab4 100644
--- a/nezha-fronted/src/components/common/alert/alertLabel.vue
+++ b/nezha-fronted/src/components/common/alert/alertLabel.vue
@@ -339,7 +339,6 @@ export default {
         const topOffSet = this.detailList ? 45 : 0
         const elHeight = self.type === 'asset' ? 318 : (self.type === 'project' ? 70 : 70)
         if (position.top + elHeight > clientHeight) {
-          console.log(leftOffSet, topOffSet)
           return {
             left: `${position.left + position.width + leftOffSet}px`,
             top: `${position.top - elHeight + topOffSet}px`
@@ -354,7 +353,6 @@ export default {
             }
           }
         } else {
-          console.log(leftOffSetView, topOffSetView)
           return {
             left: `${position.left + position.width + leftOffSetView}px`,
             top: `${position.top + topOffSetView}px`
diff --git a/nezha-fronted/src/components/common/alert/alertRuleInfo.vue b/nezha-fronted/src/components/common/alert/alertRuleInfo.vue
index 3ddba11db..fb93a8175 100644
--- a/nezha-fronted/src/components/common/alert/alertRuleInfo.vue
+++ b/nezha-fronted/src/components/common/alert/alertRuleInfo.vue
@@ -11,7 +11,16 @@
       </div>
       <div class="alert-rule-box">
         <div class="alert-rule-title">{{$t('alert.type')}}</div>
-        <div class="alert-rule-value">{{alertRuleData.type ? alertRuleData.type : '--'}}</div>
+        <div class="alert-rule-value">
+          <span v-if="alertRuleData.type === 1">
+            {{$t('project.metrics.metrics')}}
+          </span>
+          <span v-else-if="alertRuleData.type === 2">
+            {{$t('overall.logs')}}
+          </span>
+          <span v-else-if="alertRuleData.type === 3">SNMP trap</span>
+          <span v-else>--</span>
+        </div>
       </div>
       <div class="alert-rule-box">
         <div class="alert-rule-title">{{$t('alert.severity')}}</div>