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

NEZ-1156 fix: 修复alert rule type字段未正确翻译为 metrics.logs.snmp trap

Browse Source
This commit is contained in:
@changcode
2021-11-02 11:04:06 +08:00
parent efb0996777
commit e38bdd4e19
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nezha-fronted/src/components/common/alert/alertLabel.vue
View File

@@ -339,7 +339,6 @@ export default {
const topOffSet = this.detailList ? 45 : 0 const topOffSet = this.detailList ? 45 : 0
const elHeight = self.type === 'asset' ? 318 : (self.type === 'project' ? 70 : 70) const elHeight = self.type === 'asset' ? 318 : (self.type === 'project' ? 70 : 70)
if (position.top + elHeight > clientHeight) { if (position.top + elHeight > clientHeight) {
console.log(leftOffSet, topOffSet)
return { return {
left: `${position.left + position.width + leftOffSet}px`, left: `${position.left + position.width + leftOffSet}px`,
top: `${position.top - elHeight + topOffSet}px` top: `${position.top - elHeight + topOffSet}px`
@@ -354,7 +353,6 @@ export default {
} }
} }
} else { } else {
console.log(leftOffSetView, topOffSetView)
return { return {
left: `${position.left + position.width + leftOffSetView}px`, left: `${position.left + position.width + leftOffSetView}px`,
top: `${position.top + topOffSetView}px` top: `${position.top + topOffSetView}px`

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

@@ -11,7 +11,16 @@
</div> </div>
<div class="alert-rule-box"> <div class="alert-rule-box">
<div class="alert-rule-title">{{$t('alert.type')}}</div> <div class="alert-rule-title">{{$t('alert.type')}}</div>
<div class="alert-rule-value">{{alertRuleData.type ? alertRuleData.type : '--'}}</div> <div class="alert-rule-value">
<span v-if="alertRuleData.type === 1">
{{$t('project.metrics.metrics')}}
</span>
<span v-else-if="alertRuleData.type === 2">
{{$t('overall.logs')}}
</span>
<span v-else-if="alertRuleData.type === 3">SNMP trap</span>
<span v-else>--</span>
</div>
</div> </div>
<div class="alert-rule-box"> <div class="alert-rule-box">
<div class="alert-rule-title">{{$t('alert.severity')}}</div> <div class="alert-rule-title">{{$t('alert.severity')}}</div>