From 27bd4a08bf807f4f6132bb524da33490b6d22f87 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 19 Jun 2018 11:45:11 +0800
Subject: [PATCH] 省市区兼容旧版本
---
src/app/routes/dashboard/workplace/workplace.component.html | 111 +++++++++----------------------------------------------
1 files changed, 19 insertions(+), 92 deletions(-)
diff --git a/src/app/routes/dashboard/workplace/workplace.component.html b/src/app/routes/dashboard/workplace/workplace.component.html
index af9599e..5566b14 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>
<!--
@@ -38,9 +38,10 @@
</ng-template>
</pro-header>
-<div nz-row [nzGutter]="24" class="pt-lg" style="margin-top: -24px">
+<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,14 +84,14 @@
<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>
<div nz-col nzXs="24" nzSm="12" nzMd="12" nzLg="6">
- <chart-card [title]="'���������������'" total="1,260" contentHeight="46px" [action]="action4" [footer]="footer4">
+ <chart-card [title]="'������������������'" total="1,260" contentHeight="46px" [action]="action4" [footer]="footer4">
<ng-template #action4>
<nz-tooltip [nzTitle]="'������������������������������������������������'">
<nz-icon nz-tooltip nzType="info-circle-o"></nz-icon>
@@ -107,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">
@@ -121,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