gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NEZ-2778 fix： Alert message 列表，rule 悬浮提示框内容有误（鼠标悬浮 rule.name）

Browse Source
This commit is contained in:
zhangyu
2023-04-17 15:41:02 +08:00
parent beb5aa0cd1
commit bd8c624a03
7 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nezha-fronted/src/components/chart/chartDetail.vue
View File

@@ -230,7 +230,6 @@ export default {
}) })
setTimeout(() => { setTimeout(() => {
this.alertDaysData = newWeekDays this.alertDaysData = newWeekDays
console.log(this.alertDaysData)
this.trendLoading = false this.trendLoading = false
}) })
return return

10
nezha-fronted/src/components/common/alert/alertRuleInfo.vue
View File

@@ -40,13 +40,13 @@
<span v-else>--</span> <span v-else>--</span>
</div> </div>
</div> </div>
<div class="alert-label-box"> <!-- <div class="alert-label-box">-->
<div class="alert-label-title">{{$t('alert.severity')}}</div> <!-- <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 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 : '&#45;&#45;'}}</div>-->
</div> <!-- </div>-->
<div class="alert-label-box"> <div class="alert-label-box">
<div class="alert-label-title">{{$t('alert.config.expr')}}</div> <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>
<div class="alert-label-box"> <div class="alert-label-box">
<div class="alert-label-title">{{$t('alert.alertNum')}}</div> <div class="alert-label-title">{{$t('alert.alertNum')}}</div>

1
nezha-fronted/src/components/common/globalSearch/searchItemInfo.vue
View File

@@ -524,7 +524,6 @@ export default {
}) })
return item return item
}) })
console.log(res.data.condition)
this.alertLabelData = res.data this.alertLabelData = res.data
} else { } else {
this.$message.error(res.msg) this.$message.error(res.msg)

1
nezha-fronted/src/components/common/project/meta2d/meta2dSelectImage.vue
View File

@@ -337,7 +337,6 @@ export default {
}, },
beforeAvatarUpload (file, fileList) { beforeAvatarUpload (file, fileList) {
const this_ = this 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 isJPG = (file.raw.type === 'image/jpeg' || file.raw.type === 'image/png' || file.raw.type === 'image/gif')
const isLt2M = (file.size / 1024 / 1024) < 2 const isLt2M = (file.size / 1024 / 1024) < 2
if (!isJPG) { if (!isJPG) {

1
nezha-fronted/src/components/common/project/meta2d/meta2dTooltip.vue
View File

@@ -81,7 +81,6 @@ export default {
elements.push(element) elements.push(element)
} }
}) })
console.log(chartData)
if (chartData && this.$refs.panelChart) { if (chartData && this.$refs.panelChart) {
this.chartInfo.elements = elements this.chartInfo.elements = elements
this.$refs.panelChart.chartData = chartData this.$refs.panelChart.chartData = chartData

1
nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
View File

@@ -364,7 +364,6 @@ export default {
mixins: [editRigthBox, promqlInputMixin], mixins: [editRigthBox, promqlInputMixin],
computed: { computed: {
filterOperators () { filterOperators () {
console.log(this.editAlertRule.type)
if (this.editAlertRule.type != 3) { if (this.editAlertRule.type != 3) {
return this.operators.filter(item => item.value !== '=~') return this.operators.filter(item => item.value !== '=~')
} else { } else {

1
nezha-fronted/src/components/page/alert/alertMessage.vue
View File

@@ -720,7 +720,6 @@ export default {
let chartInfo = {} let chartInfo = {}
const severityData = JSON.parse(localStorage.getItem('nz-severityDataWeight')) const severityData = JSON.parse(localStorage.getItem('nz-severityDataWeight'))
const conditionArr = JSON.parse(this.currentMsg.alertRule.condition) 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) { if (this.currentMsg.alertRule.type === 1 || this.currentMsg.alertRule.type === 3) {
chartInfo = lodash.cloneDeep(lineData) chartInfo = lodash.cloneDeep(lineData)
chartInfo.elements = [{}] chartInfo.elements = [{}]