Change-Id: Ifc3ae62ea8463d52a78de43e2ed76c1d85100037
Issue-ID: HOLMES-154
Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>
model: any;
ruleRequest: RuleRequest;
solution = 'ANGULAR';
model: any;
ruleRequest: RuleRequest;
solution = 'ANGULAR';
activeStatus = ["option_all", "common_enabled", "common_disabled"];
constructor(public _alarmRuleService: AlarmRuleService, private modalService: ModalService,
activeStatus = ["option_all", "common_enabled", "common_disabled"];
constructor(public _alarmRuleService: AlarmRuleService, private modalService: ModalService,
return this._alarmRuleService
.getRules()
.then(rules => {
return this._alarmRuleService
.getRules()
.then(rules => {
- this.rules = rules.rules;
+ this.rules = rules.correlationRules;
this.totalcount = rules.totalcount;
});
}
this.totalcount = rules.totalcount;
});
}
const url = `${this.ruleUrl}?queryrequest=${JSON.stringify(data)}`
return this.http.get(url, { body: data, headers: this.headers })
.toPromise()
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);
}
.catch(this.handleError);
}
"ruleId": rule.ruleId,
"description": rule.description,
"content": rule.content,
"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
}
const url = `${this.ruleUrl}`
return this.http
"description": rule.description,
"content": rule.content,
"enabled": rule.enabled,
"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()
}
return this.http.put(this.ruleUrl, JSON.stringify(ruledata), { headers: this.headers })
.toPromise()