diff --git a/nezha-fronted/src/components/common/alert/alertLabel.vue b/nezha-fronted/src/components/common/alert/alertLabel.vue
index f7277d28f..2a8f55be6 100644
--- a/nezha-fronted/src/components/common/alert/alertLabel.vue
+++ b/nezha-fronted/src/components/common/alert/alertLabel.vue
@@ -6,19 +6,19 @@
{{alertLabelData && alertLabelData.id ? alertLabelData.id : '--'}}
-
Name
+
{{$t('overall.name')}}
{{alertLabelData && alertLabelData.name ? alertLabelData.name : '--'}}
-
ManageIp
+
{{$t('overall.manageIp')}}
{{alertLabelData && alertLabelData.manageIp ? alertLabelData.manageIp : '--'}}
-
type
+
{{$t('overall.type')}}
{{alertLabelData && alertLabelData.type && alertLabelData.type.name ? alertLabelData.type.name:'--'}}
-
State
+
{{$t('overall.state')}}
{{alertLabelData && alertLabelData.state && alertLabelData.state.name ? alertLabelData.state.name : '--'}}
@@ -29,19 +29,23 @@
-
Data center
+
{{$t('overall.dc')}}
{{alertLabelData && alertLabelData.dc && alertLabelData.dc.name ? alertLabelData.dc.name:'--'}}
-
Cabinet
+
{{$t('overall.cabinet')}}
{{alertLabelData && alertLabelData.cabinet && alertLabelData.cabinet.name ? alertLabelData.cabinet.name : '--'}}
-
Model
+
{{$t('overall.brand')}}
+
{{alertLabelData && alertLabelData.brand && alertLabelData.brand.name ? alertLabelData.brand.name : '--'}}
+
+
{{$t('overall.model')}}
{{alertLabelData && alertLabelData.model && alertLabelData.model.name ? alertLabelData.model.name : '--'}}
-
Alert
+
{{$t('overall.alert')}}
{{alertLabelData && alertLabelData.alertNum ? alertLabelData.alertNum : 0}}
@@ -61,11 +65,11 @@
{{alertLabelData && alertLabelData.id ? alertLabelData.id : '--'}}
-
Name
+
{{$t('overall.name')}}
{{alertLabelData && alertLabelData.name ? alertLabelData.name : '--'}}
-
Project
+
{{$t('overall.project')}}
{{alertLabelData && alertLabelData.project && alertLabelData.project.name ?alertLabelData.project.name : '--'}}
@@ -75,21 +79,21 @@
{{alertLabelData && alertLabelData.endpointNum ? alertLabelData.endpointNum : '--'}}
-
Asset
+
{{$t('overall.asset')}}
-
+
{{alertLabelData && alertLabelData.assetNum ? alertLabelData.assetNum: 0}}
-
Alert
+
{{$t('overall.alert')}}
{{alertLabelData && alertLabelData.alertNum ? alertLabelData.alertNum : 0 + ' ' + alertActiveStr()}}
-
Description
+
{{$t('overall.remark')}}
{{alertLabelData && alertLabelData.remark ? alertLabelData.remark : '--'}}
{{alertLabelData && alertLabelData ? alertLabelData.id : '--'}}
-
Name
+
{{$t('overall.name')}}
{{alertLabelData && alertLabelData ? alertLabelData.name : '--'}}
-
Module
+
{{$t('overall.module')}}
{{alertLabelData && alertLabelData.module && alertLabelData.module.name ? alertLabelData.module.name : '--'}}
@@ -116,21 +120,21 @@
{{alertLabelData && alertLabelData.endpointNum ? alertLabelData.endpointNum : '--'}}
-
Asset
+
{{$t('overall.asset')}}
-
+
{{alertLabelData && alertLabelData.assetNum ? alertLabelData.assetNum: 0}}
-
Alert
+
{{$t('overall.alert')}}
{{alertLabelData && alertLabelData.alertNum ? alertLabelData.alertNum : 0 + ' ' + alertActiveStr()}}
-
Description
+
{{$t('overall.remark')}}
{{alertLabelData && alertLabelData.remark ? alertLabelData.remark : '--'}}
{{alertLabelData && alertLabelData.id ? alertLabelData.id : '--'}}
-
name
+
{{$t('overall.name')}}
{{alertLabelData && alertLabelData.name ? alertLabelData.name : '--'}}
-
Project
+
{{$t('overall.project')}}
{{alertLabelData && alertLabelData.project && alertLabelData.project.name ? alertLabelData.project.name : '--'}}
-
Module
-
{{alertLabelData && alertLabelData.module && alertLabelData.module.name ? alertLabelData.module.name : '--'}}
+
{{$t('overall.module')}}
+
+
+ {{alertLabelData && alertLabelData.module && alertLabelData.module.name ? alertLabelData.module.name : '--'}}
+
-
Asset
+
{{$t('overall.asset')}}
-
+
{{alertLabelData && alertLabelData.assetNum ? alertLabelData.assetNum: 0}}
-
Alert
+
{{$t('overall.alert')}}
{{alertLabelData && alertLabelData.alertNum ? alertLabelData.alertNum : 0 + ' ' + alertActiveStr()}}
-
State
+
{{$t('overall.state')}}
{{$t('project.endpoint.metrics')}}
-
+
@@ -183,7 +190,7 @@
{{$t('project.endpoint.logs')}}
-
+
@@ -203,34 +210,34 @@
{{alertLabelData && alertLabelData.id ? alertLabelData.id : '--'}}
-
name
+
{{$t('overall.name')}}
{{alertLabelData && alertLabelData.name ? alertLabelData.name : '--'}}
-
Location
+
{{$t('overall.location')}}
{{alertLabelData && alertLabelData.location && alertLabelData.location ? alertLabelData.location : '--'}}
-
Asset
-
-
- {{alertLabelData && alertLabelData.assetNum && alertLabelData.assetNum ? alertLabelData.assetNum: '--'}}
-
-
-
-
Cabinet
+
{{$t('overall.cabinet')}}
{{alertLabelData && alertLabelData.cabinet && alertLabelData.cabinet.name ? alertLabelData.cabinet.name : '--'}}
-
Alert
+
{{$t('overall.asset')}}
+
+
+ {{alertLabelData && alertLabelData.assetNum && alertLabelData.assetNum ? alertLabelData.assetNum: '--'}}
+
+
+
+
{{$t('overall.alert')}}
{{alertLabelData && alertLabelData.alertNum ? alertLabelData.alertNum : '--'}}
-
State
+
{{$t('overall.state')}}
{{ $t('overall.enabled') }}
@@ -507,10 +514,8 @@ export default {
min-width: 100px;
}
.alert-label-value{
- text-align: right;
height: 26px;
ont-family: Roboto-Regular;
- overflow: hidden;
font-size: 14px;
color: #333333;
letter-spacing: 0;
diff --git a/nezha-fronted/src/components/common/alert/alertRuleInfo.vue b/nezha-fronted/src/components/common/alert/alertRuleInfo.vue
index d592908dd..6769ab585 100644
--- a/nezha-fronted/src/components/common/alert/alertRuleInfo.vue
+++ b/nezha-fronted/src/components/common/alert/alertRuleInfo.vue
@@ -28,10 +28,6 @@
-->
-
-
{{$t('alert.config.threshold')}}
-
{{alertRuleData.threshold ? alertRuleData.threshold : '--'}}
-
{{$t('alert.config.expr')}}
{{alertRuleData.expr ? (alertRuleData.expr + alertRuleData.operator + formatThreshold(alertRuleData.threshold,alertRuleData.unit)) : '--'}}
@@ -141,7 +137,6 @@ export default {
},
severityDataColor () {
this.severityData.map(item => {
- console.log(item.color)
this.severityColor = item.color
})
}
diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js
index a33db5e31..3246ce9f4 100644
--- a/nezha-fronted/src/components/common/language/cn.js
+++ b/nezha-fronted/src/components/common/language/cn.js
@@ -27,6 +27,12 @@ const cn = {
unlocked: '已解锁',
dashboard: '仪表盘',
dc: '数据中心',
+ manageIp: '主机IP',
+ cabinet: '机柜',
+ brand: '品牌',
+ model: '型号',
+ location: '位置',
+ module: '模块',
project: '系统',
monitor: '监控',
alert: '告警',
diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js
index 7334dfaa1..e1344462e 100644
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -141,6 +141,12 @@ const en = {
children: 'Children asset',
assetSubTab: 'Children asset',
dc: 'Data center',
+ manageIp: 'Manage IP',
+ cabinet: 'Cabinet',
+ brand: 'Brand',
+ model: 'Model',
+ location: 'Location',
+ module: 'Module',
labels: 'Label',
moreOption: 'More option',
copy: 'Copy',