diff options
author | 2018-10-31 16:22:18 +0800 | |
---|---|---|
committer | 2018-10-31 16:22:46 +0800 | |
commit | 13de0d893a4ff6d45a49861f7536822e6be1c801 (patch) | |
tree | 59ff6171eb0f7592a62e0798497a82ee8157f88c /usecaseui-portal/src/app/alarm/alarm.component.html | |
parent | 059a897e44b1c44860ae8907d4a8600b649cccf3 (diff) |
Fix VNF Alarm Query Bugs
Change-Id: Ib649f6f30005a47bdf11958cd8c80f2108100982
Issue-ID: USECASEUI-165
Signed-off-by: zhangab <zhanganbing@chinamobile.com>
Diffstat (limited to 'usecaseui-portal/src/app/alarm/alarm.component.html')
-rw-r--r-- | usecaseui-portal/src/app/alarm/alarm.component.html | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/usecaseui-portal/src/app/alarm/alarm.component.html b/usecaseui-portal/src/app/alarm/alarm.component.html index fcb0e70e..378cebc2 100644 --- a/usecaseui-portal/src/app/alarm/alarm.component.html +++ b/usecaseui-portal/src/app/alarm/alarm.component.html @@ -16,19 +16,6 @@ <h3 class="title"> <span (click)="detailHide()" style="cursor:pointer;">Alarm</span> <span *ngIf="detailshow">> Details</span> </h3> <hr> -<div class="titles" [@showHideAnimate]="state"> -<ul> - <li> - <h5>Closed</h5> - <p>{{alarmList.closed }}</p> - </li> - <li> - <h5>Action</h5> - <p>{{alarmList.Action }}</p> - </li> -</ul> - -</div> <div class="select" [@showHideAnimate]="state"> <div class="query_criteria"> <span>Source Name: </span> @@ -64,17 +51,29 @@ <span>Report Time: </span> <nz-range-picker [(ngModel)]="dateRange" (ngModelChange)="onChange($event)" nzShowTime></nz-range-picker> - <button class="search" nz-button [nzType]="'primary'" (click)="getAlarmFormData()"><i class="anticon anticon-search"></i><span>Search</span></button> -</div> -<div class="thumbnail" (click)="showModalMiddle()"> - <app-line [initData]="alarmChartInit" [chartData]="alarmChartData"></app-line> + <!-- <button class="search" nz-button [nzType]="'primary'" (click)="getAlarmFormData()"><i class="anticon anticon-search"></i><span>Search</span></button> --> + <button class="search" nz-button [nzType]="'primary'"><i class="anticon anticon-search"></i><span>Search</span></button> </div> </div> -<nz-modal nzWrapClassName="vertical-center-modal" [(nzVisible)]="isVisibleMiddle" nzTitle="Alarm Chart" (nzOnCancel)="handleCancelMiddle()" -(nzOnOk)="handleOkMiddle()"> -<app-line [initData]="alarmChartInitBig" [chartData]="alarmChartDataBig"></app-line> -</nz-modal> <div class="content" [@showHideAnimate]="state"> +<div class="title"> + <ul> + <li><h5>All</h5> <p>{{alarmList.all }}</p></li> + <li><h5>Closed</h5> <p>{{alarmList.closed }}</p></li> + <li><h5>Active</h5> <p>{{alarmList.activeNum }}</p></li> + </ul> +</div> +<div class="chart"> + <h3>Alarm Chart</h3> + <nz-radio-group [(ngModel)]="size"> + <label nz-radio-button nzValue="day"> day </label> + <label nz-radio-button nzValue="month">month</label> + </nz-radio-group> + <div class="AlarmChart" [ngClass]="{'alarmChart-active':alarmShow}"> + <app-line [initData]="alarmChartInit" [chartData]="alarmChartData"></app-line> + </div> + <button class="open-close" [ngClass]="{'open-close-active':alarmShow}" (click)="alarmShow=!alarmShow"></button> +</div> <div class="tablelist"> <nz-table #nzTable [nzData]="list" [nzPageSize]="10" nzShowSizeChanger nzShowQuickJumper [nzPageSizeOptions]="[5,10,15,20]" nzSize="middle"> @@ -90,7 +89,7 @@ </tr> </thead> <tbody> - <tr *ngFor="let item of list; let i = index;"> + <tr *ngFor="let item of nzTable.data; let i = index;"> <td>{{i+1}}</td> <td>{{item.sourceName}}</td> <td>{{item.priority}}</td> |