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

NEZ-2762 fix： 取消 priority

Browse Source
This commit is contained in:
zhangyu
2023-04-12 16:15:29 +08:00
parent 0a545b0f40
commit b8f4a2b5eb
3 changed files with 45 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
nezha-fronted/src/assets/css/components/common/project/L5/topologyTopTool.scss
View File

@@ -29,6 +29,7 @@
.top-tool-item {
cursor: pointer;
color: $--button-icon-color;
background-color: $--background-color-empty;
border: 1px solid $--button-icon-border-color;
border-radius: 2px;
@@ -39,11 +40,19 @@
.top-tool-item:active{
background-color: $--button-icon-active-background-color;
border: 1px solid $--button-icon-active-border-color !important;
color: $--color-primary;
color: $--color-primary !important;
.nz-icon {
color: $--color-primary;
}
}
.top-tool-item.nz-btn-disabled {
color: $--button-icon-color !important;
background-color: $--background-color-empty !important;
border: 1px solid $--button-icon-border-color !important;
.nz-icon {
color: $--color-text-regular;
}
}
.is-active-meta2d.top-tool-item {
//background: mix(#FFF, $--background-color-disabled, 35%);

28
nezha-fronted/src/components/common/alert/alertRuleInfo2.vue
View File

@@ -37,20 +37,20 @@
<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">
<div
v-for="priority in alertRuleData.condition"
:key="priority.id"
class="search-item-value alert-label-value-prioity text-ellipsis"
:style="{background:priority.color}"
:title="priority.name + (position.operator || '>') + (priority.value || '-')"
>
{{priority.name}} {{position.operator || '>'}} {{priority.value || '-'}}
</div>
</div>
</div>
<!-- <div class="alert-label-box">-->
<!-- <div class="alert-label-title">{{$t('alert.severity')}}</div>-->
<!-- <div class="alert-label-value">-->
<!-- <div-->
<!-- v-for="priority in alertRuleData.condition"-->
<!-- :key="priority.id"-->
<!-- class="search-item-value alert-label-value-prioity text-ellipsis"-->
<!-- :style="{background:priority.color}"-->
<!-- :title="priority.name + (position.operator || '>') + (priority.value || '-')"-->
<!-- >-->
<!-- {{priority.name}} {{position.operator || '>'}} {{priority.value || '-'}}-->
<!-- </div>-->
<!-- </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>

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

@@ -63,20 +63,20 @@
<div class="search-item-value" v-html="getPathContent(item.key)">
</div>
</div>
<div class="search-item-value-box" v-else-if="obj.type === 'alertrule'&&item.key==='severityId'" style="display: flex;width: calc(100% - 150px)">
<!-- <i v-if="item.icon&&getPathContent(item.key)!=='&#45;&#45;'" class="nz-icon" :class="searchItemClass(item)" :style="searchItemStyle(item)"/>-->
<!-- <div class="search-item-value" v-html="getPathContent(item.key)">-->
<!-- <div class="search-item-value-box" v-else-if="obj.type === 'alertrule'&&item.key==='severityId'" style="display: flex;width: calc(100% - 150px)">-->
<!--&lt;!&ndash; <i v-if="item.icon&&getPathContent(item.key)!=='&#45;&#45;'" class="nz-icon" :class="searchItemClass(item)" :style="searchItemStyle(item)"/>&ndash;&gt;-->
<!--&lt;!&ndash; <div class="search-item-value" v-html="getPathContent(item.key)">&ndash;&gt;-->
<!--&lt;!&ndash; </div>&ndash;&gt;-->
<!-- <div-->
<!-- v-for="priority in alertLabelData.condition"-->
<!-- :key="priority.id"-->
<!-- class="search-item-value alert-label-value-prioity text-ellipsis"-->
<!-- :style="{background:priority.color}"-->
<!-- :title="priority.name + (position.operator || '>') + (priority.value || '-')"-->
<!-- >-->
<!-- {{priority.name}} {{position.operator || '>'}} {{priority.value || '-'}}-->
<!-- </div>-->
<div
v-for="priority in alertLabelData.condition"
:key="priority.id"
class="search-item-value alert-label-value-prioity text-ellipsis"
:style="{background:priority.color}"
:title="priority.name + (position.operator || '>') + (priority.value || '-')"
>
{{priority.name}} {{position.operator || '>'}} {{priority.value || '-'}}
</div>
</div>
<!-- </div>-->
<div style="cursor: pointer" v-else-if="item.key === 'alertNum'">
<i :class="Number(getPathContent(item.key)) ? 'red' : 'green'" class="nz-icon nz-icon-overview-alert vertical-align-top;" @mouseenter="tooltipHover('',true, $event)" @mouseleave="tooltipHover('',false, $event)"></i>
<div v-if="alertNumtooltipShow" class="alert-days-info-tooltip" :style="{left: position.left + 'px',top:position.top + 'px'}">
@@ -400,12 +400,14 @@ export default {
}, {
key: 'type',
label: this.$t('overall.type')
}, {
key: 'severityId',
label: this.$t('alert.severity'),
color: this.severityColor,
icon: 'nz-icon nz-icon-circle fz12'
}, {
},
// {
// key: 'severityId',
// label: this.$t('alert.severity'),
// color: this.severityColor,
// icon: 'nz-icon nz-icon-circle fz12'
// },
{
key: 'expr',
label: this.$t('alert.config.expr')
}, {