From e82d7ca41418b94a9e5d487ac4e3497ccf54e277 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 09 May 2018 14:05:26 +0800
Subject: [PATCH] 三级警报优化
---
src/app/routes/dashboard/workplace/workplace.component.html | 87 +++----------------------------------------
1 files changed, 6 insertions(+), 81 deletions(-)
diff --git a/src/app/routes/dashboard/workplace/workplace.component.html b/src/app/routes/dashboard/workplace/workplace.component.html
index f39e81c..5566b14 100644
--- a/src/app/routes/dashboard/workplace/workplace.component.html
+++ b/src/app/routes/dashboard/workplace/workplace.component.html
@@ -109,13 +109,13 @@
</div>
<nz-card [nzLoading]="loading" [nzBordered]="false" nzNoPadding class="sales-card">
<ng-template #body>
- <nz-tabset>
- <nz-tab>
- <ng-template #nzTabHeading>������������</ng-template>
+ <nz-tabset (nzSelectedIndexChange)=selectedIndexChange($event) >
+ <nz-tab *ngFor="let alarmData of alarmDatas">
+ <ng-template #nzTabHeading>{{alarmData.title}}������</ng-template>
<div nz-row>
<div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="16">
<div class="bar">
- <bar height="295" [title]="'������������������������'" [data]="data.alarmData" color="purple"></bar>
+ <bar height="295" [title]="alarmData.title+'������������������'" [data]="alarmData.data" color="{{alarmData.color}}"></bar>
</div>
</div>
<div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="8">
@@ -123,86 +123,11 @@
<h4 class="rank-title">������������������</h4>
<ul>
<li *ngFor="let i of rankingListData; let idx = index">
- <div>
+ <div *ngIf="idx < 7">
<span class="icon" [ngClass]="{'active': idx < 3}">{{idx+1}}</span>
{{i.title}}
</div>
- <span>{{i.total | number: '1.0'}}</span>
- </li>
- </ul>
- </div>
- </div>
- </div>
- </nz-tab>
-
- <nz-tab>
- <ng-template #nzTabHeading>������������</ng-template>
- <div nz-row>
- <div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="16">
- <div class="bar">
- <bar height="295" [title]="'������������������������'" [data]="data.alarmData_1" color="yellow"></bar>
- </div>
- </div>
- <div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="8">
- <div class="rank-list">
- <h4 class="rank-title">������������������</h4>
- <ul>
- <li *ngFor="let i of rankingListData; let idx = index">
- <div>
- <span class="icon" [ngClass]="{'active': idx < 3}">{{idx+1}}</span>
- {{i.title}}
- </div>
- <span>{{i.total | number: '1.0'}}</span>
- </li>
- </ul>
- </div>
- </div>
- </div>
- </nz-tab>
-
- <nz-tab>
- <ng-template #nzTabHeading>������������</ng-template>
- <div nz-row>
- <div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="16">
- <div class="bar">
- <bar height="295" [title]="'������������������������'" [data]="data.alarmData_2" color="orange"></bar>
- </div>
- </div>
- <div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="8">
- <div class="rank-list">
- <h4 class="rank-title">������������������</h4>
- <ul>
- <li *ngFor="let i of rankingListData; let idx = index">
- <div>
- <span class="icon" [ngClass]="{'active': idx < 3}">{{idx+1}}</span>
- {{i.title}}
- </div>
- <span>{{i.total | number: '1.0'}}</span>
- </li>
- </ul>
- </div>
- </div>
- </div>
- </nz-tab>
-
- <nz-tab>
- <ng-template #nzTabHeading>������������</ng-template>
- <div nz-row>
- <div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="16">
- <div class="bar">
- <bar height="295" [title]="'������������������������'" [data]="data.alarmData_3" color="red"></bar>
- </div>
- </div>
- <div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="8">
- <div class="rank-list">
- <h4 class="rank-title">������������������</h4>
- <ul>
- <li *ngFor="let i of rankingListData; let idx = index">
- <div>
- <span class="icon" [ngClass]="{'active': idx < 3}">{{idx+1}}</span>
- {{i.title}}
- </div>
- <span>{{i.total | number: '1.0'}}</span>
+ <span *ngIf="idx < 7">{{i.total | number: '1.0'}}</span>
</li>
</ul>
</div>
--
Gitblit v1.8.0