diff --git a/nezha-fronted/src/assets/css/components/common/project/L5/topologyTopTool.scss b/nezha-fronted/src/assets/css/components/common/project/L5/topologyTopTool.scss index aea7ceb85..9d348ea29 100644 --- a/nezha-fronted/src/assets/css/components/common/project/L5/topologyTopTool.scss +++ b/nezha-fronted/src/assets/css/components/common/project/L5/topologyTopTool.scss @@ -29,22 +29,31 @@ .top-tool-item { cursor: pointer; - background: $--background-color-base; - border: 1px solid $--border-color-light; + background-color: $--background-color-empty; + border: 1px solid $--button-icon-border-color; border-radius: 2px; padding: 8px 11px; line-height: 14px; margin-right: 10px; } + .top-tool-item:active{ + background-color: $--button-icon-active-background-color; + border: 1px solid $--button-icon-active-border-color !important; + color: $--color-primary; + } + .top-tool-item.nz-btn-disabled { + background-color: $--background-color-empty !important; + border: 1px solid $--button-icon-border-color !important; + } .is-active-meta2d.top-tool-item { - background: mix(#FFF, $--background-color-disabled, 35%); - border: 1px solid mix(#000, $--background-color-disabled, 35%); - color: $--color-text-disabled; + //background: mix(#FFF, $--background-color-disabled, 35%); + //border: 1px solid mix(#000, $--background-color-disabled, 35%); + //color: $--color-text-disabled; } .top-tool-item-delete:active{ - background: mix(#FFF, $--background-color-disabled, 35%); - border: 1px solid mix(#000, $--background-color-disabled, 35%); - color: $--color-text-disabled; + //background: mix(#FFF, $--background-color-disabled, 35%); + //border: 1px solid mix(#000, $--background-color-disabled, 35%); + //color: $--color-text-disabled; } .top-tool-item-scale { margin-left: 40px; @@ -125,8 +134,9 @@ } } .top-tool-item-disabled { - color: #CECECE; - opacity: 0.3; + background-image: none; + opacity: .6; + cursor: default !important; } .tool-item-active { background: #1a1a1a; diff --git a/nezha-fronted/src/components/common/project/meta2d/topologyTopTool.vue b/nezha-fronted/src/components/common/project/meta2d/topologyTopTool.vue index d751d23a1..fa011518c 100644 --- a/nezha-fronted/src/components/common/project/meta2d/topologyTopTool.vue +++ b/nezha-fronted/src/components/common/project/meta2d/topologyTopTool.vue @@ -27,13 +27,13 @@
diff --git a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue index c3ed50cbe..8032a1a5b 100644 --- a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue +++ b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue @@ -28,7 +28,7 @@ @change="selectAlertRuleMetric"> @@ -78,7 +78,7 @@
- {{$t('alert.config.when')}} Result - +
@@ -209,8 +209,8 @@ > {{item.name}}@{{item.username}} @@ -284,7 +284,7 @@ > @@ -532,6 +532,7 @@ export default { params.receiver = this.editAlertRule.receiverShow.join(',') params.schedDays = this.editAlertRule.schedDays.join(',') params.trbShot = this.$refs.richTextEditor.getContent() + params.condition = JSON.stringify(params.condition) if (this.editAlertRule.id) { this.$put('alert/rule', params).then(response => { this.prevent_opt.save = false @@ -668,11 +669,13 @@ export default { immediate: true, handler (n, o) { this.isEdit = true - this.editAlertRule = JSON.parse(JSON.stringify(n)) + const obj = this.$loadsh.cloneDeep(n) + this.editAlertRule = this.$loadsh.cloneDeep(obj) // 获取缓存中的告警等级列表 const severityData = JSON.parse(localStorage.getItem('nz-severityDataWeight')) // 给condition赋值 if (this.editAlertRule.condition && this.editAlertRule.condition.length) { + this.editAlertRule.condition = JSON.parse(this.editAlertRule.condition) this.$set(this.editAlertRule, 'condition', severityData.map(item => { item = { ...item, @@ -723,7 +726,7 @@ export default { this.$nextTick(() => { this.expressions.forEach((ex, index) => { if (ex) { - this.$refs.promql.metricChange(ex) + this.$refs.promql && this.$refs.promql.metricChange(ex) } }) })