fix:修改 alertRule的相关bug

This commit is contained in:
zhangyu
2021-05-12 19:07:07 +08:00
parent 613e65ca7b
commit cd505a0d05
7 changed files with 13 additions and 12 deletions

View File

@@ -46,7 +46,7 @@
.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:not(.is-disabled):hover {
color: $global-text-color-active;
color: $box-title-color;
}
.el-dialog {
.el-dialog__body{
@@ -65,7 +65,7 @@
}
.el-tabs .el-tabs__header {
margin-left:90px;
margin-left:0px;
margin-right:150px;
height:29px;
}

View File

@@ -1464,7 +1464,7 @@ const cn = {
}
},
guide: {
title: '6步开始使用',
title: '开始使用 通过 6 简单步骤',
dc: '数据中心',
dcTip: '数据中心包含机柜和资产与Prometheus服务相关联机柜是资产的容器',
addDc: '新增数据中心',

View File

@@ -218,7 +218,7 @@ export default {
}
this.$refs.alertRuleForm.validate((valid) => {
if (valid) {
this.editAlertRule.receiver = this.editAlertRule.receiverShow.join(',')
params.receiver = this.editAlertRule.receiverShow.join(',')
if (this.editAlertRule.id) {
this.$put('alert/rule', params).then(response => {
this.prevent_opt.save = false

View File

@@ -49,7 +49,7 @@
<span v-else>-</span>
</template>
<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}}&nbsp;</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}}&nbsp;</el-tag>
</template>
<span v-else-if="scope.row[item.prop]">{{scope.row[item.prop]}}</span>
<template v-else>-</template>

View File

@@ -489,14 +489,14 @@ export default {
exportCur () {
const searchLabel = Object.assign({}, this.searchLabel)
this.$set(searchLabel, 'language', localStorage.getItem('nz-language') ? localStorage.getItem('nz-language') : 'en')
this.exportExcel(searchLabel)
this.exportExcel({ ...searchLabel, state: this.state })
this.closeDialog()
},
exportAll () {
const temp = JSON.parse(JSON.stringify(this.searchLabel))
temp.pageSize = -1
this.$set(temp, 'language', localStorage.getItem('nz-language') ? localStorage.getItem('nz-language') : 'en')
this.exportExcel(temp)
this.exportExcel({ ...temp, state: this.state })
this.closeDialog()
},
getTimeString () {

View File

@@ -154,7 +154,8 @@ export default {
if (response.code === 200) {
this.object = {
...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
}

View File

@@ -289,7 +289,7 @@ export default {
this.expressionList[this.index] = value
// this.$refs.editor.setContent(value)
this.dropDownVisible = false
// this.$emit('change', value)
this.$emit('change', value)
this.$forceUpdate()
this.cascaderValue = ''
},
@@ -299,7 +299,7 @@ export default {
}
},
expressionChange: function () {
// this.$emit('change')
this.$emit('change')
},
setError: function (errMsg) {
// console.log(errMsg)
@@ -393,7 +393,7 @@ export default {
this.tempBoxShow = false
// eslint-disable-next-line vue/no-mutating-props
this.expressionList[this.index] = params.expression
// this.$emit('change', params.expression)
this.$emit('change', params.expression)
return
}
@@ -401,7 +401,7 @@ export default {
if (res.code === 200) {
this.tempBoxShow = false
this.expressionList[this.index] = res.data.expression
// this.$emit('change', res.data.expression)
this.$emit('change', res.data.expression)
}
})
} else {