summaryrefslogtreecommitdiffstats
path: root/rulemgt-frontend
diff options
context:
space:
mode:
authorGuangrong Fu <fu.guangrong@zte.com.cn>2022-08-16 17:46:09 +0800
committerGuangrong Fu <fu.guangrong@zte.com.cn>2022-08-16 17:46:09 +0800
commit6ebc6d22c0654cbdfde1329d5ea7a2f23df5988d (patch)
treed51551b31b697c7907a7ce366ebc91a2eb31e1f6 /rulemgt-frontend
parent1915e1c1948fd4252ad6caab9468ea88d24b869e (diff)
bugfix - rule query failure with empty criteria
Issue-ID: HOLMES-493 Signed-off-by: Guangrong Fu <fu.guangrong@zte.com.cn> Change-Id: I5ded38ec48f869174a7eec4383ec3488e5eba6d2
Diffstat (limited to 'rulemgt-frontend')
-rw-r--r--rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.ts9
-rw-r--r--rulemgt-frontend/src/app/correlation-ruleList/alarmRule.service.ts4
2 files changed, 6 insertions, 7 deletions
diff --git a/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.ts b/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.ts
index d3897fe..05f36ca 100644
--- a/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.ts
+++ b/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.ts
@@ -52,8 +52,7 @@ export class AlarmRule implements OnInit {
} else if (select == "common_disabled") {
this.ruleModel.enabled = 0;
} else {
-
- this.ruleModel.enabled = null;
+ this.ruleModel.enabled = 2;
}
this.setActiveText();
}
@@ -116,7 +115,7 @@ export class AlarmRule implements OnInit {
public reset(): void {
this.ruleModel.ruleName = null;
this.activeText = 'option_all';
- this.ruleModel.enabled = null;
+ this.ruleModel.enabled = 2;
this.getRules();
}
@@ -144,7 +143,7 @@ export class AlarmRule implements OnInit {
creator: null,
updateTime: null,
modifier: null,
- enabled: 0,
+ enabled: 2,
loopControlName: ''
};
this.ruleRequest = {
@@ -152,7 +151,7 @@ export class AlarmRule implements OnInit {
ruleName: null,
creator: null,
modifier: null,
- enabled: null,
+ enabled: 2,
loopControlName: ''
};
this.getRules();
diff --git a/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.service.ts b/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.service.ts
index ebab289..90964b1 100644
--- a/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.service.ts
+++ b/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.service.ts
@@ -57,7 +57,7 @@ export class AlarmRuleService {
let data = {'ruleId': ruleId};
var queryrequest = JSON.stringify(data);
const url = `${this.ruleUrl}?queryrequest=${queryrequest}`;
- return this.http.get(url, {headers: this.headers})
+ return this.http.get(encodeURI(url))
.toPromise()
.then(res => res.json().correlationRules as RuleModel[])
.catch(this.handleError);
@@ -67,7 +67,7 @@ export class AlarmRuleService {
let data = {ruleName: rule.ruleName, enabled: rule.enabled}
console.log(JSON.stringify(data));
const url = `${this.ruleUrl}?queryrequest=${JSON.stringify(data)}`
- return this.http.get(url, {body: data, headers: this.headers})
+ return this.http.get(encodeURI(url))
.toPromise()
.then(res => res.json().correlationRules as RuleModel[])
.catch(this.handleError);