diff --git a/nezha-fronted/src/components/common/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/alert/alertMessageTable.vue index 163987ad4..2b595bc18 100644 --- a/nezha-fronted/src/components/common/alert/alertMessageTable.vue +++ b/nezha-fronted/src/components/common/alert/alertMessageTable.vue @@ -71,6 +71,10 @@ - + P1 @@ -164,7 +168,6 @@ -
@@ -178,9 +181,9 @@
- +
- +
@@ -315,6 +318,11 @@ prop: 'description', show: true, minWidth:200 + },{ + label: this.$t('alert.list.remark'), + prop: 'remark', + show: true, + minWidth:200 }, { label: this.$t('alert.list.state'), prop: 'state', diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue index 01cf2615d..36b38427d 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue @@ -225,7 +225,14 @@ type: 'select', label: 'alertMessageState', disabled: false - }], + }, + { + id:26, + name: this.$t('alert.list.id'), + type: 'id', + label: 'id', + disabled: false + }], }, searchLabel: { //搜索参数 diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index 309e80dbb..d6ed3ffb2 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -768,6 +768,8 @@ const cn = { expired: "已过期", labels: "标签", current: "当前", + remark:'备注', + id:'ID', }, config: { name: "名称", diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index a22023b9b..a86c0b514 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -775,6 +775,8 @@ const en = { expired: 'Expired',//"已过期" labels: 'Labels', current: 'Current', + remark:'Remark', + id:'ID', }, config: { name: 'Name',//"名称" diff --git a/nezha-fronted/src/components/common/searchInput.vue b/nezha-fronted/src/components/common/searchInput.vue index 92cc392d3..8c080b96d 100644 --- a/nezha-fronted/src/components/common/searchInput.vue +++ b/nezha-fronted/src/components/common/searchInput.vue @@ -146,7 +146,7 @@ -
+
  • {{val.name}} diff --git a/nezha-fronted/src/components/page/alert/list.vue b/nezha-fronted/src/components/page/alert/list.vue index 87c2088b5..ea5db8189 100644 --- a/nezha-fronted/src/components/page/alert/list.vue +++ b/nezha-fronted/src/components/page/alert/list.vue @@ -267,6 +267,12 @@ type: 'select', label: 'alertMessageState', disabled: false + },{ + id:26, + name: this.$t('alert.list.id'), + type: 'id', + label: 'id', + disabled: false }], }, searchLabel: { //搜索参数