Code Review
/
holmes
/
rule-management.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Change the buiding tool to angular-cli
[holmes/rule-management.git]
/
rulemgt-frontend
/
src
/
app
/
correlation-ruleList
/
alarmRule.component.ts
diff --git
a/rulemgt/src/main/frontend/src/alarm/app/correlation-ruleList/alarmRule.component.ts
b/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.ts
similarity index 84%
rename from
rulemgt/src/main/frontend/src/alarm/app/correlation-ruleList/alarmRule.component.ts
rename to
rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.ts
index
af33eec
..
65a5296
100644
(file)
--- a/
rulemgt/src/main/frontend/src/alarm/app/correlation-ruleList/alarmRule.component.ts
+++ b/
rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.ts
@@
-85,8
+85,8
@@
export class AlarmRule implements OnInit {
if (this.ruleModel.enabled == null) {
this.ruleRequest.enabled = null;
}
if (this.ruleModel.enabled == null) {
this.ruleRequest.enabled = null;
}
- this.ruleRequest.rule
name = this.ruleModel.rulen
ame;
- console.log(this.ruleRequest.enabled, this.ruleRequest.rule
n
ame);
+ this.ruleRequest.rule
Name = this.ruleModel.ruleN
ame;
+ console.log(this.ruleRequest.enabled, this.ruleRequest.rule
N
ame);
this._alarmRuleService
.searchrules(this.ruleRequest)
this._alarmRuleService
.searchrules(this.ruleRequest)
@@
-96,11
+96,11
@@
export class AlarmRule implements OnInit {
});
}
updateRule(rule: RuleModel): void {
});
}
updateRule(rule: RuleModel): void {
- this.router.navigate(['ruleInfo/', rule.rule
i
d]);
+ this.router.navigate(['ruleInfo/', rule.rule
I
d]);
}
delete(rule: RuleModel): void {
}
delete(rule: RuleModel): void {
- rule.enabled == 1 ? this.deleteActiveRule(rule) : this.deleteModel(rule.rule
i
d, this._alarmRuleService, this);
+ rule.enabled == 1 ? this.deleteActiveRule(rule) : this.deleteModel(rule.rule
I
d, this._alarmRuleService, this);
}
on_off(rule: RuleModel) {
}
on_off(rule: RuleModel) {
@@
-113,14
+113,14
@@
export class AlarmRule implements OnInit {
}
reset(): void {
}
reset(): void {
- this.ruleModel.rule
n
ame = null;
- this.activeText =
"option_all"
;
+ this.ruleModel.rule
N
ame = null;
+ this.activeText =
'option_all'
;
this.ruleModel.enabled = null;
this.getRules();
}
deleteActiveRule(rule: RuleModel): void {
this.ruleModel.enabled = null;
this.getRules();
}
deleteActiveRule(rule: RuleModel): void {
- jQuery(
"#" + rule.rulei
d).popModal({
+ jQuery(
'#' + rule.ruleI
d).popModal({
html: jQuery('#deleteActiveRuleContent'),
placement: 'leftTop',
showCloseBut: false,
html: jQuery('#deleteActiveRuleContent'),
placement: 'leftTop',
showCloseBut: false,
@@
-129,15
+129,15
@@
export class AlarmRule implements OnInit {
},
});
}
},
});
}
- deleteModel(rule
i
d: string, alarm: AlarmRuleService, obj: any): void {
- jQuery(
"#" + rulei
d).popModal({
+ deleteModel(rule
I
d: string, alarm: AlarmRuleService, obj: any): void {
+ jQuery(
'#' + ruleI
d).popModal({
html: jQuery('#deleteTimingTaskContent'),
placement: 'leftTop',
showCloseBut: false,
onDocumentClickClose: true,
onOkBut: function () {
html: jQuery('#deleteTimingTaskContent'),
placement: 'leftTop',
showCloseBut: false,
onDocumentClickClose: true,
onOkBut: function () {
- jQuery(
"#deleteTimingTaskDlg"
).append(jQuery('#deleteTimingTaskContent'));
- alarm.delete(rule
i
d);
+ jQuery(
'#deleteTimingTaskDlg'
).append(jQuery('#deleteTimingTaskContent'));
+ alarm.delete(rule
I
d);
obj.getRules();
},
onCancelBut: function () {
obj.getRules();
},
onCancelBut: function () {
@@
-146,24
+146,26
@@
export class AlarmRule implements OnInit {
}
ngOnInit(): void {
}
ngOnInit(): void {
- this.activeText =
"option_all"
;
+ this.activeText =
'option_all'
;
this.ruleModel = {
this.ruleModel = {
- rule
i
d: null,
- rule
n
ame: null,
- description:
""
,
+ rule
I
d: null,
+ rule
N
ame: null,
+ description:
''
,
content: null,
content: null,
- create
t
ime: null,
+ create
T
ime: null,
creator: null,
creator: null,
- update
t
ime: null,
+ update
T
ime: null,
modifier: null,
enabled: 0,
modifier: null,
enabled: 0,
+ loopControlName: ''
}
this.ruleRequest = {
}
this.ruleRequest = {
- rule
i
d: null,
- rule
n
ame: null,
+ rule
I
d: null,
+ rule
N
ame: null,
creator: null,
modifier: null,
enabled: null,
creator: null,
modifier: null,
enabled: null,
+ loopControlName: ''
}
this.getRules();
}
}
this.getRules();
}