From cd505a0d05ce8f6a403bccb74a035d0c43d275da Mon Sep 17 00:00:00 2001 From: zhangyu Date: Wed, 12 May 2021 19:07:07 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=20alertRule?= =?UTF-8?q?=E7=9A=84=E7=9B=B8=E5=85=B3bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/cli/webSSH.scss | 4 ++-- nezha-fronted/src/components/common/language/cn.js | 2 +- .../src/components/common/rightBox/alertRuleBox.vue | 2 +- .../src/components/common/table/alert/alertRuleTable.vue | 2 +- nezha-fronted/src/components/page/alert/alertMessage.vue | 4 ++-- nezha-fronted/src/components/page/alert/alertRule.vue | 3 ++- .../src/components/page/dashboard/explore/promqlInput.vue | 8 ++++---- 7 files changed, 13 insertions(+), 12 deletions(-) diff --git a/nezha-fronted/src/components/cli/webSSH.scss b/nezha-fronted/src/components/cli/webSSH.scss index 75bcbadd4..00cd3496c 100644 --- a/nezha-fronted/src/components/cli/webSSH.scss +++ b/nezha-fronted/src/components/cli/webSSH.scss @@ -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; } diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index adb780046..cacfdc9d7 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -1464,7 +1464,7 @@ const cn = { } }, guide: { - title: '6步开始使用', + title: '开始使用 通过 6 简单步骤', dc: '数据中心', dcTip: '数据中心包含机柜和资产，与Prometheus服务相关联；机柜是资产的容器', addDc: '新增数据中心', diff --git a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue index d01cc19e4..6b2690bc4 100644 --- a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue +++ b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue @@ -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 diff --git a/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue b/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue index f365d89ba..c3bee4787 100644 --- a/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue +++ b/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue @@ -49,7 +49,7 @@ - {{scope.row[item.prop]}} diff --git a/nezha-fronted/src/components/page/alert/alertMessage.vue b/nezha-fronted/src/components/page/alert/alertMessage.vue index 22e601463..d1f09a08e 100644 --- a/nezha-fronted/src/components/page/alert/alertMessage.vue +++ b/nezha-fronted/src/components/page/alert/alertMessage.vue @@ -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 () { diff --git a/nezha-fronted/src/components/page/alert/alertRule.vue b/nezha-fronted/src/components/page/alert/alertRule.vue index ed6038c1a..1e9bc90a1 100644 --- a/nezha-fronted/src/components/page/alert/alertRule.vue +++ b/nezha-fronted/src/components/page/alert/alertRule.vue @@ -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 } diff --git a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue index e5e52e766..74346c460 100644 --- a/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue +++ b/nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue @@ -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 {