NEZ-2778 fix: Alert message 列表,rule 悬浮提示框内容有误(鼠标悬浮 rule.name)
This commit is contained in:
@@ -230,7 +230,6 @@ export default {
|
||||
})
|
||||
setTimeout(() => {
|
||||
this.alertDaysData = newWeekDays
|
||||
console.log(this.alertDaysData)
|
||||
this.trendLoading = false
|
||||
})
|
||||
return
|
||||
|
||||
@@ -40,13 +40,13 @@
|
||||
<span v-else>--</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="alert-label-box">
|
||||
<div class="alert-label-title">{{$t('alert.severity')}}</div>
|
||||
<div class="alert-label-value"><i class="nz-icon nz-icon-circle" :style="{color:severityColor,'font-size':'12px','margin-right':'5px'}"></i>{{alertRuleData.severityId ? severityData.find(s => alertRuleData.severityId === s.id).name : '--'}}</div>
|
||||
</div>
|
||||
<!-- <div class="alert-label-box">-->
|
||||
<!-- <div class="alert-label-title">{{$t('alert.severity')}}</div>-->
|
||||
<!-- <div class="alert-label-value"><i class="nz-icon nz-icon-circle" :style="{color:severityColor,'font-size':'12px','margin-right':'5px'}"></i>{{alertRuleData.severityId ? severityData.find(s => alertRuleData.severityId === s.id).name : '--'}}</div>-->
|
||||
<!-- </div>-->
|
||||
<div class="alert-label-box">
|
||||
<div class="alert-label-title">{{$t('alert.config.expr')}}</div>
|
||||
<div class="alert-label-value">{{alertRuleData.expr ? (alertRuleData.expr + alertRuleData.operator + formatThreshold(alertRuleData.threshold,alertRuleData.unit)) : '--'}}</div>
|
||||
<div class="alert-label-value">{{alertRuleData.expr ? alertRuleData.expr : '--'}}</div>
|
||||
</div>
|
||||
<div class="alert-label-box">
|
||||
<div class="alert-label-title">{{$t('alert.alertNum')}}</div>
|
||||
|
||||
@@ -524,7 +524,6 @@ export default {
|
||||
})
|
||||
return item
|
||||
})
|
||||
console.log(res.data.condition)
|
||||
this.alertLabelData = res.data
|
||||
} else {
|
||||
this.$message.error(res.msg)
|
||||
|
||||
@@ -337,7 +337,6 @@ export default {
|
||||
},
|
||||
beforeAvatarUpload (file, fileList) {
|
||||
const this_ = this
|
||||
console.log(file.raw.type)
|
||||
const isJPG = (file.raw.type === 'image/jpeg' || file.raw.type === 'image/png' || file.raw.type === 'image/gif')
|
||||
const isLt2M = (file.size / 1024 / 1024) < 2
|
||||
if (!isJPG) {
|
||||
|
||||
@@ -81,7 +81,6 @@ export default {
|
||||
elements.push(element)
|
||||
}
|
||||
})
|
||||
console.log(chartData)
|
||||
if (chartData && this.$refs.panelChart) {
|
||||
this.chartInfo.elements = elements
|
||||
this.$refs.panelChart.chartData = chartData
|
||||
|
||||
@@ -364,7 +364,6 @@ export default {
|
||||
mixins: [editRigthBox, promqlInputMixin],
|
||||
computed: {
|
||||
filterOperators () {
|
||||
console.log(this.editAlertRule.type)
|
||||
if (this.editAlertRule.type != 3) {
|
||||
return this.operators.filter(item => item.value !== '=~')
|
||||
} else {
|
||||
|
||||
@@ -720,7 +720,6 @@ export default {
|
||||
let chartInfo = {}
|
||||
const severityData = JSON.parse(localStorage.getItem('nz-severityDataWeight'))
|
||||
const conditionArr = JSON.parse(this.currentMsg.alertRule.condition)
|
||||
console.log(this.currentMsg.alertRule.condition, this.severityData)
|
||||
if (this.currentMsg.alertRule.type === 1 || this.currentMsg.alertRule.type === 3) {
|
||||
chartInfo = lodash.cloneDeep(lineData)
|
||||
chartInfo.elements = [{}]
|
||||
|
||||
Reference in New Issue
Block a user