summaryrefslogtreecommitdiffstats
path: root/rulemgt-frontend/src/app
diff options
context:
space:
mode:
Diffstat (limited to 'rulemgt-frontend/src/app')
-rw-r--r--rulemgt-frontend/src/app/correlation-ruleInfo/ruleInfo.component.html165
-rw-r--r--rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.html93
-rw-r--r--rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.ts6
3 files changed, 142 insertions, 122 deletions
diff --git a/rulemgt-frontend/src/app/correlation-ruleInfo/ruleInfo.component.html b/rulemgt-frontend/src/app/correlation-ruleInfo/ruleInfo.component.html
index f5158b9..61535fc 100644
--- a/rulemgt-frontend/src/app/correlation-ruleInfo/ruleInfo.component.html
+++ b/rulemgt-frontend/src/app/correlation-ruleInfo/ruleInfo.component.html
@@ -13,137 +13,138 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<div class="container" style="margin-top: 20px">
+<div class="container-fluid" style="padding: 40px 55px 0 55px">
<form #ruleForm="ngForm" class="form-group row" (submit)="onSubmit(ruleName)">
<div class="form-body">
- <div class="row form-group col-xs-12 ">
- <label for="userName" class="col-xs-2 col-form-label labelstyle">
- <span>{{"field_rule_name_Add_Page"|translate}}</span>
- <span style="color: red">*</span>
- </label>
- <div class="col-xs-6" style="margin-left: -100px">
- <input class="form-control ng-pristine ng-untouched ng-invalid ng-invalid-required" style="width: 60%" type="text" name="rulename"
- [(ngModel)]="queryRule.ruleName" id="ruleNameInput" readonly="{{addBottonStatus}}" #ruleName="ngModel"
- required>
+ <div class="row form-group">
+ <label for="userName" class="col-xs-2 col-sm-1 col-form-label labelstyle">
+ <span>{{"field_rule_name_Add_Page"|translate}}</span>
+ <span style="color: red">*</span>
+ </label>
+ <div class="col-xs-5 col-sm-6">
+ <input class="form-control ng-pristine ng-untouched ng-invalid ng-invalid-required" type="text" name="rulename" [(ngModel)]="queryRule.ruleName"
+ id="ruleNameInput" readonly="{{addBottonStatus}}" #ruleName="ngModel" required>
</div>
</div>
- <div class="row form-group col-xs-12">
- <label for="userName" class="col-xs-2 col-form-label labelstyle">
- <span>{{"field_description"|translate}}</span>
- </label>
- <div class="col-xs-6" style="margin-left: -100px">
- <input class="form-control ng-untouched ng-pristine ng-valid" readonly="{{addBottonStatus}}" style="width: 60%" type="text"
- [(ngModel)]="queryRule.loopControlName" name="description">
+ <div class="row form-group">
+ <label for="controlLoopName" class="col-xs-2 col-sm-1 col-form-label labelstyle">
+ <span>{{"field_controlLoopName"|translate}}</span>
+ <span style="color: red">*</span>
+ </label>
+ <div class="col-xs-5 col-sm-6">
+ <input class="form-control ng-untouched ng-pristine ng-valid" readonly="{{addBottonStatus}}" type="text" [(ngModel)]="queryRule.loopControlName"
+ name="controlLoopName" id="controlLoopName" required>
</div>
</div>
- <div class="row form-group col-xs-12">
- <label for="userName" class="col-xs-2 col-form-label labelstyle">
- <span>{{"field_description"|translate}}</span>
- </label>
- <div class="col-xs-6" style="margin-left: -100px">
- <input class="form-control ng-untouched ng-pristine ng-valid" readonly="{{addBottonStatus}}" style="width: 60%" type="text"
- [(ngModel)]="queryRule.description" name="description">
+ <div class="row form-group">
+ <label for="userName" class="col-xs-2 col-sm-1 col-form-label labelstyle">
+ <span>{{"field_description"|translate}}</span>
+ </label>
+ <div class="col-xs-5 col-sm-6">
+ <input class="form-control ng-untouched ng-pristine ng-valid" readonly="{{addBottonStatus}}" type="text" [(ngModel)]="queryRule.description"
+ name="description">
</div>
</div>
- <div id="state" class="row form-group col-xs-12">
- <label class="col-xs-2 col-form-label labelstyle">
- <span>{{"common_status"|translate}}</span>
- </label>
+ <div id="state" class="row form-group">
+ <label class="col-xs-2 col-sm-1 col-form-label labelstyle">
+ <span>{{"common_status"|translate}}</span>
+ </label>
- <div class="col-xs-6" style="margin-left: -113px">
- <div *ngIf="queryRule.enabled == 0">
- <div class="col-xs-3" >
- <input class="magic-radio" type="radio" name="radio" [(ngModel)]="queryRule.enabled" value='0'>
- <label for="radio1" >{{"common_off"|translate}}</label>
+ <div class="col-xs-10 col-sm-11">
+ <div class="row">
+ <div *ngIf="queryRule.enabled == 0">
+ <div class="col-xs-4 col-sm-2 col-md-1">
+ <input class="magic-radio" type="radio" name="radio" [(ngModel)]="queryRule.enabled" value='0'>
+ <label for="radio1">{{"common_off"|translate}}</label>
+ </div>
+ <div class="col-xs-4 col-sm-2 col-md-1">
+ <input class="magic-radio" type="radio" name="radio" [(ngModel)]="queryRule.enabled" value='1'>
+ <label for="radio1" (click)="switch()">{{"common_on"|translate}}</label>
+ </div>
</div>
- <div class="col-xs-3" >
- <input class="magic-radio" type="radio" name="radio" [(ngModel)]="queryRule.enabled" value='1'>
- <label for="radio1" (click)="switch()">{{"common_on"|translate}}</label>
+ <div *ngIf="queryRule.enabled == 1">
+ <div class="col-xs-4 col-sm-2 col-md-1">
+ <input class="magic-radio" type="radio" name="radio" [(ngModel)]="queryRule.enabled" value='0'>
+ <label for="radio1" (click)="switch()">{{"common_off"|translate}}</label>
+ </div>
+ <div class="col-xs-4 col-sm-2 col-md-1">
+ <input class="magic-radio" type="radio" name="radio" [(ngModel)]="queryRule.enabled" value='1'>
+ <label for="radio1">{{"common_on"|translate}}</label>
+ </div>
</div>
</div>
- <div *ngIf="queryRule.enabled == 1">
- <div class="col-xs-3" >
- <input class="magic-radio" type="radio" name="radio" [(ngModel)]="queryRule.enabled" value='0'>
- <label for="radio1" (click)="switch()">{{"common_off"|translate}}</label>
- </div>
- <div class="col-xs-3" >
- <input class="magic-radio" type="radio" name="radio" [(ngModel)]="queryRule.enabled" value='1'>
- <label for="radio1" >{{"common_on"|translate}}</label>
- </div>
- </div>
</div>
</div>
- <div class="row form-group col-xs-12">
- <label for="" class="col-xs-2 col-form-label labelstyle">
- <span>{{"common_file"|translate}}</span>
- </label>
- <div class="col-xs-6" style="margin-left: -100px">
+ <div class="row form-group">
+ <label for="" class="col-xs-2 col-sm-1 col-form-label labelstyle">
+ <span>{{"common_file"|translate}}</span>
+ </label>
+ <div class="col-xs-6 col-sm-7">
<div class="btn-group btn-group-circle">
<span class="importDivArea mmlBatchBtnBar">
<button class="btn btn-info" id="importBtn" disabled="{{addBottonStatus}}">
<span class="ict-import"></span>
- <span>{{"import"|translate}}</span>
- </button>
- <div id="importDiv" class="container upload">
- <form id="fileupload" #fileForm="ngForm" role="form" enctype="multipart/form-data">
- <div class="file-preview">
- <div id="dropzone" class="file-drop-zone">
- <div class="file-drop-zone-title">
- <span>{{"file_import"|translate}}</span>
+ <span>{{"import"|translate}}</span>
+ </button>
+ <div id="importDiv" class="container upload">
+ <form id="fileupload" #fileForm="ngForm" role="form" enctype="multipart/form-data">
+ <div class="file-preview">
+ <div id="dropzone" class="file-drop-zone">
+ <div class="file-drop-zone-title">
+ <span>{{"file_import"|translate}}</span>
+ </div>
</div>
</div>
- </div>
- <div class="input-group fileupload-btn">
- <div id="fileName" class="form-control file-caption">task2.zip</div>
- <span class="input-group-btn" id="btnGroup">
+ <div class="input-group fileupload-btn">
+ <div id="fileName" class="form-control file-caption">task2.zip</div>
+ <span class="input-group-btn" id="btnGroup">
<span class="btn btn-primary fileinput-button white radius_s blue1-active" id="browse" data-placement="bottom" data-toggle="tooltip">
<span class="importBtnFontSize">{{"common_browse"|translate}}</span>
- <input type="file" name="file" title=" " accept=".txt" multiple="">
- </span>
- <button id="fileremove" class="btn btn-default" type="button">
+ <input type="file" name="file" title=" " accept=".txt" multiple="">
+ </span>
+ <button id="fileremove" class="btn btn-default" type="button">
<span class="importBtnFontSize">{{"common_remove"|translate}}</span>
</button>
- <button id="filesubmit" class="btn btn-default" type="button">{{"common_confirm"|translate}}</button>
- </span>
- </div>
+ <button id="filesubmit" class="btn btn-default" type="button">{{"common_confirm"|translate}}</button>
+ </span>
+ </div>
- </form>
- </div>
+ </form>
+ </div>
</span>
</div>
</div>
</div>
- <div class="row form-group col-xs-12">
- <label for="" class="col-xs-2 col-form-label labelstyle">
- <span>{{"message_rule_content"|translate}}</span>
- <span style="color: red">*</span>
- </label>
- <div class="col-xs-8" style="margin-left: -100px">
+ <div class="row form-group">
+ <label for="" class="col-xs-2 col-sm-1 col-form-label labelstyle">
+ <span>{{"message_rule_content"|translate}}</span>
+ <span style="color: red">*</span>
+ </label>
+ <div class="col-xs-9 col-sm-10">
<div class="form-group">
<textarea id="cmds" class="form-control" readonly="{{addBottonStatus}}" [(ngModel)]="queryRule.content" name="content" rows="12"
cols="80" required placeholder="package example;">
</textarea>
-
</div>
</div>
</div>
- <div class="row form-group col-xs-12 " style="margin-left: 73px">
- <div class="col-xs-8 ">
+ <div class="row form-group">
+ <div class="col-xs-8 col-xs-offset-2 col-sm-offset-1">
<label class="myclass" id="checkLabel">
<button type="button" (click)="checkContent('check')" disabled="{{addBottonStatus}}" class="btn btn-info">{{"common_check"|translate}}</button>
</label>
<label class="myclass" id="updateLabel">
- <button type="button" disabled="{{addBottonStatus}}" class="btn btn-info" (click)="update()">{{"common_update"|translate}}</button>
+ <button type="button" disabled="{{addBottonStatus}}" class="btn btn-info" (click)="update()">{{"common_update"|translate}}</button>
</label>
<label class="myclass" id="saveLabel">
- <button type="submit" disabled="{{addBottonStatus}}" class="btn btn-info">{{"common_save"|translate}}</button>
+ <button type="submit" disabled="{{addBottonStatus}}" class="btn btn-info">{{"common_save"|translate}}</button>
</label>
<label class="myclass" id="cancelLabel">
<button type="button" routerLink='/alarmRule' class="btn btn-info">{{"common_cancel"|translate}}</button>
diff --git a/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.html b/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.html
index 01b7f12..4481e18 100644
--- a/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.html
+++ b/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.html
@@ -13,30 +13,38 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<div class="container-fluid" style="padding-top: 20px">
+<div class="container-fluid" style="padding: 40px 40px 0 40px">
<form class="form-inline">
<div class="form-body">
<div class="row form-group col-xs-12">
<div class="col-xs-4">
- <label class="col-xs-3 control-label" style="padding-top: 8px">
- {{"common_status"|translate}}
- </label>
- <select #selection class="form-control" style="width: 60%" id="status" (change)="switch(selection.value)" [(ngModel)]="activeText"
- name="activestatus">
- <option *ngFor="let a of activeStatus" [value]="a">{{a|translate}}</option>
- </select>
+ <div class="row">
+ <label class="col-xs-3 col-md-2 control-label" style="padding-top: 8px">
+ {{"common_status"|translate}}
+ </label>
+ <div class="col-xs-7">
+ <select #selection class="form-control" id="status" (change)="switch(selection.value)" [(ngModel)]="activeText" name="activestatus"
+ style="width:100%">
+ <option *ngFor="let a of activeStatus" [value]="a">{{a|translate}}</option>
+ </select>
+ </div>
+ </div>
</div>
<div class="col-xs-4">
- <label for="userName" class="col-xs-3 control-label" style="padding-top: 8px">
- <span>{{"common_keyword"|translate}}</span>
- </label>
- <input class="form-control ng-untouched ng-pristine ng-valid" style="width: 60%" placeholder='{{"field_rule_name_Add_Page"|translate}}'
- type="text" [(ngModel)]="ruleModel.ruleName" name="name">
+ <div class="row">
+ <label for="userName" class="col-xs-3 control-label" style="padding-top: 8px">
+ <span>{{"common_keyword"|translate}}</span>
+ </label>
+ <div class="col-xs-7">
+ <input class="form-control ng-untouched ng-pristine ng-valid" placeholder='{{"field_rule_name_Add_Page"|translate}}' type="text"
+ [(ngModel)]="ruleModel.ruleName" name="name" style="width:100%">
+ </div>
+ </div>
</div>
- <div class="fmrule_btn_group display_table">
- <div class="inline">
+ <div class="fmrule_btn_group display_table col-xs-4">
+ <div class="inline row">
<button id="batchDeleteButton" class="btn btn-primary" (click)="searchRules()">
<span class="glyphicon glyphicon-search" style="padding-top: 2px"></span>
<span>{{"common_query"|translate}}</span>
@@ -49,14 +57,12 @@
</div>
</div>
- <div class="row form-group col-xs-12" style="margin-top: 10px">
- <div class="">
- <div class="inline">
- <button type="button" routerLink='/ruleInfo' class="btn btn-info">
- <span class="glyphicon glyphicon-plus"></span>
- <span>{{"common_add"|translate}}</span>
+ <div class="row form-group" style="margin-top: 10px">
+ <div class="inline col-xs-12">
+ <button type="button" routerLink='/ruleInfo' class="btn btn-info">
+ <span class="glyphicon glyphicon-plus"></span>
+ <span>{{"common_add"|translate}}</span>
</button>
- </div>
</div>
</div>
</div>
@@ -76,30 +82,43 @@
</tr>
</thead>
<tbody>
+ <tr *ngIf="rules == null || rules.length === 0">
+ <td colspan="6" style="text-align: center; background-color: white;">{{"nodata"|translate}}</td>
+ </tr>
<tr *ngFor="let rule of rules">
- <td><a routerLink="/ruleInfo/{{rule.ruleId}}&add">{{rule.rulename}}</a></td>
- <td [hidden]="rule.enabled === 1" style="text-align: center"><span value=1><img src="../../assets/thirdparty/images/round_off.png" alt=""></span></td>
- <td [hidden]="rule.enabled === 0" style="text-align: center"><span value=0><img src="../../assets/thirdparty/images/round_on.png" alt=""></span></td>
+ <td>
+ <a routerLink="/ruleInfo/{{rule.ruleId}}&add">{{rule.rulename}}</a>
+ </td>
+ <td [hidden]="rule.enabled === 1" style="text-align: center">
+ <span value=1>
+ <img src="../../assets/thirdparty/images/round_off.png" alt="">
+ </span>
+ </td>
+ <td [hidden]="rule.enabled === 0" style="text-align: center">
+ <span value=0>
+ <img src="../../assets/thirdparty/images/round_on.png" alt="">
+ </span>
+ </td>
<td>{{rule.createTime | date:'yyyy-MM-dd HH:mm:ss'}}</td>
<td>{{rule.creator}}</td>
<td>{{rule.updateTime | date:'yyyy-MM-dd HH:mm:ss'}}</td>
<td>
<span (click)="updateRule(rule); $event.stopPropagation()" style="cursor: pointer;margin: 0 5px">
- <img src="../../assets/thirdparty/images/edit.png" alt="">
- </span>
+ <img src="../../assets/thirdparty/images/edit.png" alt="">
+ </span>
<span>
-
- </span>
- <span [hidden]="rule.enabled===1" class="" (click)="on_off(rule); $event.stopPropagation()" style="cursor: pointer;margin: 0 5px">
- <img src="../../assets/thirdparty/images/on.png" alt="">
- </span>
+
+ </span>
+ <span [hidden]="rule.enabled===1" class="" (click)="on_off(rule); $event.stopPropagation()" style="cursor: pointer;margin: 0 5px">
+ <img src="../../assets/thirdparty/images/on.png" alt="">
+ </span>
<span [hidden]="rule.enabled===0" class="" (click)="on_off(rule); $event.stopPropagation()" style="cursor: pointer;margin: 0 5px">
- <img src="../../assets/thirdparty/images/off.png" alt="">
- </span>
+ <img src="../../assets/thirdparty/images/off.png" alt="">
+ </span>
<span class="" id={{rule.ruleId}} (click)="delete(rule)" style="cursor: pointer;margin: 0 5px">
- <img src="../../assets/thirdparty/images/delete.png" alt="">
- </span>
+ <img src="../../assets/thirdparty/images/delete.png" alt="">
+ </span>
</td>
</tr>
</tbody>
@@ -114,7 +133,7 @@
<button class="btn btnDefault btnmrg" data-popmodal-but="ok">
<span>{{"common_confirm"|translate}}</span>
</button>
- <button class="btn btnDefault btnmrg" type="button" data-popmodal-but="cancel">
+ <button class="btn btnDefault btnmrg" type="button" data-popmodal-but="cancel">
<span>{{"common_cancel"|translate}}</span>
</button>
</div>
diff --git a/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.ts b/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.ts
index f6329f5..6273e9a 100644
--- a/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.ts
+++ b/rulemgt-frontend/src/app/correlation-ruleList/alarmRule.component.ts
@@ -24,9 +24,9 @@ declare var jQuery: any;
@Component({
selector: 'alarmRule',
- templateUrl: './alarmRule.component.html',
-
+ templateUrl: './alarmRule.component.html'
})
+
export class AlarmRule implements OnInit {
ruleModel: RuleModel;
rules: RuleModel[];
@@ -35,7 +35,7 @@ export class AlarmRule implements OnInit {
ruleName: string;
enable_on = "enabled";
enable_off = "disabled"
- totalcount: number;
+ totalcount: number = 0;
model: any;
ruleRequest: RuleRequest;
solution = 'ANGULAR';