content Alarm function modification

Change-Id: I9e37bed3cf619fcd60f3b638f3816a8781111cc2
Issue-ID: USECASEUI-165
Signed-off-by: zhangab <zhanganbing@chinamobile.com>

1 files changed, 82 insertions, 87 deletions

diff --git a/usecaseui-portal/src/app/alarm/alarm.component.html b/usecaseui-portal/src/app/alarm/alarm.component.html
index 8f95de37..fcb0e70e 100644
--- a/usecaseui-portal/src/app/alarm/alarm.component.html
+++ b/usecaseui-portal/src/app/alarm/alarm.component.html
@@ -14,100 +14,95 @@
     limitations under the License.
 -->
 <h3 class="title"> <span (click)="detailHide()" style="cursor:pointer;">Alarm</span> <span *ngIf="detailshow">>
-        Details</span> </h3>
+    Details</span> </h3>
 <hr>
-<div class="select" [@showHideAnimate]="state">
-    <div class="query_criteria">
-        <span>Source Name: </span>
-        <nz-dropdown [nzTrigger]="'click'" [nzPlacement]="'bottomLeft'">
-            <button nz-button nz-dropdown><span>{{sourceNameSelected}}</span> <i class="anticon anticon-down"></i></button>
-            <ul nz-menu>
-                <li nz-menu-item (click)="choseSourceName(item)" *ngFor="let item of sourceNameList">
-                    <a>{{item.name}}</a>
-                </li>
-            </ul>
-        </nz-dropdown>
-        &nbsp;&nbsp;
-        <span>Priority: </span>
-        <nz-dropdown [nzTrigger]="'click'" [nzPlacement]="'bottomLeft'">
-            <button nz-button nz-dropdown><span>{{prioritySelected}}</span> <i class="anticon anticon-down"></i></button>
-            <ul nz-menu>
-                <li nz-menu-item (click)="chosePriority(item)" *ngFor="let item of priorityList">
-                    <a>{{item}}</a>
-                </li>
-            </ul>
-        </nz-dropdown>
-        &nbsp;&nbsp;
-        <span>Status: </span>
-        <nz-dropdown [nzTrigger]="'click'" [nzPlacement]="'bottomLeft'">
-            <button nz-button nz-dropdown><span>{{statusSelected}}</span> <i class="anticon anticon-down"></i></button>
-            <ul nz-menu>
-                <li nz-menu-item (click)="choseStatus(item)" *ngFor="let item of statusList">
-                    <a>{{item}}</a>
-                </li>
-            </ul>
-        </nz-dropdown>
-        <br> <br>
-        <span>Report Time: </span>
-        <nz-range-picker [(ngModel)]="dateRange" (ngModelChange)="onChange($event)" nzShowTime></nz-range-picker>
+<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>
 
-        <button class="search" nz-button [nzType]="'primary'" (click)="getAlarmFormData()"><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>
+<div class="select" [@showHideAnimate]="state">
+<div class="query_criteria">
+    <span>Source Name: </span>
+    <nz-dropdown [nzTrigger]="'click'" [nzPlacement]="'bottomLeft'">
+        <button nz-button nz-dropdown><span>{{sourceNameSelected}}</span> <i class="anticon anticon-down"></i></button>
+        <ul nz-menu>
+            <li nz-menu-item (click)="choseSourceName(item)" *ngFor="let item of sourceNameList">
+                <a>{{item}}</a>
             </li>
-            <li>
-                <h5>Closed</h5>
-                <p>{{alarmList.closed }}</p>
+        </ul>
+    </nz-dropdown>
+    &nbsp;&nbsp;
+    <span>Priority: </span>
+    <nz-dropdown [nzTrigger]="'click'" [nzPlacement]="'bottomLeft'">
+        <button nz-button nz-dropdown><span>{{prioritySelected}}</span> <i class="anticon anticon-down"></i></button>
+        <ul nz-menu>
+            <li nz-menu-item (click)="chosePriority(item)" *ngFor="let item of priorityList">
+                <a>{{item}}</a>
             </li>
-            <li>
-                <h5>Action</h5>
-                <p>{{alarmList.Action }}</p>
+        </ul>
+    </nz-dropdown>
+    &nbsp;&nbsp;
+    <span>Status: </span>
+    <nz-dropdown [nzTrigger]="'click'" [nzPlacement]="'bottomLeft'">
+        <button nz-button nz-dropdown><span>{{statusSelected}}</span> <i class="anticon anticon-down"></i></button>
+        <ul nz-menu>
+            <li nz-menu-item (click)="choseStatus(item)" *ngFor="let item of statusList">
+                <a>{{item}}</a>
             </li>
         </ul>
-        <div class="thumbnail" (click)="showModalMiddle()">
-            <app-line [initData]="alarmChartInit" [chartData]="alarmChartData"></app-line>
-        </div>
-    </div>
-    <div class="tablelist">
-        <nz-table #nzTable [nzData]="dataSet" [nzPageSize]="10" nzShowSizeChanger nzShowQuickJumper [nzPageSizeOptions]="[5,10,15,20]"
-            nzSize="middle">
-            <thead (nzSortChange)="sort($event)" nzSingleSort>
-                <tr>
-                    <th nzWidth="5%">NO</th>
-                    <th nzWidth="20%">Source Name</th>
-                    <th nzWidth="10%">Priority</th>
-                    <th nzWidth="20%">SpecificProblem</th>
-                    <th nzWidth="20%">Report Time</th>
-                    <th nzWidth="15%">Status</th>
-                    <th nzWidth="10%">Action</th>
-                </tr>
-            </thead>
-            <tbody>
-                <!-- <ng-template ngFor let-data [ngForOf]="nzTable.data" let-i="index"> -->
-                <tr *ngFor="let item of list; let i = index; ">
-                    <td>{{i+1}}</td>
-                    <td>{{item.name}}</td>
-                    <td>{{item.age}}</td>
-                    <td>{{item.address}}</td>
-                    <td>{{item.address}}</td>
-                    <td>{{item.address}}</td>
-                    <td class="action"><a (click)="detailShow()"><i class="details"></i></a></td>
-                </tr>
-                <!-- </ng-template> -->
-            </tbody>
-        </nz-table>
-    </div>
+    </nz-dropdown>
+    <br> <br>
+    <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>
+</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="tablelist">
+    <nz-table #nzTable [nzData]="list" [nzPageSize]="10" nzShowSizeChanger nzShowQuickJumper [nzPageSizeOptions]="[5,10,15,20]"
+        nzSize="middle">
+        <thead (nzSortChange)="sort($event)" nzSingleSort>
+            <tr>
+                <th nzWidth="5%">NO</th>
+                <th nzWidth="20%">Source Name</th>
+                <th nzWidth="10%">Priority</th>
+                <th nzWidth="20%">SpecificProblem</th>
+                <th nzWidth="20%">Report Time</th>
+                <th nzWidth="15%">Status</th>
+                <th nzWidth="10%">Action</th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr *ngFor="let item of list; let i = index;">
+                <td>{{i+1}}</td>
+                <td>{{item.sourceName}}</td>
+                <td>{{item.priority}}</td>
+                <td>{{item.specificProblem}}</td>
+                <td>{{item.sequence}}</td>
+                <td>{{item.status}}</td>
+                <td class="action"><a (click)="detailShow()"><i class="details"></i></a></td>
+            </tr>
+        </tbody>
+    </nz-table>
+</div>
 </div>
 <div [@showHideAnimate]="state2">
-    <app-details></app-details>
+<app-details></app-details>
 </div>
\ No newline at end of file