fix:修改 alertRule的相关bug
This commit is contained in:
@@ -46,7 +46,7 @@
|
|||||||
.console-title-icon:hover:before,
|
.console-title-icon:hover:before,
|
||||||
.el-tabs--border-card>.el-tabs__header .el-tabs__item.is-active,
|
.el-tabs--border-card>.el-tabs__header .el-tabs__item.is-active,
|
||||||
.el-tabs--border-card>.el-tabs__header .el-tabs__item:not(.is-disabled):hover {
|
.el-tabs--border-card>.el-tabs__header .el-tabs__item:not(.is-disabled):hover {
|
||||||
color: $global-text-color-active;
|
color: $box-title-color;
|
||||||
}
|
}
|
||||||
.el-dialog {
|
.el-dialog {
|
||||||
.el-dialog__body{
|
.el-dialog__body{
|
||||||
@@ -65,7 +65,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.el-tabs .el-tabs__header {
|
.el-tabs .el-tabs__header {
|
||||||
margin-left:90px;
|
margin-left:0px;
|
||||||
margin-right:150px;
|
margin-right:150px;
|
||||||
height:29px;
|
height:29px;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1464,7 +1464,7 @@ const cn = {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
guide: {
|
guide: {
|
||||||
title: '6步开始使用',
|
title: '开始使用 通过 6 简单步骤',
|
||||||
dc: '数据中心',
|
dc: '数据中心',
|
||||||
dcTip: '数据中心包含机柜和资产,与Prometheus服务相关联;机柜是资产的容器',
|
dcTip: '数据中心包含机柜和资产,与Prometheus服务相关联;机柜是资产的容器',
|
||||||
addDc: '新增数据中心',
|
addDc: '新增数据中心',
|
||||||
|
|||||||
@@ -218,7 +218,7 @@ export default {
|
|||||||
}
|
}
|
||||||
this.$refs.alertRuleForm.validate((valid) => {
|
this.$refs.alertRuleForm.validate((valid) => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
this.editAlertRule.receiver = this.editAlertRule.receiverShow.join(',')
|
params.receiver = this.editAlertRule.receiverShow.join(',')
|
||||||
if (this.editAlertRule.id) {
|
if (this.editAlertRule.id) {
|
||||||
this.$put('alert/rule', params).then(response => {
|
this.$put('alert/rule', params).then(response => {
|
||||||
this.prevent_opt.save = false
|
this.prevent_opt.save = false
|
||||||
|
|||||||
@@ -49,7 +49,7 @@
|
|||||||
<span v-else>-</span>
|
<span v-else>-</span>
|
||||||
</template>
|
</template>
|
||||||
<template v-else-if="item.prop === 'receivers'">
|
<template v-else-if="item.prop === 'receivers'">
|
||||||
<el-tag v-for="(user, index) in scope.row[item.prop]" v-if="user&&user.userName" :key="index" class="alert-rule-tag" effect="dark" size="mini">{{user.userName}} </el-tag>
|
<el-tag v-for="(user, index) in scope.row[item.prop]" v-if="user&&user.username" :key="index" class="alert-rule-tag" effect="dark" size="mini">{{user.username}} </el-tag>
|
||||||
</template>
|
</template>
|
||||||
<span v-else-if="scope.row[item.prop]">{{scope.row[item.prop]}}</span>
|
<span v-else-if="scope.row[item.prop]">{{scope.row[item.prop]}}</span>
|
||||||
<template v-else>-</template>
|
<template v-else>-</template>
|
||||||
|
|||||||
@@ -489,14 +489,14 @@ export default {
|
|||||||
exportCur () {
|
exportCur () {
|
||||||
const searchLabel = Object.assign({}, this.searchLabel)
|
const searchLabel = Object.assign({}, this.searchLabel)
|
||||||
this.$set(searchLabel, 'language', localStorage.getItem('nz-language') ? localStorage.getItem('nz-language') : 'en')
|
this.$set(searchLabel, 'language', localStorage.getItem('nz-language') ? localStorage.getItem('nz-language') : 'en')
|
||||||
this.exportExcel(searchLabel)
|
this.exportExcel({ ...searchLabel, state: this.state })
|
||||||
this.closeDialog()
|
this.closeDialog()
|
||||||
},
|
},
|
||||||
exportAll () {
|
exportAll () {
|
||||||
const temp = JSON.parse(JSON.stringify(this.searchLabel))
|
const temp = JSON.parse(JSON.stringify(this.searchLabel))
|
||||||
temp.pageSize = -1
|
temp.pageSize = -1
|
||||||
this.$set(temp, 'language', localStorage.getItem('nz-language') ? localStorage.getItem('nz-language') : 'en')
|
this.$set(temp, 'language', localStorage.getItem('nz-language') ? localStorage.getItem('nz-language') : 'en')
|
||||||
this.exportExcel(temp)
|
this.exportExcel({ ...temp, state: this.state })
|
||||||
this.closeDialog()
|
this.closeDialog()
|
||||||
},
|
},
|
||||||
getTimeString () {
|
getTimeString () {
|
||||||
|
|||||||
@@ -154,7 +154,8 @@ export default {
|
|||||||
if (response.code === 200) {
|
if (response.code === 200) {
|
||||||
this.object = {
|
this.object = {
|
||||||
...response.data,
|
...response.data,
|
||||||
method: response.data.method ? response.data.method.split(',').map(item => Number(item)) : []
|
method: response.data.method ? response.data.method.split(',').map(item => Number(item)) : [],
|
||||||
|
receiverShow: response.data.receiver ? response.data.receiver.split(',').map(item => Number(item)) : []
|
||||||
}
|
}
|
||||||
this.rightBox.show = true
|
this.rightBox.show = true
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -289,7 +289,7 @@ export default {
|
|||||||
this.expressionList[this.index] = value
|
this.expressionList[this.index] = value
|
||||||
// this.$refs.editor.setContent(value)
|
// this.$refs.editor.setContent(value)
|
||||||
this.dropDownVisible = false
|
this.dropDownVisible = false
|
||||||
// this.$emit('change', value)
|
this.$emit('change', value)
|
||||||
this.$forceUpdate()
|
this.$forceUpdate()
|
||||||
this.cascaderValue = ''
|
this.cascaderValue = ''
|
||||||
},
|
},
|
||||||
@@ -299,7 +299,7 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
expressionChange: function () {
|
expressionChange: function () {
|
||||||
// this.$emit('change')
|
this.$emit('change')
|
||||||
},
|
},
|
||||||
setError: function (errMsg) {
|
setError: function (errMsg) {
|
||||||
// console.log(errMsg)
|
// console.log(errMsg)
|
||||||
@@ -393,7 +393,7 @@ export default {
|
|||||||
this.tempBoxShow = false
|
this.tempBoxShow = false
|
||||||
// eslint-disable-next-line vue/no-mutating-props
|
// eslint-disable-next-line vue/no-mutating-props
|
||||||
this.expressionList[this.index] = params.expression
|
this.expressionList[this.index] = params.expression
|
||||||
// this.$emit('change', params.expression)
|
this.$emit('change', params.expression)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -401,7 +401,7 @@ export default {
|
|||||||
if (res.code === 200) {
|
if (res.code === 200) {
|
||||||
this.tempBoxShow = false
|
this.tempBoxShow = false
|
||||||
this.expressionList[this.index] = res.data.expression
|
this.expressionList[this.index] = res.data.expression
|
||||||
// this.$emit('change', res.data.expression)
|
this.$emit('change', res.data.expression)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Reference in New Issue
Block a user