fix: 修复alert-message二级弹框参数不对的问题
This commit is contained in:
@@ -88,7 +88,7 @@
|
|||||||
<span v-else>-</span>
|
<span v-else>-</span>
|
||||||
</div>-->
|
</div>-->
|
||||||
<template v-else-if="item.prop == 'labels'">
|
<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"
|
:key="key"
|
||||||
type="info"
|
type="info"
|
||||||
size="mini" v-for="(value, key) in scope.row.labels" class="alert-message-tag">{{tagValue(key, value)}}</el-tag>
|
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) => {
|
this.searchMsg.searchLabelList = this.searchMsg.searchLabelList.filter((item, index) => {
|
||||||
return item.label != "alertType" && item.label != "asset"
|
return item.label != "alertType" && item.label != "asset"
|
||||||
});
|
});
|
||||||
this.searchLabel.type = 3;
|
this.searchLabel.assetId = n.id;
|
||||||
this.searchLabel.linkId = n.id;
|
|
||||||
}
|
}
|
||||||
if (n.alertNum) {
|
if (n.alertNum) {
|
||||||
this.defaultSearchValue = 1;
|
this.defaultSearchValue = 1;
|
||||||
|
|||||||
@@ -124,12 +124,6 @@
|
|||||||
alertName:[
|
alertName:[
|
||||||
{required:true,message:this.$t('validate.required'),trigger:'blur'}
|
{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:[
|
expr:[
|
||||||
{required:true,message:this.$t('validate.required'),trigger:'blur'}
|
{required:true,message:this.$t('validate.required'),trigger:'blur'}
|
||||||
],
|
],
|
||||||
@@ -243,7 +237,7 @@
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
changeType(type) {
|
/*changeType(type) {
|
||||||
this.alertRule.linkId = '';
|
this.alertRule.linkId = '';
|
||||||
if (type == 1) {
|
if (type == 1) {
|
||||||
this.getProjectList();
|
this.getProjectList();
|
||||||
@@ -252,7 +246,7 @@
|
|||||||
} else if (type == 3) {
|
} else if (type == 3) {
|
||||||
this.getAssetList();
|
this.getAssetList();
|
||||||
}
|
}
|
||||||
},
|
},*/
|
||||||
del: function() {
|
del: function() {
|
||||||
this.$confirm(this.$t("tip.confirmDelete"), {
|
this.$confirm(this.$t("tip.confirmDelete"), {
|
||||||
confirmButtonText: this.$t("tip.yes"),
|
confirmButtonText: this.$t("tip.yes"),
|
||||||
|
|||||||
@@ -391,8 +391,6 @@
|
|||||||
this.alertRule = {
|
this.alertRule = {
|
||||||
id: '',
|
id: '',
|
||||||
alertName: '',
|
alertName: '',
|
||||||
type: '',
|
|
||||||
linkId: '',
|
|
||||||
linkObject: {id: '', name: ''},
|
linkObject: {id: '', name: ''},
|
||||||
expr: '',
|
expr: '',
|
||||||
last: '',
|
last: '',
|
||||||
|
|||||||
@@ -102,7 +102,7 @@
|
|||||||
<el-tag @click="showTagDetail(scope.row, key)"
|
<el-tag @click="showTagDetail(scope.row, key)"
|
||||||
:key="key"
|
:key="key"
|
||||||
:class="{'link': key == 'asset' || key == 'endpoint' || key == 'project' || key == 'module' || key == 'datacenter'}"
|
: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)"
|
:type="tagType(key)"
|
||||||
size="mini" v-for="(value, key) in scope.row.labels" class="alert-message-tag">{{tagValue(key, value)}}</el-tag>
|
size="mini" v-for="(value, key) in scope.row.labels" class="alert-message-tag">{{tagValue(key, value)}}</el-tag>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -93,7 +93,7 @@
|
|||||||
<div class="content-col-box">
|
<div class="content-col-box">
|
||||||
<div class="content-col-title">
|
<div class="content-col-title">
|
||||||
<span>{{$t("dashboard.overview.alert.alertRuleTopN")}}</span>
|
<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 {{topFilter.rule}}<i class="el-icon-arrow-down el-icon--right"></i></span>
|
<span>Top {{topFilter.rule}}<i class="el-icon-arrow-down el-icon--right"></i></span>
|
||||||
<el-dropdown-menu slot="dropdown">
|
<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>
|
<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>
|
<i class="el-icon-arrow-down"></i>
|
||||||
<transition name="el-zoom-in-top">
|
<transition name="el-zoom-in-top">
|
||||||
<ul class="el-dropdown-menu el-popper el-dropdown-menu--mini" v-if="bottom3DropdownShow">
|
<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('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">{{$t("dashboard.overview.module.module")}}</li>
|
<li @click="alertMessageChange('module')" class="el-dropdown-menu__item dropdown-content" style="padding: 0 15px;">{{$t("dashboard.overview.module.module")}}</li>
|
||||||
</ul>
|
</ul>
|
||||||
</transition>
|
</transition>
|
||||||
</span>
|
</span>
|
||||||
</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 {{topFilter.asset}}<i class="el-icon-arrow-down el-icon--right"></i></span>
|
<span>Top {{topFilter.asset}}<i class="el-icon-arrow-down el-icon--right"></i></span>
|
||||||
<el-dropdown-menu slot="dropdown">
|
<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-item v-for="(item,index) in topFilter.optionals" :key="index" @click.native="topNChange('asset', item)">{{item}}</el-dropdown-item>
|
||||||
</el-dropdown-menu>
|
</el-dropdown-menu>
|
||||||
</el-dropdown>
|
</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 {{topFilter.module}}<i class="el-icon-arrow-down el-icon--right"></i></span>
|
<span>Top {{topFilter.module}}<i class="el-icon-arrow-down el-icon--right"></i></span>
|
||||||
<el-dropdown-menu slot="dropdown">
|
<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>
|
<el-dropdown-item v-for="(item,index) in topFilter.optionals" :key="index" @click.native="topNChange('module', item)">{{item}}</el-dropdown-item>
|
||||||
|
|||||||
Reference in New Issue
Block a user