import {AlarmRuleService} from './correlation-ruleList/alarmRule.service';\r
import {TranslateModule} from "ng2-translate";\r
import {SifModalComponent} from './correlation-modal/modal.component'\r
-import {TestBed,ComponentFixture} from '@angular/core/testing';\r
@NgModule({\r
imports: [\r
BrowserModule,\r
AppComponent,\r
AlarmRule,\r
RuleInfo,\r
- SifModalComponent,\r
- TestBed,\r
- ComponentFixture\r
+ SifModalComponent\r
],\r
providers:[ModalService,AlarmRuleService,Jsonp],\r
bootstrap: [AppComponent]\r
})\r
-export class AppModule { }\r
-\r
+export class AppModule { }
\ No newline at end of file
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');
});
}
See the License for the specific language governing permissions and\r
limitations under the License.\r
*/\r
-import { Subject } from 'rxjs/Subject';\r
-import { Injectable } from '@angular/core';\r
+import { Subject } from 'rxjs/Subject';\r
+import { Injectable } from '@angular/core';\r
@Injectable()\r
-export class ModalService{\r
- private modalObservable=new Subject();\r
- get getmodalObservable(){\r
+export class ModalService {\r
+ private modalObservable = new Subject();\r
+ get getmodalObservable() {\r
return this.modalObservable;\r
}\r
}\r
See the License for the specific language governing permissions and\r
limitations under the License.\r
*/\r
-export interface Msg{\r
- title?:string;\r
- message:string;\r
- btn?:string;\r
+export interface Msg {\r
+ title?: string;\r
+ message: string;\r
+ btn?: string;\r
}
\ No newline at end of file
See the License for the specific language governing permissions and\r
limitations under the License.\r
-->\r
-<div class="container" style="margin-top: 20px">\r
- <form #ruleForm = "ngForm" class="form-group row" (submit)="onSubmit(ruleName)">\r
+<div class="container" style="margin-top: 20px">\r
+ <form #ruleForm="ngForm" class="form-group row" (submit)="onSubmit(ruleName)">\r
<div class="form-body">\r
- \r
+\r
<div class="row form-group col-xs-12 ">\r
- <label for="userName" class="col-xs-2 col-form-label labelstyle">\r
+ <label for="userName" class="col-xs-2 col-form-label labelstyle">\r
<span>{{"field_rule_name"|translate}}</span>\r
<span style="color: red">*</span>\r
</label>\r
-
<div class="col-xs-6" style="margin-left: -100px">
\r- <input class="form-control ng-pristine ng-untouched ng-invalid ng-invalid-required" \r
- style="width: 60%" type="text" name="rulename" [(ngModel)]="queryRule.rulename" \r
- id="ruleNameInput" readonly="{{addBottonStatus}}" #ruleName="ngModel" required>\r
- </div>\r
+ <div class="col-xs-6" style="margin-left: -100px">\r
+ <input class="form-control ng-pristine ng-untouched ng-invalid ng-invalid-required" style="width: 60%" type="text" name="rulename"\r
+ [(ngModel)]="queryRule.rulename" id="ruleNameInput" readonly="{{addBottonStatus}}" #ruleName="ngModel"\r
+ required>\r
+ </div>\r
</div>\r
- \r
-
<div class="row form-group col-xs-12">
\r- <label for="userName" class="col-xs-2 col-form-label labelstyle">\r
+\r
+ <div class="row form-group col-xs-12">\r
+ <label for="userName" class="col-xs-2 col-form-label labelstyle">\r
<span>{{"field_description"|translate}}</span>\r
</label>\r
<div class="col-xs-6" style="margin-left: -100px">\r
- <input class="form-control ng-untouched ng-pristine ng-valid" readonly="{{addBottonStatus}}"\r
- style="width: 60%" type="text" [(ngModel)]="queryRule.description" name="description" >\r
+ <input class="form-control ng-untouched ng-pristine ng-valid" readonly="{{addBottonStatus}}" style="width: 60%" type="text"\r
+ [(ngModel)]="queryRule.description" name="description">\r
</div>\r
</div>\r
\r
<div id="state" class="row form-group col-xs-12">\r
- <label class="col-xs-2 col-form-label labelstyle">\r
+ <label class="col-xs-2 col-form-label labelstyle">\r
<span>{{"common_status"|translate}}</span>\r
</label>\r
\r
<div class="col-xs-6" style="margin-left: -113px">\r
- <div *ngIf="queryRule.enabled == 1">\r
- <div class="col-xs-3">\r
- <input class="magic-radio" type="radio" name="enabled" id="radio3" [(ngModel)]="queryRule.enabled" value="0">\r
- <label for="radio1">{{"common_on"|translate}}</label>\r
+ <div *ngIf="queryRule.enabled == 0">\r
+ <div class="col-xs-3" >\r
+ <input class="magic-radio" type="radio" name="radio" [(ngModel)]="queryRule.enabled" value='0'>\r
+ <label for="radio1" >{{"common_off"|translate}}</label>\r
</div>\r
- <div class="col-xs-3">\r
- <input class="magic-radio" type="radio" name="enabled" id="radio4" [(ngModel)]="queryRule.enabled" value="1">\r
- <label for="radio2">{{"common_off"|translate}}</label>\r
+ <div class="col-xs-3" >\r
+ <input class="magic-radio" type="radio" name="radio" [(ngModel)]="queryRule.enabled" value='1'>\r
+ <label for="radio1" (click)="switch()">{{"common_on"|translate}}</label>\r
</div>\r
</div>\r
- <div *ngIf="queryRule.enabled == 0">\r
- <div class="col-xs-3">\r
- <input class="magic-radio" type="radio" name="enabled" id="radio1" [(ngModel)]="queryRule.enabled" value="0">\r
- <label for="radio1">{{"common_on"|translate}}</label>\r
+ <div *ngIf="queryRule.enabled == 1">\r
+ <div class="col-xs-3" >\r
+ <input class="magic-radio" type="radio" name="radio" [(ngModel)]="queryRule.enabled" value='0'>\r
+ <label for="radio1" (click)="switch()">{{"common_off"|translate}}</label>\r
</div>\r
- <div class="col-xs-3">\r
- <input class="magic-radio" type="radio" name="enabled" id="radio2" [(ngModel)]="queryRule.enabled" value="1">\r
- <label for="radio2">{{"common_off"|translate}}</label>\r
+ <div class="col-xs-3" >\r
+ <input class="magic-radio" type="radio" name="radio" [(ngModel)]="queryRule.enabled" value='1'>\r
+ <label for="radio1" >{{"common_on"|translate}}</label>\r
</div>\r
</div>\r
- \r
+ \r
+ \r
+\r
</div>\r
\r
</div>\r
- \r
- <div class="row form-group col-xs-12" >\r
- <label for="" class="col-xs-2 col-form-label labelstyle">\r
+\r
+ <div class="row form-group col-xs-12">\r
+ <label for="" class="col-xs-2 col-form-label labelstyle">\r
<span>{{"common_file"|translate}}</span>\r
</label>\r
<div class="col-xs-6" style="margin-left: -100px">\r
<div class="btn-group btn-group-circle">\r
- <span class="importDivArea mmlBatchBtnBar" >\r
+ <span class="importDivArea mmlBatchBtnBar">\r
<button class="btn btn-info" id="importBtn" disabled="{{addBottonStatus}}">\r
<span class="ict-import"></span>\r
- <span>{{"import"|translate}}</span>\r
- </button>\r
- <div id="importDiv" class="container upload">\r
- <form id="fileupload" #fileForm="ngForm" role="form" enctype="multipart/form-data" >\r
- <div class="file-preview">\r
- <div id="dropzone" class="file-drop-zone">\r
- <div class="file-drop-zone-title">\r
- <span >{{"file_import"|translate}}</span>\r
- </div>\r
+ <span>{{"import"|translate}}</span>\r
+ </button>\r
+ <div id="importDiv" class="container upload">\r
+ <form id="fileupload" #fileForm="ngForm" role="form" enctype="multipart/form-data">\r
+ <div class="file-preview">\r
+ <div id="dropzone" class="file-drop-zone">\r
+ <div class="file-drop-zone-title">\r
+ <span>{{"file_import"|translate}}</span>\r
</div>\r
</div>\r
+ </div>\r
\r
-
<div class="input-group fileupload-btn">
\r-
<div id="fileName" class="form-control file-caption">task2.zip</div>
\r- <span class="input-group-btn" id="btnGroup">\r
+ <div class="input-group fileupload-btn">\r
+ <div id="fileName" class="form-control file-caption">task2.zip</div>\r
+ <span class="input-group-btn" id="btnGroup">\r
<span class="btn btn-primary fileinput-button white radius_s blue1-active" id="browse" data-placement="bottom" data-toggle="tooltip">\r
<span class="importBtnFontSize">{{"common_browse"|translate}}</span>\r
- <input type="file" name="file" title=" " accept=".txt" multiple="">\r
- </span>\r
- <button id="fileremove" class="btn btn-default" type="button">\r
+ <input type="file" name="file" title=" " accept=".txt" multiple="">\r
+ </span>\r
+ <button id="fileremove" class="btn btn-default" type="button">\r
<span class="importBtnFontSize">{{"common_remove"|translate}}</span>\r
</button>\r
- <button id="filesubmit" class="btn btn-default" type="button">{{"common_confirm"|translate}}</button>\r
- </span>\r
- </div>\r
- \r
- </form>\r
- </div>\r
+ <button id="filesubmit" class="btn btn-default" type="button">{{"common_confirm"|translate}}</button>\r
+ </span>\r
+ </div>\r
+\r
+ </form>\r
+ </div>\r
</span>\r
</div>\r
</div>\r
</div>\r
\r
- <div class="row form-group col-xs-12" >\r
- <label for="" class="col-xs-2 col-form-label labelstyle">\r
+ <div class="row form-group col-xs-12">\r
+ <label for="" class="col-xs-2 col-form-label labelstyle">\r
<span>{{"message_rule_content"|translate}}</span>\r
<span style="color: red">*</span>\r
</label>\r
<div class="col-xs-8" style="margin-left: -100px">\r
<div class="form-group">\r
- <textarea id="cmds" class="form-control" readonly="{{addBottonStatus}}" [(ngModel)]="queryRule.content" \r
- name="content" rows="12" cols="80" required\r
- placeholder="package example">\r
+ <textarea id="cmds" class="form-control" readonly="{{addBottonStatus}}" [(ngModel)]="queryRule.content" name="content" rows="12"\r
+ cols="80" required placeholder="package example">\r
</textarea>\r
- \r
+\r
</div>\r
</div>\r
</div>\r
- \r
+\r
<div class="row form-group col-xs-12 " style="margin-left: 73px">\r
<div class="col-xs-8 ">\r
- <label class="myclass" id="checkLabel">\r
+ <label class="myclass" id="checkLabel">\r
<button type="button" (click)="checkContent('check')" disabled="{{addBottonStatus}}" class="btn btn-info">{{"common_check"|translate}}</button>\r
</label>\r
<label class="myclass" id="updateLabel">\r
<button type="button" disabled="{{addBottonStatus}}" class="btn btn-info" (click)="update()">{{"common_update"|translate}}</button>\r
</label>\r
- <label class="myclass" id="saveLabel">\r
+ <label class="myclass" id="saveLabel">\r
<button type="submit" disabled="{{addBottonStatus}}" class="btn btn-info">{{"common_save"|translate}}</button>\r
</label>\r
<label class="myclass" id="cancelLabel">\r
</div>\r
</div>\r
</form>\r
-</div>\r
-\r
-\r
-\r
-
\ No newline at end of file
+</div>
\ No newline at end of file
See the License for the specific language governing permissions and\r
limitations under the License.\r
*/\r
-import { Component,OnInit ,Input} from '@angular/core';\r
-import {RuleModel} from '../correlation-ruleList/alarmRule';\r
-import { ActivatedRoute, Params ,Router} from '@angular/router';\r
-import {AlarmRuleService} from '../correlation-ruleList/alarmRule.service';\r
-import {Http,Response,Headers} from '@angular/http';\r
-import {ModalService} from '../correlation-modal/modal.service';\r
-import {NgModel} from '@angular/forms';\r
+import { Component, OnInit, Input } from '@angular/core';\r
+import { RuleModel } from '../correlation-ruleList/alarmRule';\r
+import { ActivatedRoute, Params, Router } from '@angular/router';\r
+import { AlarmRuleService } from '../correlation-ruleList/alarmRule.service';\r
+import { Http, Response, Headers } from '@angular/http';\r
+import { ModalService } from '../correlation-modal/modal.service';\r
+import { NgModel } from '@angular/forms';\r
declare var $: any;\r
@Component({\r
- selector:'RuleInfo',\r
- templateUrl:'./ruleInfo.component.html'\r
+ selector: 'RuleInfo',\r
+ templateUrl: './ruleInfo.component.html'\r
})\r
-export class RuleInfo implements OnInit{\r
- formModel:RuleModel;\r
- queryRule:RuleModel;\r
- id:number;\r
- addBottonStatus:boolean;\r
- constructor(private _ModalService:ModalService, private route: ActivatedRoute,private router:Router,private alarmRuleService:AlarmRuleService,http:Http){};\r
- \r
- update(){\r
- this.queryRule.enabled = $('input:radio:checked').val();\r
- if(!this.queryRule.content.startsWith("package ")){\r
- let msg={title:"exception_content_error",message:"exception_package_error"};\r
- this._ModalService.getmodalObservable.next(msg);\r
- }else{\r
+export class RuleInfo implements OnInit {\r
+ formModel: RuleModel;\r
+ queryRule: RuleModel;\r
+ id: number;\r
+ addBottonStatus: boolean;\r
+ constructor(private modalService: ModalService, private route: ActivatedRoute, private router: Router, private alarmRuleService: AlarmRuleService, http: Http) { };\r
\r
- this.alarmRuleService.checkContent(this.queryRule.content)\r
- .then(res => {\r
- if(res.status == 200){\r
- this.alarmRuleService.updateRule(this.queryRule)\r
- .then(res =>{\r
- if(res.status == 200){\r
- let msg={title:"modalTitleUpdate",message:"message_update_rule_success"};\r
- this._ModalService.getmodalObservable.next(msg);\r
- this.router.navigate(['alarmRule']);\r
- }else if(res.status == 499){\r
- let msg={title:"modalTitleUpdate",message:"message_exception_rule_fail"};\r
- this._ModalService.getmodalObservable.next(msg);\r
- }else{\r
- let msg={title:"modalTitleUpdate",message:"message_other_exception_rule_fail"};\r
- this._ModalService.getmodalObservable.next(msg);\r
- }\r
- }).catch(\r
- res =>{\r
- let msg={title:"modalTitleUpdate",message:"message_other_exception_rule_fail"};\r
- this._ModalService.getmodalObservable.next(msg);\r
- }\r
- );\r
- \r
- }else if(res.status == 499){\r
- let msg={"title":"modalTitleCheck",message:"message_rule_content_repeat_error"};\r
- this._ModalService.getmodalObservable.next(msg);\r
- return false;\r
- }else{\r
- let msg={"title":"modalTitleCheck",message:"message_other_exception_rule_fail"};\r
- this._ModalService.getmodalObservable.next(msg);\r
- return false;\r
- }\r
- })\r
- }\r
- }\r
- \r
- onSubmit(obj:NgModel){\r
- this.save();\r
- }\r
+ update() {\r
+ this.queryRule.enabled = $('input:radio:checked').val();\r
+ if (!this.queryRule.content.startsWith("package ")) {\r
+ let msg = { title: "exception_content_error", message: "exception_package_error" };\r
+ this.modalService.getmodalObservable.next(msg);\r
+ } else {\r
\r
- save(){\r
- if(!this.queryRule.content.startsWith("package ")){\r
- let msg={title:"exception_content_error",message:"exception_package_error"};\r
- this._ModalService.getmodalObservable.next(msg);\r
- }else{\r
- this.alarmRuleService.checkContent(this.queryRule.content).then(res => {\r
- if(res.status == 200){\r
- this.alarmRuleService.save(this.queryRule).then(res => {\r
- if(res.status == 200){\r
- let msg={title:"modalTitleDefault",message:"message_add_rule_success"};\r
- this._ModalService.getmodalObservable.next(msg);\r
- this.router.navigate(['alarmRule']);\r
- }else if(res.status == 499){\r
- let msg={title:"modalTitleDefault",message:"message_rule_name_repeat_error"};\r
- this._ModalService.getmodalObservable.next(msg);\r
- }else{\r
- let msg={"title":"modalTitleCheck",message:"message_other_exception_rule_fail"};\r
- this._ModalService.getmodalObservable.next(msg);\r
+ this.alarmRuleService.checkContent(this.queryRule.content)\r
+ .then(res => {\r
+ if (res.status == 200) {\r
+ this.alarmRuleService.updateRule(this.queryRule)\r
+ .then(res => {\r
+ if (res.status == 200) {\r
+ let msg = { title: "modalTitleUpdate", message: "message_update_rule_success" };\r
+ this.modalService.getmodalObservable.next(msg);\r
+ this.router.navigate(['alarmRule']);\r
+ } else if (res.status == 499) {\r
+ let msg = { title: "modalTitleUpdate", message: "message_exception_rule_fail" };\r
+ this.modalService.getmodalObservable.next(msg);\r
+ } else {\r
+ let msg = { title: "modalTitleUpdate", message: "message_other_exception_rule_fail" };\r
+ this.modalService.getmodalObservable.next(msg);\r
+ }\r
+ }).catch(\r
+ res => {\r
+ let msg = { title: "modalTitleUpdate", message: "message_other_exception_rule_fail" };\r
+ this.modalService.getmodalObservable.next(msg);\r
}\r
- \r
- }).catch(error =>{\r
- let msg={title:"modalTitleDefault",message:"message_rule_name_repeat_error"};\r
- this._ModalService.getmodalObservable.next(msg);\r
- });\r
- return true;\r
- }else if(res.status == 499){\r
- let msg={"title":"modalTitleCheck",message:"message_rule_content_repeat_error"};\r
- this._ModalService.getmodalObservable.next(msg);\r
+ );\r
+\r
+ } else if (res.status == 499) {\r
+ let msg = { "title": "modalTitleCheck", message: "message_rule_content_repeat_error" };\r
+ this.modalService.getmodalObservable.next(msg);\r
return false;\r
- }else{\r
- let msg={"title":"modalTitleCheck",message:"message_other_exception_rule_fail"};\r
- this._ModalService.getmodalObservable.next(msg);\r
+ } else {\r
+ let msg = { "title": "modalTitleCheck", message: "message_other_exception_rule_fail" };\r
+ this.modalService.getmodalObservable.next(msg);\r
return false;\r
}\r
})\r
- }\r
- }\r
- \r
- getRuleInfo(id:string):void{\r
- this.route.params.switchMap((params:Params) =>this.alarmRuleService.search(id))\r
- .subscribe(rule =>{\r
- rule[0].enabled = ""+rule[0].enabled;\r
+ }\r
+ }\r
+\r
+ onSubmit(obj: NgModel) {\r
+ this.save();\r
+ }\r
+\r
+ save() {\r
+ if (!this.queryRule.content.startsWith("package ")) {\r
+ let msg = { title: "exception_content_error", message: "exception_package_error" };\r
+ this.modalService.getmodalObservable.next(msg);\r
+ } else {\r
+ this.alarmRuleService.checkContent(this.queryRule.content).then(res => {\r
+ if (res.status == 200) {\r
+ this.alarmRuleService.save(this.queryRule).then(res => {\r
+ if (res.status == 200) {\r
+ let msg = { title: "modalTitleDefault", message: "message_add_rule_success" };\r
+ this.modalService.getmodalObservable.next(msg);\r
+ this.router.navigate(['alarmRule']);\r
+ } else if (res.status == 499) {\r
+ let msg = { title: "modalTitleDefault", message: "message_rule_name_repeat_error" };\r
+ this.modalService.getmodalObservable.next(msg);\r
+ } else {\r
+ let msg = { "title": "modalTitleCheck", message: "message_other_exception_rule_fail" };\r
+ this.modalService.getmodalObservable.next(msg);\r
+ }\r
+\r
+ }).catch(error => {\r
+ let msg = { title: "modalTitleDefault", message: "message_rule_name_repeat_error" };\r
+ this.modalService.getmodalObservable.next(msg);\r
+ });\r
+ return true;\r
+ } else if (res.status == 499) {\r
+ let msg = { "title": "modalTitleCheck", message: "message_rule_content_repeat_error" };\r
+ this.modalService.getmodalObservable.next(msg);\r
+ return false;\r
+ } else {\r
+ let msg = { "title": "modalTitleCheck", message: "message_other_exception_rule_fail" };\r
+ this.modalService.getmodalObservable.next(msg);\r
+ return false;\r
+ }\r
+ })\r
+ }\r
+ }\r
+\r
+ getRuleInfo(id: string): void {\r
+ this.route.params.switchMap((params: Params) => this.alarmRuleService.search(id))\r
+ .subscribe(rule => {\r
+ rule[0].enabled = "" + rule[0].enabled;\r
this.queryRule = rule[0]\r
- })\r
+ })\r
}\r
\r
- checkContent(judge:string):void{\r
- if(!this.queryRule.content.startsWith("package ")){\r
- let msg={title:"exception_content_error",message:"exception_package_error"};\r
- this._ModalService.getmodalObservable.next(msg);\r
- }else{\r
+ checkContent(judge: string): void {\r
+ if (!this.queryRule.content.startsWith("package ")) {\r
+ let msg = { title: "exception_content_error", message: "exception_package_error" };\r
+ this.modalService.getmodalObservable.next(msg);\r
+ } else {\r
this.alarmRuleService.checkContent(this.queryRule.content)\r
- .then(res => {\r
- if(res.status == 200){\r
- let msg={"title":"modalTitleCheck",message:"message_checkContent_rule_success"};\r
- this._ModalService.getmodalObservable.next(msg);\r
- }else if(res.status == 499){\r
- let msg={"title":"modalTitleCheck",message:"message_rule_content_repeat_error"};\r
- this._ModalService.getmodalObservable.next(msg);\r
- return false;\r
- }else{\r
- let msg={"title":"modalTitleCheck",message:"message_other_exception_rule_fail"};\r
- this._ModalService.getmodalObservable.next(msg);\r
- return false;\r
- }\r
- });\r
- }\r
+ .then(res => {\r
+ if (res.status == 200) {\r
+ let msg = { "title": "modalTitleCheck", message: "message_checkContent_rule_success" };\r
+ this.modalService.getmodalObservable.next(msg);\r
+ } else if (res.status == 499) {\r
+ let msg = { "title": "modalTitleCheck", message: "message_rule_content_repeat_error" };\r
+ this.modalService.getmodalObservable.next(msg);\r
+ return false;\r
+ } else {\r
+ let msg = { "title": "modalTitleCheck", message: "message_other_exception_rule_fail" };\r
+ this.modalService.getmodalObservable.next(msg);\r
+ return false;\r
+ }\r
+ });\r
+ }\r
+ }\r
+ switch(): void {\r
+ // alert(this.queryRule.enabled);\r
+ this.queryRule.enabled == '0' ? this.queryRule.enabled = '1' : this.queryRule.enabled = '0';\r
}\r
\r
- initUpload(queryRule:RuleModel):void{\r
+\r
+ initUpload(queryRule: RuleModel): void {\r
$("#fileName").text("");\r
$("#importFailTip").addClass("hide_panel");\r
$("#fileupload").fileupload({\r
- \r
- dropZone: $('#dropzone'),\r
- maxNumberOfFiles: 1,\r
- maxChunkSize: 20000000, \r
- autoUpload: false,\r
- add: function (e, data) {\r
- var fileName = data.files[0].name;\r
- \r
- $("#importFailTip").addClass("hide_panel");\r
- let suffix = fileName.substring(fileName.lastIndexOf("."),fileName.length)\r
- \r
- if (suffix != ".txt") {\r
- $("#importFailTip").removeClass("hide_panel");\r
- return suffix;\r
- }\r
- \r
- $("#bar").css('width', '0%');\r
- $("#persent").text('0%');\r
- $("#fileName").text(fileName);\r
- $("#fileremove").attr("disabled", false);\r
- $("#filesubmit").attr("disabled", false);\r
- $("#filesubmit").click(function () {\r
- this.file = data.files[0]\r
- var reader = new FileReader();\r
- reader.readAsText(this.file);\r
- reader.onload = function (data) {\r
- queryRule.content = this.result;\r
+\r
+ dropZone: $('#dropzone'),\r
+ maxNumberOfFiles: 1,\r
+ maxChunkSize: 20000000,\r
+ autoUpload: false,\r
+ add: function (e, data) {\r
+ var fileName = data.files[0].name;\r
+\r
+ $("#importFailTip").addClass("hide_panel");\r
+ let suffix = fileName.substring(fileName.lastIndexOf("."), fileName.length)\r
+\r
+ if (suffix != ".txt") {\r
+ $("#importFailTip").removeClass("hide_panel");\r
+ return suffix;\r
}\r
- $("#fileremove").click();\r
- $("#importDiv").hide();\r
- e.stopPropagation();\r
- });\r
\r
- $("#fileremove").click(function () {\r
$("#bar").css('width', '0%');\r
- $("#persent").text("0%");\r
- $("#fileName").text("");\r
- $("#filesubmit").attr("disabled", true);\r
- $("#fileremove").attr("disabled", true);\r
- });\r
- },\r
- done: function (e, data) {\r
+ $("#persent").text('0%');\r
+ $("#fileName").text(fileName);\r
+ $("#fileremove").attr("disabled", false);\r
+ $("#filesubmit").attr("disabled", false);\r
+ $("#filesubmit").click(function () {\r
+ this.file = data.files[0]\r
+ var reader = new FileReader();\r
+ reader.readAsText(this.file);\r
+ reader.onload = function (data) {\r
+ queryRule.content = this.result;\r
+ }\r
+ $("#fileremove").click();\r
+ $("#importDiv").hide();\r
+ e.stopPropagation();\r
+ });\r
\r
- },\r
- fail: function (e, resp) {\r
- },\r
- always: function (e, data) {\r
- $(".progress").removeClass("active");\r
- $("#bar").css('width', '100%');\r
- $("#persent").text('100%');\r
- },\r
- progressall: function (e, data) {\r
- }\r
- });\r
+ $("#fileremove").click(function () {\r
+ $("#bar").css('width', '0%');\r
+ $("#persent").text("0%");\r
+ $("#fileName").text("");\r
+ $("#filesubmit").attr("disabled", true);\r
+ $("#fileremove").attr("disabled", true);\r
+ });\r
+ },\r
+ done: function (e, data) {\r
+\r
+ },\r
+ fail: function (e, resp) {\r
+ },\r
+ always: function (e, data) {\r
+ $(".progress").removeClass("active");\r
+ $("#bar").css('width', '100%');\r
+ $("#persent").text('100%');\r
+ },\r
+ progressall: function (e, data) {\r
+ }\r
+ });\r
}\r
\r
- initImportDiv(queryRule:RuleModel):void{\r
+ initImportDiv(queryRule: RuleModel): void {\r
this.initUpload(queryRule);\r
var importDiv = $("#importDiv");\r
$(function (arg) {\r
$("#importBtn").click(function (e) {\r
- e.preventDefault();\r
- $("[data-toggle='tooltip']").tooltip();\r
- $("#importFailTip").addClass("hide_panel");\r
- showDiv();\r
- $(document).one("click", function (e) {\r
- $(importDiv).hide();\r
- });\r
- e.stopPropagation();\r
+ e.preventDefault();\r
+ $("[data-toggle='tooltip']").tooltip();\r
+ $("#importFailTip").addClass("hide_panel");\r
+ showDiv();\r
+ $(document).one("click", function (e) {\r
+ $(importDiv).hide();\r
+ });\r
+ e.stopPropagation();\r
});\r
$(importDiv).click(function (e) {\r
e.stopPropagation();\r
});\r
$("#filesubmit").attr("disabled", true);\r
$("#fileremove").attr("disabled", true);\r
- });\r
+ });\r
function showDiv() {\r
$("#bar").css('width', '0%');\r
$("#persent").text('0%');\r
$(importDiv).fadeIn();\r
}\r
}\r
- ngOnInit(){\r
- this.formModel={\r
- ruleid:null,\r
- rulename:null,\r
- description:null,\r
- content:null,\r
- createtime:null,\r
- creator:null,\r
- updatetime:null,\r
- modifier:null,\r
- enabled:null,\r
+ ngOnInit() {\r
+ this.formModel = {\r
+ ruleid: null,\r
+ rulename: null,\r
+ description: null,\r
+ content: null,\r
+ createtime: null,\r
+ creator: null,\r
+ updatetime: null,\r
+ modifier: null,\r
+ enabled: null,\r
}\r
- this.queryRule={\r
- ruleid:null,\r
- rulename:null,\r
- description:null,\r
- content:null,\r
- createtime:null,\r
- creator:null,\r
- updatetime:null,\r
- modifier:null,\r
- enabled:0,\r
+ this.queryRule = {\r
+ ruleid: null,\r
+ rulename: null,\r
+ description: null,\r
+ content: null,\r
+ createtime: null,\r
+ creator: null,\r
+ updatetime: null,\r
+ modifier: null,\r
+ enabled: 0,\r
}\r
- \r
+\r
this.route.params.subscribe((params) => {\r
- \r
+\r
let id = params['id'];\r
- if(typeof(id) == "string"){\r
- if(id.indexOf('&') == -1){\r
- $("#ruleNameInput").attr("disabled",true);\r
+ if (typeof (id) == "string") {\r
+ if (id.indexOf('&') == -1) {\r
+ $("#ruleNameInput").attr("disabled", true);\r
$("#saveLabel").hide();\r
- }else{\r
- this.addBottonStatus=false;\r
+ } else {\r
+ this.addBottonStatus = false;\r
$("#saveLabel").hide();\r
$("#checkLabel").hide();\r
$("#updateLabel").hide();\r
}\r
- \r
+\r
let str = id.split("&");\r
this.getRuleInfo(str[0]);\r
- }else if(typeof(id) != "undefined"){\r
+ } else if (typeof (id) != "undefined") {\r
this.getRuleInfo(id);\r
- }else{\r
- $("#updateLabel").hide();\r
+ } else {\r
+ $("#updateLabel").hide();\r
}\r
- if(typeof(this.queryRule.enabled) === "number"){\r
- this.queryRule.enabled = ""+this.queryRule.enabled;\r
+ if (typeof (this.queryRule.enabled) === "number") {\r
+ this.queryRule.enabled = "" + this.queryRule.enabled;\r
}\r
})\r
\r
this.initImportDiv(this.queryRule);\r
- }\r
- \r
+ }\r
+\r
}
\ No newline at end of file
limitations under the License.\r
-->\r
<div class="container" style="margin-top: 20px">\r
- <form class="form-inline" >\r
+ <form class="form-inline">\r
<div class="form-body">\r
<div class="row form-group col-xs-12">\r
<div class="col-xs-4">\r
- <label class="col-xs-3 control-label myclass" >\r
+ <label class="col-xs-3 control-label" style="padding-top: 8px">\r
{{"common_status"|translate}}\r
</label>\r
- <select #selection class="form-control" style="width: 60%" id="status" (change)="switch(selection.value)" [(ngModel)]="activeText" name="activestatus">\r
+ <select #selection class="form-control" style="width: 60%" id="status" (change)="switch(selection.value)" [(ngModel)]="activeText"\r
+ name="activestatus">\r
<option *ngFor="let a of activeStatus" [value]="a">{{a|translate}}</option>\r
</select>\r
</div>\r
\r
<div class="col-xs-4">\r
- <label for="userName" class="col-xs-3 control-label myclass">\r
+ <label for="userName" class="col-xs-3 control-label" style="padding-top: 8px">\r
<span>{{"common_keyword"|translate}}</span>\r
</label>\r
- <input class="form-control ng-untouched ng-pristine ng-valid" style="width: 60%" placeholder='{{"field_rule_name"|translate}}'\r
- type="text" [(ngModel)]="ruleModel.rulename" name="name">\r
+ <input class="form-control ng-untouched ng-pristine ng-valid" style="width: 60%" placeholder='{{"field_rule_name"|translate}}'\r
+ type="text" [(ngModel)]="ruleModel.rulename" name="name">\r
</div>\r
\r
<div class="fmrule_btn_group display_table">\r
<div class="inline">\r
<button id="batchDeleteButton" class="btn btn-primary" (click)="searchRules()">\r
+ <span class="glyphicon glyphicon-search" style="padding-top: 2px"></span>\r
<span>{{"common_query"|translate}}</span>\r
- <span class="glyphicon glyphicon-search pull-right" style="padding-left: 10px"></span>\r
</button>\r
<button class="btn btn-secondary" (click)="reset()" style="margin-left: 10px">\r
<span class="glyphicon glyphicon-refresh"></span>\r
</div>\r
</div>\r
\r
- <div class="row form-group col-xs-12" style="margin-top: 10px">\r
- <div class="">\r
- <div class="inline">\r
- <button type="button" routerLink='/ruleInfo' class="btn btn-info">\r
+
<div class="row form-group col-xs-12" style="margin-top: 10px">
\r+ <button type="button" routerLink='/ruleInfo' class="btn btn-info">\r
<span class="glyphicon glyphicon-plus"></span>\r
<span>{{"common_add"|translate}}</span>\r
</button>\r
+ </div>\r
</div>\r
</div>\r
</div>\r
- </div>\r
- \r
+\r
</form>\r
-<div>\r
- <div class="row form-group col-xs-12 myclass">{{"common_total1"|translate}}{{totalcount}}{{"common_total2"|translate}}</div>\r
- <table class="table table-bordered table-striped customtable table-hover" >\r
- <thead class="nf_thead">\r
- <tr class="heading">\r
- <td>{{"field_rule_name"|translate}}</td>\r
- <td>{{"common_status"|translate}}</td>\r
- <td>{{"field_create_time"|translate}}</td>\r
- <td>{{"field_creator"|translate}}</td>\r
- <td>{{"field_update_time"|translate}}</td>\r
- <td>{{"common_operator"|translate}}</td>\r
- </tr>\r
- </thead>\r
- <tbody>\r
- <tr *ngFor="let rule of rules">\r
- <td><a routerLink="/ruleInfo/{{rule.ruleid}}&add">{{rule.rulename}}</a></td>\r
-
<td [hidden]="rule.enabled === 0" style="text-align: center"><span value=0><img src="../../../public/thirdparty/images/round_off.png" alt=""></span></td>
\r-
<td [hidden]="rule.enabled === 1" style="text-align: center"><span value=1><img src="../../../public/thirdparty/images/round_on.png" alt=""></span></td>
\r- <td>{{rule.createtime | date:'yyyy-MM-dd HH:mm:ss'}}</td>\r
- <td>{{rule.creator}}</td>\r
- <td>{{rule.updatetime | date:'yyyy-MM-dd HH:mm:ss'}}</td>\r
- <td>\r
- <span (click)="updateRule(rule); $event.stopPropagation()" style="cursor: pointer;margin: 0 5px">\r
+ <div class="row form-group col-xs-12" style="margin-top: 20px">{{"common_total1"|translate}}{{totalcount}}{{"common_total2"|translate}}</div>\r
+ <table class="table table-bordered table-striped customtable table-hover">\r
+ <thead class="nf_thead">\r
+ <tr class="heading">\r
+ <td>{{"field_rule_name"|translate}}</td>\r
+ <td>{{"common_status"|translate}}</td>\r
+ <td>{{"field_create_time"|translate}}</td>\r
+ <td>{{"field_creator"|translate}}</td>\r
+ <td>{{"field_update_time"|translate}}</td>\r
+ <td>{{"common_operator"|translate}}</td>\r
+ </tr>\r
+ </thead>\r
+ <tbody>\r
+ <tr *ngFor="let rule of rules">\r
+
<td><a routerLink="/ruleInfo/{{rule.ruleid}}&add">{{rule.rulename}}</a></td>
\r+
<td [hidden]="rule.enabled === 1" style="text-align: center"><span value=1><img src="../../../public/thirdparty/images/round_off.png" alt=""></span></td>
\r+
<td [hidden]="rule.enabled === 0" style="text-align: center"><span value=0><img src="../../../public/thirdparty/images/round_on.png" alt=""></span></td>
\r+ <td>{{rule.createtime | date:'yyyy-MM-dd HH:mm:ss'}}</td>\r
+ <td>{{rule.creator}}</td>\r
+ <td>{{rule.updatetime | date:'yyyy-MM-dd HH:mm:ss'}}</td>\r
+ <td>\r
+ <span (click)="updateRule(rule); $event.stopPropagation()" style="cursor: pointer;margin: 0 5px">\r
<img src="../../../public/thirdparty/images/edit.png" alt="">\r
</span>\r
- <span>\r
+ <span>\r
\r
</span>\r
- <span [hidden]="rule.enabled===0" class="" (click)="on_off(rule); $event.stopPropagation()">\r
- <img src="../../../public/thirdparty/images/off.png" alt="">\r
- </span>\r
- <span [hidden]="rule.enabled===1" class="" (click)="on_off(rule); $event.stopPropagation()">\r
+ <span [hidden]="rule.enabled===1" class="" (click)="on_off(rule); $event.stopPropagation()" style="cursor: pointer;margin: 0 5px"> \r
<img src="../../../public/thirdparty/images/on.png" alt="">\r
</span>\r
- \r
- <span class="" id={{rule.ruleid}} (click)="delete(rule)" style="cursor: pointer;margin: 0 5px">\r
+ <span [hidden]="rule.enabled===0" class="" (click)="on_off(rule); $event.stopPropagation()" style="cursor: pointer;margin: 0 5px">\r
+ <img src="../../../public/thirdparty/images/off.png" alt="">\r
+ </span>\r
+\r
+ <span class="" id={{rule.ruleid}} (click)="delete(rule)" style="cursor: pointer;margin: 0 5px">\r
<img src="../../../public/thirdparty/images/delete.png" alt="">\r
</span>\r
- </td>\r
- </tr>\r
- </tbody>\r
- </table>\r
-</div>\r
- <div id="deleteTimingTaskDlg" style="display: none;" >\r
+ </td>\r
+ </tr>\r
+ </tbody>\r
+ </table>\r
+ </div>\r
+ <div id="deleteTimingTaskDlg" style="display: none;">\r
<div id="deleteTimingTaskContent">\r
<div class="deletePromptMessage">\r
<span>{{"message_is_delete"|translate}}</span>\r
<div class="deletePromptMessage">\r
<span>{{"warn_delete_info"|translate}}</span>\r
</div>\r
- <div style="float:right;padding-top:10px" >\r
+ <div style="float:right;padding-top:10px">\r
<button class="btn btnDefault btnmrg" data-popmodal-but="ok">\r
<span>{{"common_confirm"|translate}}</span>\r
</button>\r
</div>\r
</div>\r
- </div>\r
-\r
-
\ No newline at end of file
+ </div>
\ No newline at end of file
See the License for the specific language governing permissions and\r
limitations under the License.\r
*/\r
-import {Component,OnInit,ViewChild,ViewEncapsulation} from '@angular/core';\r
-import {ModalService} from '../correlation-modal/modal.service';\r
-import {RuleModel} from './alarmRule';\r
-import {RuleRequest} from './ruleRequest';\r
+import { Component, OnInit, ViewChild, ViewEncapsulation } from '@angular/core';\r
+import { ModalService } from '../correlation-modal/modal.service';\r
+import { RuleModel } from './alarmRule';\r
+import { RuleRequest } from './ruleRequest';\r
import { Router } from '@angular/router';\r
-import {Http,Response,Jsonp,Headers,RequestOptions} from '@angular/http';\r
-import {AlarmRuleService} from './alarmRule.service';\r
+import { Http, Response, Jsonp, Headers, RequestOptions } from '@angular/http';\r
+import { AlarmRuleService } from './alarmRule.service';\r
declare var jQuery: any;\r
\r
@Component({\r
- selector:'alarmRule',\r
- templateUrl:'./alarmRule.component.html',\r
- \r
+ selector: 'alarmRule',\r
+ templateUrl: './alarmRule.component.html',\r
+\r
})\r
-export class AlarmRule implements OnInit{\r
- ruleModel:RuleModel;\r
- rules:RuleModel[];\r
- queryRule:RuleModel;\r
- activeText:string;\r
- ruleName:string;\r
- enable_on="enabled";\r
- enable_off="disabled"\r
- totalcount:number;\r
+export class AlarmRule implements OnInit {\r
+ ruleModel: RuleModel;\r
+ rules: RuleModel[];\r
+ queryRule: RuleModel;\r
+ activeText: string;\r
+ ruleName: string;\r
+ enable_on = "enabled";\r
+ enable_off = "disabled"\r
+ totalcount: number;\r
model: any;\r
ruleRequest: RuleRequest;\r
solution = 'ANGULAR';\r
selection = 'A'\r
- activeStatus=["option_all","common_enabled", "common_disabled"];\r
+ activeStatus = ["option_all", "common_enabled", "common_disabled"];\r
\r
- constructor(public _alarmRuleService:AlarmRuleService, private _ModalService:ModalService,\r
- private router: Router){};\r
+ constructor(public _alarmRuleService: AlarmRuleService, private modalService: ModalService,\r
+ private router: Router) { };\r
\r
- switch(select:string):void {\r
+ switch(select: string): void {\r
console.log(select);\r
- if(select == "common_enabled") {\r
+ if (select == "common_enabled") {\r
this.ruleModel.enabled = 1;\r
- }else if(select=="common_disabled"){\r
+ } else if (select == "common_disabled") {\r
this.ruleModel.enabled = 0;\r
- }else{\r
+ } else {\r
\r
- this.ruleModel.enabled = null;\r
+ this.ruleModel.enabled = null;\r
}\r
this.setActiveText();\r
};\r
\r
- setActiveText():void {\r
- if(this.ruleModel.enabled == 1){\r
+ setActiveText(): void {\r
+ if (this.ruleModel.enabled == 1) {\r
this.activeText = "common_enabled";\r
- this.ruleRequest.enabled=1;\r
+ this.ruleRequest.enabled = 1;\r
}\r
- else if(this.ruleModel.enabled == 0){\r
+ else if (this.ruleModel.enabled == 0) {\r
this.activeText = "common_disabled";\r
- this.ruleRequest.enabled=0;\r
- }else{\r
- this.activeText="option_all";\r
- this.ruleRequest.enabled=null;\r
+ this.ruleRequest.enabled = 0;\r
+ } else {\r
+ this.activeText = "option_all";\r
+ this.ruleRequest.enabled = null;\r
}\r
};\r
- \r
- getRules():Promise<any>{\r
- return this._alarmRuleService\r
- .getRules()\r
- .then(rules=>{\r
- this.rules=rules.rules;\r
+\r
+ getRules(): Promise<any> {\r
+ return this._alarmRuleService\r
+ .getRules()\r
+ .then(rules => {\r
+ this.rules = rules.rules;\r
this.totalcount = rules.totalcount;\r
- });\r
- }\r
-\r
- searchRules():void{\r
- if(this.ruleModel.enabled == null){\r
- this.ruleRequest.enabled =null;\r
- }\r
- this.ruleRequest.rulename = this.ruleModel.rulename;\r
- console.log(this.ruleRequest.enabled,this.ruleRequest.rulename);\r
- \r
- this._alarmRuleService\r
- .searchrules(this.ruleRequest)\r
- .then(rules=>{\r
- this.rules = rules;\r
- this.totalcount = rules.length;\r
});\r
- }\r
- updateRule(rule:RuleModel):void{\r
- this.router.navigate(['ruleInfo/',rule.ruleid]);\r
- }\r
-\r
- delete(rule: RuleModel):void{\r
- rule.enabled == 1 ? this.deleteActiveRule(rule):this.deleteModel(rule.ruleid,this._alarmRuleService,this);\r
- }\r
-\r
- on_off(rule:RuleModel){\r
- rule.enabled == 0 ? rule.enabled = 1: rule.enabled = 0;\r
- this._alarmRuleService\r
- .updateRule(rule)\r
- .then(res => {\r
- rule = res;\r
+ }\r
+\r
+ searchRules(): void {\r
+ if (this.ruleModel.enabled == null) {\r
+ this.ruleRequest.enabled = null;\r
+ }\r
+ this.ruleRequest.rulename = this.ruleModel.rulename;\r
+ console.log(this.ruleRequest.enabled, this.ruleRequest.rulename);\r
+\r
+ this._alarmRuleService\r
+ .searchrules(this.ruleRequest)\r
+ .then(rules => {\r
+ this.rules = rules;\r
+ this.totalcount = rules.length;\r
});\r
- }\r
+ }\r
+ updateRule(rule: RuleModel): void {\r
+ this.router.navigate(['ruleInfo/', rule.ruleid]);\r
+ }\r
+\r
+ delete(rule: RuleModel): void {\r
+ rule.enabled == 1 ? this.deleteActiveRule(rule) : this.deleteModel(rule.ruleid, this._alarmRuleService, this);\r
+ }\r
\r
- reset():void{\r
+ on_off(rule: RuleModel) {\r
+ rule.enabled == 0 ? rule.enabled = 1 : rule.enabled = 0;\r
+ this._alarmRuleService\r
+ .updateRule(rule)\r
+ .then(res => {\r
+ rule = res;\r
+ });\r
+ }\r
+\r
+ reset(): void {\r
this.ruleModel.rulename = null;\r
this.activeText = "option_all";\r
this.ruleModel.enabled = null;\r
this.getRules();\r
- }\r
- \r
- deleteActiveRule(rule:RuleModel):void{\r
- jQuery("#"+rule.ruleid).popModal({\r
+ }\r
+\r
+ deleteActiveRule(rule: RuleModel): void {\r
+ jQuery("#" + rule.ruleid).popModal({\r
html: jQuery('#deleteActiveRuleContent'),\r
placement: 'leftTop',\r
showCloseBut: false,\r
onOkBut: function () {\r
},\r
});\r
- }\r
- deleteModel(ruleid:string,alarm:AlarmRuleService,obj:any):void{\r
- jQuery("#"+ruleid).popModal({\r
+ }\r
+ deleteModel(ruleid: string, alarm: AlarmRuleService, obj: any): void {\r
+ jQuery("#" + ruleid).popModal({\r
html: jQuery('#deleteTimingTaskContent'),\r
placement: 'leftTop',\r
showCloseBut: false,\r
onDocumentClickClose: true,\r
onOkBut: function () {\r
jQuery("#deleteTimingTaskDlg").append(jQuery('#deleteTimingTaskContent'));\r
- alarm.delete(ruleid);\r
- obj.getRules();\r
+ alarm.delete(ruleid);\r
+ obj.getRules();\r
},\r
onCancelBut: function () {\r
}\r
});\r
- }\r
-\r
- ngOnInit():void{\r
- this.activeText="option_all";\r
- this.ruleModel={\r
- ruleid:null,\r
- rulename:null,\r
- description:"",\r
- content:null,\r
- createtime:null,\r
- creator:null,\r
- updatetime:null,\r
- modifier:null,\r
- enabled:0,\r
+ }\r
+\r
+ ngOnInit(): void {\r
+ this.activeText = "option_all";\r
+ this.ruleModel = {\r
+ ruleid: null,\r
+ rulename: null,\r
+ description: "",\r
+ content: null,\r
+ createtime: null,\r
+ creator: null,\r
+ updatetime: null,\r
+ modifier: null,\r
+ enabled: 0,\r
}\r
- this.ruleRequest={\r
- ruleid:null,\r
- rulename:null,\r
- creator:null,\r
- modifier:null,\r
- enabled:null,\r
+ this.ruleRequest = {\r
+ ruleid: null,\r
+ rulename: null,\r
+ creator: null,\r
+ modifier: null,\r
+ enabled: null,\r
}\r
this.getRules();\r
}\r
See the License for the specific language governing permissions and
limitations under the License.
*/
-import {Injectable} from '@angular/core';
-import {Http,Response,Headers} from '@angular/http';
+import { Injectable } from '@angular/core';
+import { Http, Response, Headers } from '@angular/http';
import 'rxjs/add/operator/toPromise';
import 'rxjs/add/operator/map';
-import {RuleModel} from './alarmRule';
-import {RuleRequest} from './ruleRequest'
+import { RuleModel } from './alarmRule';
+import { RuleRequest } from './ruleRequest'
import { Router } from '@angular/router';
-import {ModalService} from '../correlation-modal/modal.service';
+import { ModalService } from '../correlation-modal/modal.service';
@Injectable()
-export class AlarmRuleService{
+export class AlarmRuleService {
private ruleUrl = "/api/correlation-mgt/v1/rule";
- private headers = new Headers({'Content-Type': 'application/json'});
- constructor(private http:Http,private _ModalService:ModalService,private router:Router){}
+ private headers = new Headers({ 'Content-Type': 'application/json' });
+ constructor(private http: Http, private modalService: ModalService, private router: Router) { }
- getRules():Promise<any>{
+ getRules(): Promise<any> {
return this.http.get(this.ruleUrl)
- .toPromise()
- .then(res => res.json())
- .catch(this.handleError);
+ .toPromise()
+ .then(res => res.json())
+ .catch(this.handleError);
}
private handleError(error: any): Promise<any> {
- console.error('An error occurred', error);
+ console.error('An error occurred', error);
return Promise.reject(error._body || error);
}
-
- search(ruleid:string):Promise<RuleModel>{
- if(typeof(ruleid) == "string"){
- let rule =[{
- ruleid:null,
- rulename:null,
- description:null,
- content:null,
- createtime:null,
- creator:null,
- updatetime:null,
- modifier:null,
- enabled:0,
- }]
- }
- let data = {'ruleid':ruleid};
- var queryrequest = JSON.stringify(data);
- const url = `${this.ruleUrl}?queryrequest=${queryrequest}`;
+
+ search(ruleid: string): Promise<RuleModel> {
+ if (typeof (ruleid) == "string") {
+ let rule = [{
+ ruleid: null,
+ rulename: null,
+ description: null,
+ content: null,
+ createtime: null,
+ creator: null,
+ updatetime: null,
+ modifier: null,
+ enabled: 0,
+ }]
+ }
+ let data = { 'ruleid': ruleid };
+ var queryrequest = JSON.stringify(data);
+ const url = `${this.ruleUrl}?queryrequest=${queryrequest}`;
return this.http.get(url, this.headers)
- .toPromise()
- .then(res => res.json().rules as RuleModel)
- .catch(this.handleError);
- }
-
- searchrules(rule:RuleRequest):Promise<RuleModel[]>{
- let data = {rulename:rule.rulename,enabled:rule.enabled}
- console.log(JSON.stringify(data));
- const url = `${this.ruleUrl}?queryrequest=${JSON.stringify(data)}`
- return this.http.get(url,{body:data,headers:this.headers})
- .toPromise()
- .then(res => res.json().rules as RuleModel[])
- .catch(this.handleError);
- }
+ .toPromise()
+ .then(res => res.json().rules as RuleModel)
+ .catch(this.handleError);
+ }
+
+ searchrules(rule: RuleRequest): Promise<RuleModel[]> {
+ let data = { rulename: rule.rulename, enabled: rule.enabled }
+ console.log(JSON.stringify(data));
+ const url = `${this.ruleUrl}?queryrequest=${JSON.stringify(data)}`
+ return this.http.get(url, { body: data, headers: this.headers })
+ .toPromise()
+ .then(res => res.json().rules as RuleModel[])
+ .catch(this.handleError);
+ }
+
+ checkContent(ruleContent: string): Promise<any> {
+ const url = "/api/correlation-engine/v1/rule";
+ let data = { content: ruleContent };
+ return this.http
+ .post(url, JSON.stringify(data), { headers: this.headers })
+ .toPromise()
+ .then(res => res)
+ .catch(error => error);
+ }
- checkContent(ruleContent:string): Promise<any>{
- const url = "/api/correlation-engine/v1/rule";
- let data = {content:ruleContent};
- return this.http
- .post(url,JSON.stringify(data),{headers:this.headers})
- .toPromise()
- .then(res => res)
- .catch(error => error);
- }
-
- updateRule(rule:RuleModel): Promise<any>{
- let rules = {
- "ruleid": rule.ruleid,
- "description": rule.description,
- "content": rule.content,
- "enabled": rule.enabled
- }
- const url = `${this.ruleUrl}`
- return this.http
- .post(url,JSON.stringify(rules),{headers:this.headers})
- .toPromise()
- .then(res => res)
- .catch(error => error)
- }
-
- save(rule:RuleModel):Promise<any>{
- let ruledata = {
- "description": rule.description,
- "content": rule.content,
- "enabled": rule.enabled,
- "rulename": rule.rulename
- }
- return this.http.put(this.ruleUrl,JSON.stringify(ruledata),{headers:this.headers})
- .toPromise()
- .then(res => res)
- .catch(error => error);
- }
+ updateRule(rule: RuleModel): Promise<any> {
+ let rules = {
+ "ruleid": rule.ruleid,
+ "description": rule.description,
+ "content": rule.content,
+ "enabled": rule.enabled
+ }
+ const url = `${this.ruleUrl}`
+ return this.http
+ .post(url, JSON.stringify(rules), { headers: this.headers })
+ .toPromise()
+ .then(res => res)
+ .catch(error => error)
+ }
- public delete(ruleid:string):Promise<void>{
- let ru = {'ruleid':ruleid};
- const url = `${this.ruleUrl}`;
- return this.http.delete(url,{body:JSON.stringify(ru),headers:this.headers})
- .toPromise()
- .then(res => {
- if(res.status == 200){
-
- }
- })
- .catch(this.handleError);
- }
+ save(rule: RuleModel): Promise<any> {
+ let ruledata = {
+ "description": rule.description,
+ "content": rule.content,
+ "enabled": rule.enabled,
+ "rulename": rule.rulename
+ }
+ return this.http.put(this.ruleUrl, JSON.stringify(ruledata), { headers: this.headers })
+ .toPromise()
+ .then(res => res)
+ .catch(error => error);
+ }
+
+ public delete(ruleid: string): Promise<void> {
+ let ru = { 'ruleid': ruleid };
+ const url = `${this.ruleUrl}`;
+ return this.http.delete(url, { body: JSON.stringify(ru), headers: this.headers })
+ .toPromise()
+ .then(res => {
+
+ })
+ .catch(this.handleError);
+ }
}
\ No newline at end of file
See the License for the specific language governing permissions and\r
limitations under the License.\r
*/\r
-export class RuleModel{\r
- ruleid:string;\r
- rulename:string;\r
- description:string; \r
- content:string;\r
- createtime:Date;\r
- creator:number;\r
- updatetime:Date;\r
- modifier:string;\r
+export class RuleModel {\r
+ ruleid: string;\r
+ rulename: string;\r
+ description: string;\r
+ content: string;\r
+ createtime: Date;\r
+ creator: number;\r
+ updatetime: Date;\r
+ modifier: string;\r
enabled?;\r
}
\ No newline at end of file
See the License for the specific language governing permissions and\r
limitations under the License.\r
*/\r
-export class RuleRequest{\r
- ruleid:string;\r
- rulename:string;\r
- creator:number;\r
- modifier:string;\r
- enabled:number;\r
+export class RuleRequest {\r
+ ruleid: string;\r
+ rulename: string;\r
+ creator: number;\r
+ modifier: string;\r
+ enabled: number;\r
}
\ No newline at end of file
<base href="/iui/LY-Correlation/">\r
<meta charset="UTF-8">\r
<meta name="viewport" content="width=device-width, initial-scale=1">\r
- <script src="public/component/thirdparty/jquery/jquery-1.10.2.min.js"></script>\r
+ <script src="public/thirdparty/js/jquery_1.12.4.min.js"></script>\r
<script src="public/common/js/popModal.js"></script>\r
+ <script src="public/common/js/jQuery-File-Upload/js/jquery.ui.widget.js"></script>\r
<script src="public/common/js/jQuery-File-Upload/js/vendor/jquery.ui.widget.js"></script>\r
<script src="public/common/js/jQuery-File-Upload/js/jquery.iframe-transport.js"></script>\r
<script src="public/common/js/jQuery-File-Upload/js/jquery.fileupload.js"></script>\r
+ \r
<body style="overflow: auto">\r
<remote-config>Loading...</remote-config>\r
\r
import '../public/thirdparty/css/magic-check.css';
import '../public/thirdparty/css/zTreeStyle.css';
import '../public/framework/browser/css/open-ostyle.css';
-import '../public/css/alarm-rule.css'
+import '../public/thirdparty/css/alarm-rule.css'
import '../public/thirdparty/js/bootstrap.min.js';
import '../public/thirdparty/js/bootstrap-table.min.js';
Code Review / vnfsdk / refrepo.git / commitdiff