From b05438694c2fb9d4c8b1b22f4481639ff0f35963 Mon Sep 17 00:00:00 2001 From: xufenglei <xufenglei> Date: Mon, 07 May 2018 15:16:38 +0800 Subject: [PATCH] 三级警报数据 --- src/app/routes/dashboard/workplace/workplace.component.html | 30 ++++++++++++++++-------------- 1 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/app/routes/dashboard/workplace/workplace.component.html b/src/app/routes/dashboard/workplace/workplace.component.html index b9901ed..8b5dcdf 100644 --- a/src/app/routes/dashboard/workplace/workplace.component.html +++ b/src/app/routes/dashboard/workplace/workplace.component.html @@ -21,7 +21,7 @@ <p>8<span> / 24</span></p> </div> <div> - <p>���������</p> + <p>������������</p> <p>20</p> </div> <!-- @@ -40,7 +40,8 @@ <div nz-row [nzGutter]="24" class="pt-lg" style="margin-top: -24px;"> <div nz-col nzXs="24" nzSm="12" nzMd="12" nzLg="6"> - <chart-card [title]="'���������������'" total="{{totalDeviceCount | number: '1.0'}}" contentHeight="46px" [action]="action1" [footer]="footer1"> + <chart-card [title]="'���������������'" total="{{totalDeviceCount | number: '1.0'}}" contentHeight="46px" [action]="action1" [footer]="footer1" + [loading]="deviceCountLoading"> <ng-template #action1> <nz-tooltip [nzTitle]="'���������������������������������������������������������'"> <nz-icon nz-tooltip nzType="info-circle-o"></nz-icon> @@ -57,23 +58,24 @@ </chart-card> </div> <div nz-col nzXs="24" nzSm="12" nzMd="12" nzLg="6"> - <chart-card [title]="'������������������'" total="78%" contentHeight="46px" [action]="action2" [footer]="footer2"> + <chart-card [title]="'������������������'" [total]="operNormalPercent + '%'" contentHeight="46px" [action]="action2" [footer]="footer2" + [loading] = "operationLoading"> <ng-template #action2> <nz-tooltip [nzTitle]="'������������������������������������������������������'"> <nz-icon nz-tooltip nzType="info-circle-o"></nz-icon> </nz-tooltip> </ng-template> - <mini-progress height="46" percent="78" strokeWidth="8" target="80" color="#13C2C2"></mini-progress> + <mini-progress height="46" [percent]="operNormalPercent" strokeWidth="8" target="80" color="#13C2C2"></mini-progress> <ng-template #footer2> <div class="d-flex justify-content-between"> - <trend flag="up">���������<span class="pl-sm">8%</span></trend> - <trend flag="down">���������<span class="pl-sm">2%</span></trend> + <trend flag="up">������������<span class="pl-sm">8%</span></trend> + <trend flag="down">������������<span class="pl-sm">2%</span></trend> </div> </ng-template> </chart-card> </div> <div nz-col nzXs="24" nzSm="12" nzMd="12" nzLg="6"> - <chart-card [title]="'������������'" total="2,847" contentHeight="46px" [action]="action3" [footer]="footer3"> + <chart-card [title]="'������������������'" [total]="alarmCountCurrMonth" [loading]="alarmCountLoading" contentHeight="46px" [action]="action3" [footer]="footer3"> <ng-template #action3> <nz-tooltip [nzTitle]="'���������������������������������������������'"> <nz-icon nz-tooltip nzType="info-circle-o"></nz-icon> @@ -82,9 +84,9 @@ <mini-area color="#975FE4" height="46" - [data]="data.visitData"></mini-area> + [data]="alarmCountList"></mini-area> <ng-template #footer3> - <p class="text-truncate">������������������:<span class="ml-sm">1,234</span></p> + <p class="text-truncate">������������������:<span class="ml-sm">{{ alarmCountCurrDay }}</span></p> </ng-template> </chart-card> </div> @@ -107,13 +109,13 @@ </div> <nz-card [nzLoading]="loading" [nzBordered]="false" nzNoPadding class="sales-card"> <ng-template #body> - <nz-tabset> + <nz-tabset (nzSelectedIndexChange)=selectedIndexChange($event) > <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" color="purple"></bar> + <bar height="295" [title]="'������������������������'" [data]="alarmData._0" color="purple"></bar> </div> </div> <div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="8"> @@ -138,7 +140,7 @@ <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> + <bar height="295" [title]="'������������������������'" [data]="alarmData._1" color="yellow"></bar> </div> </div> <div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="8"> @@ -163,7 +165,7 @@ <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> + <bar height="295" [title]="'������������������������'" [data]="alarmData._2" color="orange"></bar> </div> </div> <div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="8"> @@ -188,7 +190,7 @@ <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> + <bar height="295" [title]="'������������������������'" [data]="alarmData._3" color="red"></bar> </div> </div> <div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="8"> -- Gitblit v1.8.0