diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss
index 746e21840..3a17b877d 100644
--- a/nezha-fronted/src/assets/stylus/main.scss
+++ b/nezha-fronted/src/assets/stylus/main.scss
@@ -785,9 +785,12 @@ li{
position: absolute;
left: -3px;
}
-.alert-message-tag {
+.alert-message-tag, .alert-rule-tag {
margin: 3px;
}
+.alert-rule-tag {
+ cursor: default;
+}
/* end--内容*/
/* begin--右弹框滑入滑出动画*/
diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js
index 92edd4ada..3ddb8156f 100644
--- a/nezha-fronted/src/components/common/language/en.js
+++ b/nezha-fronted/src/components/common/language/en.js
@@ -521,7 +521,7 @@ const en = {
//列表表头
account: 'Account',//"用户"
language: 'Language',//"语言"
- receiver: 'Account group',//"用户组"
+ receiver: 'Receiver',//"用户组"
createTime: 'Create time',//"创建时间"
enable: 'Available',//"可用"
option: 'Operation',//"操作"
@@ -723,7 +723,7 @@ const en = {
},
config: {
name: 'Name',//"名称"
- receiver: 'User group',//"用户组"
+ receiver: 'Receiver',//"用户组"
expr: 'Expression',//"表达式"
for: "For (s)",//For (s)
link: 'Link',//'关联'
diff --git a/nezha-fronted/src/components/page/alert/config.vue b/nezha-fronted/src/components/page/alert/config.vue
index b4cca15dd..de5f7fec9 100644
--- a/nezha-fronted/src/components/page/alert/config.vue
+++ b/nezha-fronted/src/components/page/alert/config.vue
@@ -63,19 +63,12 @@
{{severityData[0].value}}
{{severityData[2].value}}
-
{{scope.row.alertNum + ' ' + $t('overall.active')}}
+
+ {{user.userName}}
+
{{scope.row[item.prop]}}
-
@@ -185,7 +178,7 @@
severity: '',
summary: '',
description: '',
- receiver: '',
+ receivers: '',
},
tablelable: [],
dropCol: [],
@@ -263,11 +256,11 @@
prop: 'alertNum',
show: true,
width: 90
- }, /*{
+ }, {
label: this.$t('alert.config.receiver'),
- prop: 'receiver',
+ prop: 'receivers',
show: true,
- }, */{
+ }, {
label: this.$t('alert.config.option'),
prop: 'option',
show: true,
@@ -379,14 +372,6 @@
}
})
},
- updateReceiverName: function (item) {
- //TODO 请求接口改名
- var code = 200;
- //this.$set(item, 'errorMessage', 'err');
- item.errorMessage = '';
- item.oldName = item.name;
- return code;
- },
cleanAlertRule: function () {
this.alertRule = {
id: '',
@@ -397,7 +382,7 @@
severity: '',
summary: '',
description: '',
- receiver: '',
+ receivers: '',
}
},
jumpTo(data, id) {
diff --git a/nezha-fronted/src/components/page/dashboard/overview/overview2.vue b/nezha-fronted/src/components/page/dashboard/overview/overview2.vue
index a494ee1db..f59f5610e 100644
--- a/nezha-fronted/src/components/page/dashboard/overview/overview2.vue
+++ b/nezha-fronted/src/components/page/dashboard/overview/overview2.vue
@@ -456,7 +456,7 @@
if(response.status == 'success'){
if(response.data.result){
let series={
- name: 'ifHCInOctets',
+ name: 'ifInOctets',
symbol:'none', //去掉点
smooth:true, //曲线变平滑
data: [],
@@ -479,7 +479,7 @@
if(response.status == 'success'){
if(response.data.result){
let series={
- name: 'ifHCOutOctets',
+ name: 'ifOutOctets',
symbol:'none', //去掉点
smooth:true, //曲线变平滑
data: [],
@@ -519,10 +519,10 @@
let rule;
if (t == 'rx') {
metric = {rx: '"1"'};
- rule = "ifHCInOctets";
+ rule = "ifInOctets";
} else if (t == 'tx') {
metric = {tx: '"1"'};
- rule = "ifHCOutOctets";
+ rule = "ifOutOctets";
}
if (this.trendSearchParam.select.length > 0) {
//console.info("select", this.trendSearchParam.select);