From 586246d34f3486d672ad6ddff124416cb0a8122c Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Wed, 27 Oct 2021 10:59:54 +0800
Subject: [PATCH] =?UTF-8?q?style:=20endpoint=20Configuration=E5=88=97?=
 =?UTF-8?q?=EF=BC=8C=E9=BC=A0=E6=A0=87=E7=A7=BB=E5=85=A5=E5=BC=B9=E6=A1=86?=
 =?UTF-8?q?=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

---
 .../components/common/alert/alertLabel.vue    | 26 +++++++++++++++++++
 .../components/common/alert/alertRuleInfo.vue |  1 +
 .../common/table/settings/endpointTable.vue   | 15 ++++++-----
 3 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/nezha-fronted/src/components/common/alert/alertLabel.vue b/nezha-fronted/src/components/common/alert/alertLabel.vue
index 8e4d9bbfd..73e2ad663 100644
--- a/nezha-fronted/src/components/common/alert/alertLabel.vue
+++ b/nezha-fronted/src/components/common/alert/alertLabel.vue
@@ -103,6 +103,32 @@
         <div class="alert-label-title">Name</div>
         <div class="alert-label-value">{{alertLabelData && alertLabelData ? alertLabelData.name : '--'}}</div>
       </div>
+      <div class="alert-label-box">
+        <div class="alert-label-title">Module</div>
+        <div class="alert-label-value">
+          <i style="cursor: pointer" class="nz-icon nz-icon-overview-module monitorColor"/>&nbsp;
+          <span>{{alertLabelData && alertLabelData.module && alertLabelData.module.name ? alertLabelData.module.name : '--'}}</span></div>
+      </div>
+      <div class="alert-label-box">
+        <div class="alert-label-title">Endpoint</div>
+        <div class="alert-label-value">
+          <i class="nz-icon nz-icon-overview-endpoint monitorColor"></i>&nbsp;
+          <span>{{alertLabelData && alertLabelData.endpointNum ? alertLabelData.endpointNum : '--'}}</span></div>
+      </div>
+      <div class="alert-label-box">
+        <div class="alert-label-title">Asset</div>
+        <div class="alert-label-value">
+          <i v-if="alertLabelData" class="nz-icon nz-icon-cabinet monitorColor" :class="alertLabelData && alertLabelData.assetName > 0 ? 'colorEF7458' : 'color23BF9A'"/>&nbsp;
+          <span>{{alertLabelData && alertLabelData.assetNum ? alertLabelData.assetNum: 0}}</span>
+        </div>
+      </div>
+      <div class="alert-label-box">
+        <div class="alert-label-title">Alert</div>
+        <div class="alert-label-value">
+          <i v-if="alertLabelData" :class="alertLabelData && alertLabelData.alertNum > 0 ? 'red' : 'green'" class="nz-icon nz-icon-overview-alert"></i>&nbsp;
+          <span>{{alertLabelData && alertLabelData.alertNum ? alertLabelData.alertNum : 0 + ' ' + alertActiveStr()}}</span>
+        </div>
+      </div>
       <div class="alert-label-box">
         <div class="alert-label-title">Description</div>
         <div class="alert-label-value">{{alertLabelData && alertLabelData.remark ? alertLabelData.remark : '--'}}</div>
diff --git a/nezha-fronted/src/components/common/alert/alertRuleInfo.vue b/nezha-fronted/src/components/common/alert/alertRuleInfo.vue
index dd47873ef..e3bb05273 100644
--- a/nezha-fronted/src/components/common/alert/alertRuleInfo.vue
+++ b/nezha-fronted/src/components/common/alert/alertRuleInfo.vue
@@ -243,6 +243,7 @@ export default {
     text-align: left;
     color: #1a1a1a;
     padding: 0 3px 0 13px;
+    width: 159px;
     word-wrap: break-word;
     white-space: normal;
     overflow: hidden;
diff --git a/nezha-fronted/src/components/common/table/settings/endpointTable.vue b/nezha-fronted/src/components/common/table/settings/endpointTable.vue
index 0b20f3945..f52f9b7a0 100644
--- a/nezha-fronted/src/components/common/table/settings/endpointTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/endpointTable.vue
@@ -110,7 +110,7 @@
 <!--            </div>-->
 <!--          </el-tooltip>-->
 
-          <el-tooltip placement="left" effect="light" :popper-class="'endpointConfigsTips data-column__endpoint'" v-if="scope.row.configs[0].enable || scope.row.configs[1].enable">
+          <el-tooltip placement="left" effect="light" :popper-class="'endpointConfigsTips'" v-if="scope.row.configs[0].enable || scope.row.configs[1].enable">
             <span class="configs-endpoint metrics">[{{scope.row.configs[0].enable ?  'Metrics':''}}{{scope.row.configs[0].enable&&scope.row.configs[1].enable?',':''}}{{scope.row.configs[1].enable ?  'logs' : ''}}]</span>
             <div class="endpointConfigsTips" slot="content">
               <span class="copy-value-content"> <i class="nz-icon nz-icon-override" @click="copyValue(clConfigs(scope.row))"></i></span>
@@ -403,10 +403,14 @@ export default {
   }
 </style>
 <style>
+  .endpointConfigsTips{
+    min-width: 150px;
+    padding:3px 3px 0 8px ;
+  }
   .copy-value-content{
     position: absolute;
-    right: 18px;
-    top: 5px;
+    right: 6px;
+    top: 6px;
   }
   .data-column__endpoint {
     background: #FFFFFF;
@@ -415,9 +419,8 @@ export default {
     border-radius: 3px 3px 3px 3px 0 0;
   }
   .copy-value-content__pre {
-    min-width: 150px;
-    height: 185px;
-    margin: 10px;
+    height: 200px;
+    margin-top: 20px;
     overflow-y: auto;
     overflow-x: hidden;
   }