From 2f6d3758fbc70ee6aac10063a8784a0f34c48a4d Mon Sep 17 00:00:00 2001 From: GuangrongFu Date: Fri, 3 Aug 2018 08:38:16 +0800 Subject: [PATCH] Fixed some UI bugs Change-Id: Ic7229b94bcfca46b33bc3e6184e4dccf34982c60 Issue-ID: HOLMES-154 Signed-off-by: GuangrongFu --- .../correlation-ruleList/alarmRule.component.html | 22 ++++++++--------- .../correlation-ruleList/alarmRule.component.ts | 28 +++++++++++----------- .../app/correlation-ruleList/alarmRule.service.ts | 4 ++-- .../assets/framework/browser/css/open-ostyle.css | 2 +- .../src/assets/framework/css/open-ostyle.css | 2 +- rulemgt-frontend/src/index.html | 5 +++- .../rulemgt/bean/request/RuleQueryCondition.java | 4 ++-- 7 files changed, 35 insertions(+), 32 deletions(-) diff --git a/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.html b/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.html index 4481e18..99966a8 100644 --- a/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.html +++ b/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.html @@ -87,16 +87,16 @@ - {{rule.rulename}} + {{rule.ruleName}} - + - + - + - + {{rule.createTime | date:'yyyy-MM-dd HH:mm:ss'}} @@ -104,20 +104,20 @@ {{rule.updateTime | date:'yyyy-MM-dd HH:mm:ss'}} - + - - - - + + + + - + diff --git a/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.ts b/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.ts index 6a3ea0a..6e2c997 100644 --- a/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.ts +++ b/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.ts @@ -43,7 +43,7 @@ export class AlarmRule implements OnInit { activeStatus = ["option_all", "common_enabled", "common_disabled"]; constructor(public _alarmRuleService: AlarmRuleService, private modalService: ModalService, - private router: Router) { }; + private router: Router) { } switch(select: string): void { console.log(select); @@ -56,7 +56,7 @@ export class AlarmRule implements OnInit { this.ruleModel.enabled = null; } this.setActiveText(); - }; + } setActiveText(): void { if (this.ruleModel.enabled == 1) { @@ -70,18 +70,18 @@ export class AlarmRule implements OnInit { this.activeText = "option_all"; this.ruleRequest.enabled = null; } - }; + } getRules(): Promise { return this._alarmRuleService .getRules() .then(rules => { this.rules = rules.correlationRules; - this.totalcount = rules.totalcount; + this.totalcount = rules.totalCount; }); } - searchRules(): void { + public searchRules(): void { if (this.ruleModel.enabled == null) { this.ruleRequest.enabled = null; } @@ -95,15 +95,15 @@ export class AlarmRule implements OnInit { this.totalcount = rules.length; }); } - updateRule(rule: RuleModel): void { + public updateRule(rule: RuleModel): void { this.router.navigate(['ruleInfo/', rule.ruleId]); } - delete(rule: RuleModel): void { + public delete(rule: RuleModel): void { rule.enabled == 1 ? this.deleteActiveRule(rule) : this.deleteModel(rule.ruleId, this._alarmRuleService, this); } - on_off(rule: RuleModel) { + public on_off(rule: RuleModel) { rule.enabled == 0 ? rule.enabled = 1 : rule.enabled = 0; this._alarmRuleService .updateRule(rule) @@ -112,14 +112,14 @@ export class AlarmRule implements OnInit { }); } - reset(): void { + public reset(): void { this.ruleModel.ruleName = null; this.activeText = 'option_all'; this.ruleModel.enabled = null; this.getRules(); } - deleteActiveRule(rule: RuleModel): void { + public deleteActiveRule(rule: RuleModel): void { jQuery('#' + rule.ruleId).popModal({ html: jQuery('#deleteActiveRuleContent'), placement: 'leftTop', @@ -129,7 +129,7 @@ export class AlarmRule implements OnInit { }, }); } - deleteModel(ruleId: string, alarm: AlarmRuleService, obj: any): void { + public deleteModel(ruleId: string, alarm: AlarmRuleService, obj: any): void { jQuery('#' + ruleId).popModal({ html: jQuery('#deleteTimingTaskContent'), placement: 'leftTop', @@ -145,7 +145,7 @@ export class AlarmRule implements OnInit { }); } - ngOnInit(): void { + public ngOnInit(): void { this.activeText = 'option_all'; this.ruleModel = { ruleId: null, @@ -158,7 +158,7 @@ export class AlarmRule implements OnInit { modifier: null, enabled: 0, loopControlName: '' - } + }; this.ruleRequest = { ruleId: null, ruleName: null, @@ -166,7 +166,7 @@ export class AlarmRule implements OnInit { modifier: null, enabled: null, 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 b410d6d..1f0ee3e 100644 --- a/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.service.ts +++ b/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.service.ts @@ -59,7 +59,7 @@ export class AlarmRuleService { const url = `${this.ruleUrl}?queryrequest=${queryrequest}`; return this.http.get(url, {headers:this.headers}) .toPromise() - .then(res => res.json().rules as RuleModel) + .then(res => res.json().correlationRules as RuleModel[]) .catch(this.handleError); } @@ -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().correlatoinRules as RuleModel[]) + .then(res => res.json().correlationRules as RuleModel[]) .catch(this.handleError); } diff --git a/rulemgt-frontend/src/assets/framework/browser/css/open-ostyle.css b/rulemgt-frontend/src/assets/framework/browser/css/open-ostyle.css index 14d964d..720dc60 100644 --- a/rulemgt-frontend/src/assets/framework/browser/css/open-ostyle.css +++ b/rulemgt-frontend/src/assets/framework/browser/css/open-ostyle.css @@ -909,7 +909,7 @@ a:hover { } .customtable tbody tr:hover td{ - background-color: #e6fbe0 !important; + background-color: #fafafa !important; } .shortnote{ diff --git a/rulemgt-frontend/src/assets/framework/css/open-ostyle.css b/rulemgt-frontend/src/assets/framework/css/open-ostyle.css index 73ec064..200d91f 100644 --- a/rulemgt-frontend/src/assets/framework/css/open-ostyle.css +++ b/rulemgt-frontend/src/assets/framework/css/open-ostyle.css @@ -924,7 +924,7 @@ tr{ } .customtable tbody tr:hover td{ - background-color: #e6fbe0 !important; + background-color: #fafafa !important; } .shortnote{ diff --git a/rulemgt-frontend/src/index.html b/rulemgt-frontend/src/index.html index 5331b5e..8a8252a 100644 --- a/rulemgt-frontend/src/index.html +++ b/rulemgt-frontend/src/index.html @@ -17,10 +17,13 @@ - + + + diff --git a/rulemgt/src/main/java/org/onap/holmes/rulemgt/bean/request/RuleQueryCondition.java b/rulemgt/src/main/java/org/onap/holmes/rulemgt/bean/request/RuleQueryCondition.java index c6ba4b7..f4978ab 100644 --- a/rulemgt/src/main/java/org/onap/holmes/rulemgt/bean/request/RuleQueryCondition.java +++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/bean/request/RuleQueryCondition.java @@ -23,9 +23,9 @@ import lombok.Setter; @Setter public class RuleQueryCondition { - @SerializedName(value = "ruleid") + @SerializedName(value = "ruleId") private String rid; - @SerializedName(value = "rulename") + @SerializedName(value = "ruleName") private String name; private int enabled; private String creator; -- 2.16.6