fix: 一系列bug修复

This commit is contained in:
陈劲松
2020-12-16 11:26:51 +08:00
committed by chenjinsong
parent 6966e3a01d
commit dc54e26193
14 changed files with 47 additions and 27 deletions

View File

@@ -649,11 +649,11 @@
if(this.searchLabel.orderBy){
orderBy=this.searchLabel.orderBy
}
if (this.from == "alertRule") {
if (this.from == $CONSTANTS.fromRoute.rule) {
this.searchLabel.ruleId = this.obj.id;
} else if (this.from == "asset") {
} else if (this.from == $CONSTANTS.fromRoute.asset) {
this.searchLabel.assetId = this.obj.id;
}else if(this.from == 'endpoint'){
}else if(this.from == $CONSTANTS.fromRoute.endpoint){
this.searchLabel.endpointId=this.obj.id;
}
this.pageObj.pageNo = 1;
@@ -693,17 +693,17 @@
}else{
this.defaultPick=12;
}
if (this.from == "alertRule") {
if (this.from == $CONSTANTS.fromRoute.rule) {
this.searchMsg.searchLabelList = this.searchMsg.searchLabelList.filter((item, index) => {
return item.label != "alertName" && item.label != "severity"
});
this.searchLabel.ruleId = n.id;
} else if (this.from == "asset") {
} else if (this.from == $CONSTANTS.fromRoute.asset) {
this.searchMsg.searchLabelList = this.searchMsg.searchLabelList.filter((item, index) => {
return item.label != "alertType" && item.label != "asset"
});
this.searchLabel.assetId = n.id;
} else if(this.from == 'endpoint'){
} else if(this.from == $CONSTANTS.fromRoute.endpoint){
this.searchMsg.searchLabelList = this.searchMsg.searchLabelList.filter((item, index) => {
return item.label != "alertType" && item.label != "endpoint"
});