From aae5b4cb8ec1df7dda336dfaa6bd1fa8201d270a Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Fri, 23 Jul 2021 16:16:01 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-864=20fix:=20=E4=BF=AE=E5=A4=8Dalert=20mess?=
 =?UTF-8?q?age=E5=88=97=E8=A1=A8=20lables=E5=B1=95=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/bottomBox/tabs/alertMessageTabNew.vue     |  2 +-
 .../common/table/alert/alertMessageTable.vue         | 12 ++++--------
 .../src/components/page/alert/alertMessage.vue       |  2 +-
 .../src/components/page/alert/nzAlertTag.vue         |  2 +-
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
index c3a30cb14..384b0dda8 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
@@ -182,7 +182,7 @@ export default {
   },
   methods: {
     labelsSort (obj) {
-      const buildIn = ['asset', 'endpoint', 'module', 'project', 'datacenter']
+      const buildIn = ['asset', 'endpoint', 'module', 'cpu', 'project', 'datacenter', 'parent_asset', 'user']
       const labels = JSON.parse(JSON.stringify(obj))
       const result = []
       for (const key of buildIn) {
diff --git a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
index 8692f5f28..784acfbf0 100644
--- a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
@@ -87,7 +87,7 @@
                 </nz-alert-tag>
               </span>
               <alertLabel
-                v-if="(item.label === 'asset' ||item.label === 'module' || item.label === 'project'||item.label === 'endpoint') && scope.row[item.label] && scope.row[item.label].loading"
+                v-if="(item.label === 'asset' ||item.label === 'module' || item.label === 'project'||item.label === 'endpoint' ||item.label === 'cpu' ||item.label === 'user' ||item.label === 'parent_asset') && scope.row[item.label] && scope.row[item.label].loading"
                 :id="scope.row[item.label].id"
                 :that="scope.row[item.label]"
                 :type="item.label"
@@ -222,12 +222,8 @@ export default {
   },
   computed: {
     tagType () {
-      return (key) => {
-        if (key == 'asset' || key == 'module' || key == 'project' || key == 'datacenter' || key == 'endpoint') {
-          return 'normal'
-        } else {
-          return 'info'
-        }
+      return () => {
+        return 'normal'
       }
     },
     tagValue () {
@@ -265,7 +261,7 @@ export default {
       })
     },
     labelsSort (obj) {
-      const buildIn = ['asset', 'endpoint', 'module', 'project', 'datacenter']
+      const buildIn = ['asset', 'endpoint', 'module', 'cpu', 'project', 'datacenter', 'parent_asset', 'user']
       if (typeof obj === 'string') obj = JSON.parse(obj)
       const labels = JSON.parse(JSON.stringify(obj))
       const result = []
diff --git a/nezha-fronted/src/components/page/alert/alertMessage.vue b/nezha-fronted/src/components/page/alert/alertMessage.vue
index dfdd4129e..f5d5db164 100644
--- a/nezha-fronted/src/components/page/alert/alertMessage.vue
+++ b/nezha-fronted/src/components/page/alert/alertMessage.vue
@@ -228,7 +228,7 @@ export default {
   },
   methods: {
     labelsSort (obj) {
-      const buildIn = ['asset', 'endpoint', 'module', 'project', 'datacenter']
+      const buildIn = ['asset', 'endpoint', 'module', 'cpu', 'project', 'datacenter', 'parent_asset', 'user']
       const labels = JSON.parse(JSON.stringify(obj))
       const result = []
       for (const key of buildIn) {
diff --git a/nezha-fronted/src/components/page/alert/nzAlertTag.vue b/nezha-fronted/src/components/page/alert/nzAlertTag.vue
index 4a53d4f1c..357a7fdf9 100644
--- a/nezha-fronted/src/components/page/alert/nzAlertTag.vue
+++ b/nezha-fronted/src/components/page/alert/nzAlertTag.vue
@@ -1,6 +1,6 @@
 <template>
   <span class="nz-alert-tag" :class="['nz-alert-tag_' + type]" :style="{cursor: cursorPoint ? 'pointer' : 'default'}" @click="$emit('click')">
-   <span class="nz-alert-tag__label"> {{label}}</span>
+    <span class="nz-alert-tag__label"> {{label}}</span>
     <span class="nz-alert-tag__content"><span v-if="!!regex"> ~ </span> <slot></slot></span>
   </span>
 </template>