summaryrefslogtreecommitdiffstats
path: root/rulemgt-frontend/src
diff options
context:
space:
mode:
authorGuangrongFu <fu.guangrong@zte.com.cn>2018-07-30 20:07:15 +0800
committerGuangrongFu <fu.guangrong@zte.com.cn>2018-07-30 20:07:43 +0800
commit9c89d648ca92eccc3a1d6d867eb6188c725f698e (patch)
tree7984103dfcfba5db7a583e635045e459d75d34a2 /rulemgt-frontend/src
parent9641db2d3adc51c2a29f49ed77cbd66f37fa42cb (diff)
Fixed some field names
Change-Id: Ifc3ae62ea8463d52a78de43e2ed76c1d85100037 Issue-ID: HOLMES-154 Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>
Diffstat (limited to 'rulemgt-frontend/src')
-rw-r--r--rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.ts4
-rw-r--r--rulemgt-frontend/src/app/correlation-ruleList/alarmRule.service.ts8
2 files changed, 7 insertions, 5 deletions
diff --git a/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.ts b/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.ts
index 6273e9a..6a3ea0a 100644
--- a/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.ts
+++ b/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.ts
@@ -39,7 +39,7 @@ export class AlarmRule implements OnInit {
model: any;
ruleRequest: RuleRequest;
solution = 'ANGULAR';
- selection = 'A'
+ selection = 'A';
activeStatus = ["option_all", "common_enabled", "common_disabled"];
constructor(public _alarmRuleService: AlarmRuleService, private modalService: ModalService,
@@ -76,7 +76,7 @@ export class AlarmRule implements OnInit {
return this._alarmRuleService
.getRules()
.then(rules => {
- this.rules = rules.rules;
+ this.rules = rules.correlationRules;
this.totalcount = rules.totalcount;
});
}
diff --git a/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.service.ts b/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.service.ts
index d558041..b410d6d 100644
--- a/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.service.ts
+++ b/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.service.ts
@@ -69,7 +69,7 @@ export class AlarmRuleService {
const url = `${this.ruleUrl}?queryrequest=${JSON.stringify(data)}`
return this.http.get(url, { body: data, headers: this.headers })
.toPromise()
- .then(res => res.json().rules as RuleModel[])
+ .then(res => res.json().correlatoinRules as RuleModel[])
.catch(this.handleError);
}
@@ -88,7 +88,8 @@ export class AlarmRuleService {
"ruleId": rule.ruleId,
"description": rule.description,
"content": rule.content,
- "enabled": rule.enabled
+ "enabled": rule.enabled,
+ "loopControlName": rule.loopControlName
}
const url = `${this.ruleUrl}`
return this.http
@@ -103,7 +104,8 @@ export class AlarmRuleService {
"description": rule.description,
"content": rule.content,
"enabled": rule.enabled,
- "ruleName": rule.ruleName
+ "ruleName": rule.ruleName,
+ "loopControlName": rule.loopControlName
}
return this.http.put(this.ruleUrl, JSON.stringify(ruledata), { headers: this.headers })
.toPromise()