bugfix - rule query failure with empty criteria

[holmes/rule-management.git] / rulemgt-frontend / src / app / correlation-ruleList / alarmRule.component.ts

diff --git a/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.ts b/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.ts
index cb413b5..05f36ca 100644 (file)
--- a/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.ts
+++ b/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.ts
@@ -13,12 +13,13 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 */
-import {Component, OnInit} from '@angular/core';
-import {ModalService} from '../correlation-modal/modal.service';
-import {RuleModel} from './alarmRule';
-import {RuleRequest} from './ruleRequest';
-import {Router} from '@angular/router';
-import {AlarmRuleService} from './alarmRule.service';
+import { Component, OnInit, ElementRef } from '@angular/core';
+import { ModalService } from '../correlation-modal/modal.service';
+import { RuleModel } from './alarmRule';
+import { RuleRequest } from './ruleRequest';
+import { Router } from '@angular/router';
+import { AlarmRuleService } from './alarmRule.service';
+import { Observable } from 'rxjs';
 
 @Component({
   selector: 'alarmRule',
@@ -41,7 +42,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, private ele: ElementRef) {
   }
 
   switch(select: string): void {
@@ -51,8 +52,7 @@ export class AlarmRule implements OnInit {
     } else if (select == "common_disabled") {
       this.ruleModel.enabled = 0;
     } else {
-
-      this.ruleModel.enabled = null;
+      this.ruleModel.enabled = 2;
     }
     this.setActiveText();
   }
@@ -115,7 +115,7 @@ export class AlarmRule implements OnInit {
   public reset(): void {
     this.ruleModel.ruleName = null;
     this.activeText = 'option_all';
-    this.ruleModel.enabled = null;
+    this.ruleModel.enabled = 2;
     this.getRules();
   }
 
@@ -143,7 +143,7 @@ export class AlarmRule implements OnInit {
       creator: null,
       updateTime: null,
       modifier: null,
-      enabled: 0,
+      enabled: 2,
       loopControlName: ''
     };
     this.ruleRequest = {
@@ -151,9 +151,16 @@ export class AlarmRule implements OnInit {
       ruleName: null,
       creator: null,
       modifier: null,
-      enabled: null,
+      enabled: 2,
       loopControlName: ''
     };
     this.getRules();
+
+    this.ele.nativeElement.querySelector('.container-fluid').style.height = window.innerHeight + 'px';
+    Observable.fromEvent(window, 'resize')
+      .debounceTime(100)
+      　　.subscribe(() => {
+        this.ele.nativeElement.querySelector('.container-fluid').style.height = window.innerHeight + 'px';
+      　　});
   }
 }