From 70da98a2aaf2822439f6155116e1507441a19044 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Tue, 11 May 2021 17:20:22 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=EF=BC=9A=20=E4=BF=AE=E6=94=B9silence=20r?= =?UTF-8?q?eson=20=E4=B8=BAremark?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/common/language/cn.js | 2 +- nezha-fronted/src/components/common/language/en.js | 2 +- .../src/components/common/rightBox/alertSilenceBox.vue | 6 +++--- .../src/components/common/table/alert/alertSilenceTable.vue | 4 ++-- nezha-fronted/src/components/page/alert/alertSilence.vue | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index 81dd34902..e96c2540d 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -1118,7 +1118,7 @@ const cn = { edit: '修改告警静默', time: '时间', matchers: 'matchers', - reason: '描述', + remark: '描述', selectTime: '请选择时间', selectMather: '必填项', datacenter: '数据中心', diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index d61261836..f638b8d72 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -1140,7 +1140,7 @@ const en = { edit: 'Edit alert silence', time: 'Time', matchers: 'matchers', - reason: 'Description', + remark: 'Description', selectTime: 'Please select time', selectMather: 'Required', datacenter: 'datacenter', diff --git a/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue b/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue index 0c42174e9..065cb18ce 100644 --- a/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue +++ b/nezha-fronted/src/components/common/rightBox/alertSilenceBox.vue @@ -80,11 +80,11 @@ - + @@ -160,7 +160,7 @@ export default { ruleId: '', type: '', linkId: '', - reason: '', + remark: '', time: [], matchers: [ { name: '', value: '', regex: 0 } diff --git a/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue b/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue index aedddca24..b70a3edd6 100644 --- a/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue +++ b/nezha-fronted/src/components/common/table/alert/alertSilenceTable.vue @@ -147,8 +147,8 @@ export default { show: true, width: 120 }, { - label: this.$t('alert.silence.reason'), - prop: 'reason', + label: this.$t('alert.silence.remark'), + prop: 'remark', show: true, width: 120 }, { diff --git a/nezha-fronted/src/components/page/alert/alertSilence.vue b/nezha-fronted/src/components/page/alert/alertSilence.vue index ec3fddeb8..4efaa46ab 100644 --- a/nezha-fronted/src/components/page/alert/alertSilence.vue +++ b/nezha-fronted/src/components/page/alert/alertSilence.vue @@ -105,7 +105,7 @@ export default { ruleId: '', type: 'asset', linkId: '', - reason: '', + remark: '', time: [], matchers: [ { name: '', value: '', regex: 0 }