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

fix: 修复alert-message二级弹框参数不对的问题

Browse Source
This commit is contained in:
陈劲松
2020-04-28 16:10:59 +08:00
parent 1106136fce
commit e50dbec90a
5 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue
View File

@@ -88,7 +88,7 @@
<span v-else>-</span>
</div>-->
<template v-else-if="item.prop == 'labels'">
<el-tag v-if="key != 'alertname' && key != 'severity' && key != 'linkId'"
<el-tag v-if="key != 'alertname' && key != 'severity'"
:key="key"
type="info"
size="mini" v-for="(value, key) in scope.row.labels" class="alert-message-tag">{{tagValue(key, value)}}</el-tag>
@@ -536,8 +536,7 @@
this.searchMsg.searchLabelList = this.searchMsg.searchLabelList.filter((item, index) => {
return item.label != "alertType" && item.label != "asset"
});
this.searchLabel.type = 3;
this.searchLabel.linkId = n.id;
this.searchLabel.assetId = n.id;
}
if (n.alertNum) {
this.defaultSearchValue = 1;

10
nezha-fronted/src/components/common/rightBox/alertConfigBox.vue
View File

@@ -124,12 +124,6 @@
alertName:[
{required:true,message:this.$t('validate.required'),trigger:'blur'}
],
type:[
{required:true,message:this.$t('validate.required'),trigger:'change'}
],
linkId:[
{required:true,message:this.$t('validate.required'),trigger:"change"}
],
expr:[
{required:true,message:this.$t('validate.required'),trigger:'blur'}
],
@@ -243,7 +237,7 @@
}
})
},
changeType(type) {
/*changeType(type) {
this.alertRule.linkId = '';
if (type == 1) {
this.getProjectList();
@@ -252,7 +246,7 @@
} else if (type == 3) {
this.getAssetList();
}
},
},*/
del: function() {
this.$confirm(this.$t("tip.confirmDelete"), {
confirmButtonText: this.$t("tip.yes"),

2
nezha-fronted/src/components/page/alert/config.vue
View File

@@ -391,8 +391,6 @@
this.alertRule = {
id: '',
alertName: '',
type: '',
linkId: '',
linkObject: {id: '', name: ''},
expr: '',
last: '',

2
nezha-fronted/src/components/page/alert/list.vue
View File

@@ -102,7 +102,7 @@
<el-tag @click="showTagDetail(scope.row, key)"
:key="key"
:class="{'link': key == 'asset' || key == 'endpoint' || key == 'project' || key == 'module' || key == 'datacenter'}"
v-if="key != 'alertname' && key != 'severity' && key != 'linkId'"
v-if="key != 'alertname' && key != 'severity'"
:type="tagType(key)"
size="mini" v-for="(value, key) in scope.row.labels" class="alert-message-tag">{{tagValue(key, value)}}</el-tag>
</template>

10
nezha-fronted/src/components/page/dashboard/overview/overview2.vue
View File

@@ -93,7 +93,7 @@
<div class="content-col-box">
<div class="content-col-title">
<span>{{$t("dashboard.overview.alert.alertRuleTopN")}}</span>
<el-dropdown trigger="hover" :show-timeout="0">
<el-dropdown trigger="hover" :show-timeout="0" size="small">
<span>Top&nbsp;{{topFilter.rule}}<i class="el-icon-arrow-down el-icon--right"></i></span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item v-for="(item,index) in topFilter.optionals" :key="index" @click.native="topNChange('rule', item)">{{item}}</el-dropdown-item>
@@ -113,19 +113,19 @@
<i class="el-icon-arrow-down"></i>
<transition name="el-zoom-in-top">
<ul class="el-dropdown-menu el-popper el-dropdown-menu--mini" v-if="bottom3DropdownShow">
<li @click="alertMessageChange('asset')" class="el-dropdown-menu__item dropdown-content">{{$t("dashboard.overview.asset.title")}}</li>
<li @click="alertMessageChange('module')" class="el-dropdown-menu__item dropdown-content">{{$t("dashboard.overview.module.module")}}</li>
<li @click="alertMessageChange('asset')" class="el-dropdown-menu__item dropdown-content" style="padding: 0 15px;">{{$t("dashboard.overview.asset.title")}}</li>
<li @click="alertMessageChange('module')" class="el-dropdown-menu__item dropdown-content" style="padding: 0 15px;">{{$t("dashboard.overview.module.module")}}</li>
</ul>
</transition>
</span>
</span>
<el-dropdown trigger="hover" v-if="alertMessageShow == 'asset'" :show-timeout="0">
<el-dropdown trigger="hover" v-if="alertMessageShow == 'asset'" :show-timeout="0" size="small">
<span>Top&nbsp;{{topFilter.asset}}<i class="el-icon-arrow-down el-icon--right"></i></span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item v-for="(item,index) in topFilter.optionals" :key="index" @click.native="topNChange('asset', item)">{{item}}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-dropdown trigger="hover" v-if="alertMessageShow == 'module'" :show-timeout="0">
<el-dropdown trigger="hover" v-if="alertMessageShow == 'module'" :show-timeout="0" size="small">
<span>Top&nbsp;{{topFilter.module}}<i class="el-icon-arrow-down el-icon--right"></i></span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item v-for="(item,index) in topFilter.optionals" :key="index" @click.native="topNChange('module', item)">{{item}}</el-dropdown-item>