if (this.ruleModel.enabled == null) {
this.ruleRequest.enabled = null;
}
- this.ruleRequest.rulename = this.ruleModel.rulename;
- console.log(this.ruleRequest.enabled, this.ruleRequest.rulename);
+ this.ruleRequest.ruleName = this.ruleModel.ruleName;
+ console.log(this.ruleRequest.enabled, this.ruleRequest.ruleName);
this._alarmRuleService
.searchrules(this.ruleRequest)
});
}
updateRule(rule: RuleModel): void {
- this.router.navigate(['ruleInfo/', rule.ruleid]);
+ this.router.navigate(['ruleInfo/', rule.ruleId]);
}
delete(rule: RuleModel): void {
- rule.enabled == 1 ? this.deleteActiveRule(rule) : this.deleteModel(rule.ruleid, this._alarmRuleService, this);
+ rule.enabled == 1 ? this.deleteActiveRule(rule) : this.deleteModel(rule.ruleId, this._alarmRuleService, this);
}
on_off(rule: RuleModel) {
}
reset(): void {
- this.ruleModel.rulename = null;
- this.activeText = "option_all";
+ this.ruleModel.ruleName = null;
+ this.activeText = 'option_all';
this.ruleModel.enabled = null;
this.getRules();
}
deleteActiveRule(rule: RuleModel): void {
- jQuery("#" + rule.ruleid).popModal({
+ jQuery('#' + rule.ruleId).popModal({
html: jQuery('#deleteActiveRuleContent'),
placement: 'leftTop',
showCloseBut: false,
},
});
}
- deleteModel(ruleid: string, alarm: AlarmRuleService, obj: any): void {
- jQuery("#" + ruleid).popModal({
+ deleteModel(ruleId: string, alarm: AlarmRuleService, obj: any): void {
+ jQuery('#' + ruleId).popModal({
html: jQuery('#deleteTimingTaskContent'),
placement: 'leftTop',
showCloseBut: false,
onDocumentClickClose: true,
onOkBut: function () {
- jQuery("#deleteTimingTaskDlg").append(jQuery('#deleteTimingTaskContent'));
- alarm.delete(ruleid);
+ jQuery('#deleteTimingTaskDlg').append(jQuery('#deleteTimingTaskContent'));
+ alarm.delete(ruleId);
obj.getRules();
},
onCancelBut: function () {
}
ngOnInit(): void {
- this.activeText = "option_all";
+ this.activeText = 'option_all';
this.ruleModel = {
- ruleid: null,
- rulename: null,
- description: "",
+ ruleId: null,
+ ruleName: null,
+ description: '',
content: null,
- createtime: null,
+ createTime: null,
creator: null,
- updatetime: null,
+ updateTime: null,
modifier: null,
enabled: 0,
+ loopControlName: ''
}
this.ruleRequest = {
- ruleid: null,
- rulename: null,
+ ruleId: null,
+ ruleName: null,
creator: null,
modifier: null,
enabled: null,
+ loopControlName: ''
}
this.getRules();
}