diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index bf1c35905..694b775dd 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -27,6 +27,7 @@ const cn = { select: "选择", ok: "Ok", all: "全选", + value: "值", other: "其他", query: "查询", back: "返回", @@ -822,7 +823,7 @@ const cn = { element: "元素", value: "值", promExpr: "请输入表达式", - dialogTitle: "图表", + dialogTitle: "历史值", hideSameLabels: "隐藏重复标签", stateInfo_230009: "无法获取prometheus服务", stateInfo_230010: "prometheus服务可用", diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index c3d22a0f5..0bf30ead7 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -33,6 +33,7 @@ const en = { select: 'Select',//'选择' ok: 'Ok',//OK all: 'All',//'全选' + value: 'Value', other: 'Others',//"其他" detail: 'Detail', //详情 query: 'Query', //查询 @@ -856,7 +857,7 @@ const en = { element: 'Element', value: 'Value', promExpr: 'Please input expression', - dialogTitle:'View', //endpoint 弹出dialog 标题, + dialogTitle:'History value', //endpoint 弹出dialog 标题, hideSameLabels:'Hide same labels', stateInfo_230009:'promserver unavailable', stateInfo_230010:'promserver can be used', diff --git a/nezha-fronted/src/components/page/alert/list.vue b/nezha-fronted/src/components/page/alert/list.vue index c94db7701..cc9076d0d 100644 --- a/nezha-fronted/src/components/page/alert/list.vue +++ b/nezha-fronted/src/components/page/alert/list.vue @@ -124,12 +124,14 @@
- - {{formatThreshold(scope.row.current[1],scope.row.alertRule.unit)}} +
+ + {{formatThreshold(scope.row.current[1],scope.row.alertRule.unit)}} +
{{$unixTimeParseToString(scope.row.current[0])}}
-
{{scope.row[item.prop]}} @@ -279,17 +281,7 @@ prop: 'alertRule', show: true, width: 180 - }, /*{ - label: this.$t("alert.list.type"), - prop: 'type', - show: true, - width: 100 }, { - label: this.$t("alert.list.linked"), - prop: 'linkObject', - show: true, - width: 140 - }, */{ label: this.$t("alert.list.labels"), prop: 'labels', show: true, @@ -321,7 +313,7 @@ prop: 'endAt', show: true, }, { - label: this.$t('alert.list.current'), + label: this.$t('overall.value'), prop: 'current', show: true }, {