From 1e6e927eea306eda17e8966215d4f57566472bf2 Mon Sep 17 00:00:00 2001 From: YILI Date: Tue, 14 Mar 2017 09:51:58 +0800 Subject: Resolve the merge conflict read rule manager gui list,inclode query and table list Issue-ID:CLIENT-151 Change-Id: Ie5b932cef60f86e106e074565ab1a249ec0c5125 Signed-off-by: YILI --- .../src/main/webapp/alarm/app/app.module.ts | 8 +- .../alarm/app/correlation-modal/modal.component.ts | 28 +- .../alarm/app/correlation-modal/modal.service.ts | 10 +- .../main/webapp/alarm/app/correlation-modal/msg.ts | 8 +- .../correlation-ruleInfo/ruleInfo.component.html | 135 ++++--- .../app/correlation-ruleInfo/ruleInfo.component.ts | 437 +++++++++++---------- .../correlation-ruleList/alarmRule.component.html | 105 +++-- .../correlation-ruleList/alarmRule.component.ts | 202 +++++----- .../app/correlation-ruleList/alarmRule.service.ts | 186 +++++---- .../alarm/app/correlation-ruleList/alarmRule.ts | 18 +- .../alarm/app/correlation-ruleList/ruleRequest.ts | 12 +- alarm-analysis/src/main/webapp/alarm/index.html | 4 +- alarm-analysis/src/main/webapp/alarm/vendor.ts | 2 +- 13 files changed, 576 insertions(+), 579 deletions(-) (limited to 'alarm-analysis') diff --git a/alarm-analysis/src/main/webapp/alarm/app/app.module.ts b/alarm-analysis/src/main/webapp/alarm/app/app.module.ts index 5c1d6533..fd557717 100644 --- a/alarm-analysis/src/main/webapp/alarm/app/app.module.ts +++ b/alarm-analysis/src/main/webapp/alarm/app/app.module.ts @@ -25,7 +25,6 @@ import {HttpModule,Jsonp} from '@angular/http'; import {AlarmRuleService} from './correlation-ruleList/alarmRule.service'; import {TranslateModule} from "ng2-translate"; import {SifModalComponent} from './correlation-modal/modal.component' -import {TestBed,ComponentFixture} from '@angular/core/testing'; @NgModule({ imports: [ BrowserModule, @@ -39,12 +38,9 @@ import {TestBed,ComponentFixture} from '@angular/core/testing'; AppComponent, AlarmRule, RuleInfo, - SifModalComponent, - TestBed, - ComponentFixture + SifModalComponent ], providers:[ModalService,AlarmRuleService,Jsonp], bootstrap: [AppComponent] }) -export class AppModule { } - +export class AppModule { } \ No newline at end of file diff --git a/alarm-analysis/src/main/webapp/alarm/app/correlation-modal/modal.component.ts b/alarm-analysis/src/main/webapp/alarm/app/correlation-modal/modal.component.ts index e0e1f9cf..7afc5280 100644 --- a/alarm-analysis/src/main/webapp/alarm/app/correlation-modal/modal.component.ts +++ b/alarm-analysis/src/main/webapp/alarm/app/correlation-modal/modal.component.ts @@ -13,29 +13,29 @@ See the License for the specific language governing permissions and limitations under the License. */ -import {Component ,Input, OnInit} from '@angular/core'; -import {ModalService} from './modal.service'; -import {Msg} from './Msg'; -declare var $:any; +import { Component, Input, OnInit } from '@angular/core'; +import { ModalService } from './modal.service'; +import { Msg } from './Msg'; +declare var $: any; @Component({ selector: 'sif-modal', templateUrl: './modal.component.html', }) -export class SifModalComponent implements OnInit{ - constructor(private modalServer:ModalService){}; - modalTitle:string="modalTitleDefault"; - modalBodyMessage:string="modalBodyMessageDefault"; - closeBtnTitle:string="closeBtnTitleDefault"; +export class SifModalComponent implements OnInit { + constructor(private modalServer: ModalService) { }; + modalTitle: string = "modalTitleDefault"; + modalBodyMessage: string = "modalBodyMessageDefault"; + closeBtnTitle: string = "closeBtnTitleDefault"; ngOnInit(): void { console.log('init'); - this.modalServer.getmodalObservable.subscribe((msg:Msg)=>{ - console.log('receive '+msg); - this.modalTitle=msg.title||this.modalTitle; - this.modalBodyMessage=msg.message||this.modalBodyMessage; - this.closeBtnTitle=msg.btn||this.closeBtnTitle; + this.modalServer.getmodalObservable.subscribe((msg: Msg) => { + console.log('receive ' + msg); + this.modalTitle = msg.title || this.modalTitle; + this.modalBodyMessage = msg.message || this.modalBodyMessage; + this.closeBtnTitle = msg.btn || this.closeBtnTitle; $('#myModal').modal('show'); }); } diff --git a/alarm-analysis/src/main/webapp/alarm/app/correlation-modal/modal.service.ts b/alarm-analysis/src/main/webapp/alarm/app/correlation-modal/modal.service.ts index e792731e..0ff5b7ff 100644 --- a/alarm-analysis/src/main/webapp/alarm/app/correlation-modal/modal.service.ts +++ b/alarm-analysis/src/main/webapp/alarm/app/correlation-modal/modal.service.ts @@ -13,12 +13,12 @@ See the License for the specific language governing permissions and limitations under the License. */ -import { Subject } from 'rxjs/Subject'; -import { Injectable } from '@angular/core'; +import { Subject } from 'rxjs/Subject'; +import { Injectable } from '@angular/core'; @Injectable() -export class ModalService{ - private modalObservable=new Subject(); - get getmodalObservable(){ +export class ModalService { + private modalObservable = new Subject(); + get getmodalObservable() { return this.modalObservable; } } diff --git a/alarm-analysis/src/main/webapp/alarm/app/correlation-modal/msg.ts b/alarm-analysis/src/main/webapp/alarm/app/correlation-modal/msg.ts index b42904eb..46015ddf 100644 --- a/alarm-analysis/src/main/webapp/alarm/app/correlation-modal/msg.ts +++ b/alarm-analysis/src/main/webapp/alarm/app/correlation-modal/msg.ts @@ -13,8 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. */ -export interface Msg{ - title?:string; - message:string; - btn?:string; +export interface Msg { + title?: string; + message: string; + btn?: string; } \ No newline at end of file diff --git a/alarm-analysis/src/main/webapp/alarm/app/correlation-ruleInfo/ruleInfo.component.html b/alarm-analysis/src/main/webapp/alarm/app/correlation-ruleInfo/ruleInfo.component.html index 95585133..b294cd06 100644 --- a/alarm-analysis/src/main/webapp/alarm/app/correlation-ruleInfo/ruleInfo.component.html +++ b/alarm-analysis/src/main/webapp/alarm/app/correlation-ruleInfo/ruleInfo.component.html @@ -13,130 +13,131 @@ See the License for the specific language governing permissions and limitations under the License. --> -
-
+
+
- +
-
- -
-