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 @@ { - 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 @@