ID
{{alertLabelData && alertLabelData.id ? alertLabelData.id : '--'}}
@@ -302,7 +302,7 @@ export default {
}
})
}
- if (this.type === 'datacenter') {
+ if (this.type === 'dc') {
this.$get('dc/' + this.id).then((res) => {
if (res.msg === 'success') {
this.loading = false
diff --git a/nezha-fronted/src/components/common/searchInput.vue b/nezha-fronted/src/components/common/searchInput.vue
index 6fb07f882..eed9ca4e8 100644
--- a/nezha-fronted/src/components/common/searchInput.vue
+++ b/nezha-fronted/src/components/common/searchInput.vue
@@ -1157,6 +1157,7 @@ export default {
},
// 删除要搜索的条件
close_selcet_list (ind, e) {
+ console.log(this.searchMsg.searchLabelList,this.searchLabelList)
if (e) {
this.stop_click(e)
}
@@ -1176,7 +1177,7 @@ export default {
}
} */
this.searchMsg.searchLabelList.forEach((val, key) => {
- if (this.select_list[ind].id == val.id) {
+ if (this.select_list[ind].label == val.label) {
this.searchLabelList.splice(key + 1, 0, val)
this.Iskeywords(ind)
}
diff --git a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
index 18a0aade7..4dec92cd4 100644
--- a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
+++ b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
@@ -90,7 +90,7 @@
{
- if (key == 'asset' || key == 'module' || key == 'project' || key == 'datacenter' || key == 'endpoint') {
+ if (key == 'asset' || key == 'module' || key == 'project' || key == 'dc' || key == 'endpoint') {
return 'normal'
} else {
return 'info'
@@ -269,7 +269,7 @@ export default {
})
},
labelsSort (obj) {
- const buildIn = ['asset', 'endpoint', 'module', 'cpu', 'project', 'datacenter', 'parent_asset', 'user']
+ const buildIn = ['asset', 'endpoint', 'module', 'cpu', 'datacenter', 'project', 'parent_asset', 'user']
if (typeof obj === 'string') obj = JSON.parse(obj)
const labels = JSON.parse(JSON.stringify(obj))
const result = []
@@ -282,7 +282,12 @@ export default {
}
for (const key of buildIn) {
if (key in labels) {
- result.push({ label: key, value: labels[key] })
+ if (key === 'datacenter') {
+ result.push({ label: 'dc', value: labels.datacenter })
+ delete labels.datacenter
+ } else {
+ result.push({ label: key, value: labels[key] })
+ }
delete labels[key]
}
}
@@ -542,7 +547,7 @@ export default {
case 'module':
case 'endpoint':
case 'project':
- case 'datacenter':
+ case 'dc':
return false
default: return true
}
@@ -566,9 +571,6 @@ export default {
if (e) {
const dom = e.currentTarget
const position = dom.getBoundingClientRect()
- if (type === 'datacenter') {
- item[type] = item.dc
- }
this.$set(item[type], 'position', position)
}
this.$set(item[type], 'loading', loading)
diff --git a/nezha-fronted/src/components/page/alert/nzAlertTag.vue b/nezha-fronted/src/components/page/alert/nzAlertTag.vue
index 357a7fdf9..4d33f7ac8 100644
--- a/nezha-fronted/src/components/page/alert/nzAlertTag.vue
+++ b/nezha-fronted/src/components/page/alert/nzAlertTag.vue
@@ -1,6 +1,6 @@
- {{label}}
+ {{label=='dc'?'datacenter':label}}
~