From 032ca75e238cc2f2a96b3bf27532b5a243d9a24a Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 13 Mar 2018 16:00:41 +0800
Subject: [PATCH] 工作台数据统计页面

---
 src/app/routes/dashboard/workplace/workplace.component.html |   36 +++++++++++-------------------------
 1 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/src/app/routes/dashboard/workplace/workplace.component.html b/src/app/routes/dashboard/workplace/workplace.component.html
index 027af1a..3d08c8c 100644
--- a/src/app/routes/dashboard/workplace/workplace.component.html
+++ b/src/app/routes/dashboard/workplace/workplace.component.html
@@ -113,7 +113,7 @@
                 <div nz-row>
                     <div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="16">
                         <div class="bar">
-                            <bar height="295" [title]="'2018���������������������������'" [data]="data.alarmData" color="purple"></bar>
+                            <bar height="295" [title]="'������������������������'" [data]="data.alarmData" color="purple"></bar>
                         </div>
                     </div>
                     <div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="8">
@@ -138,7 +138,7 @@
                 <div nz-row>
                     <div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="16">
                         <div class="bar">
-                            <bar height="295" [title]="'2018���������������������������'" [data]="data.alarmData" color="yellow"></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">
@@ -163,7 +163,7 @@
                 <div nz-row>
                     <div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="16">
                         <div class="bar">
-                            <bar height="295" [title]="'2018���������������������������'" [data]="data.alarmData" color="orange"></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">
@@ -188,7 +188,7 @@
                 <div nz-row>
                     <div nz-col nzXs="24" nzSm="24" nzMd="12" nzLg="16">
                         <div class="bar">
-                            <bar height="295" [title]="'2018���������������������������'" [data]="data.alarmData" color="red"></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">
@@ -272,36 +272,22 @@
         </nz-card>
     </div>
     <div nz-col nzXs="24" nzSm="24" nzMd="24" nzLg="12">
-        <nz-card [nzLoading]="loading" [nzBordered]="false" nzTitle="���������������������" [nzBodyStyle]="{'padding.px': 24}" class="sales-card" style="min-height: 482px;">
+        <nz-card [nzLoading]="loading" [nzBordered]="false" nzTitle="������������������" [nzBodyStyle]="{'padding.px': 24}" class="sales-card" style="min-height: 482px;">
             <ng-template #extra>
                 <div class="sales-card-extra">
-                    <nz-dropdown>
-                        <nz-icon class="icon-group" nz-dropdown nzType="ellipsis"></nz-icon>
-                        <ul nz-menu>
-                            <li nz-menu-item>���������</li>
-                            <li nz-menu-item>���������</li>
-                        </ul>
-                    </nz-dropdown>
                     <div class="sales-type-radio">
                         <nz-radio-group [(ngModel)]="salesType" (ngModelChange)="changeSaleType()" [nzSize]="'large'">
-                            <label nz-radio-button [nzValue]="'all'"><span>������������</span></label>
-                            <label nz-radio-button [nzValue]="'online'"><span>������</span></label>
-                            <label nz-radio-button [nzValue]="'offline'"><span>������</span></label>
+                            <label nz-radio-button [nzValue]="'0'"><span>������</span></label>
+                            <label nz-radio-button [nzValue]="'1'"><span>������</span></label>
+                            <label nz-radio-button [nzValue]="'2'"><span>������</span></label>
+                            <label nz-radio-button [nzValue]="'3'"><span>������</span></label>
                         </nz-radio-group>
                     </div>
                 </div>
             </ng-template>
             <ng-template #body>
-                <h4 class="margin:8px 0 32px 0;">���������</h4>
-                <pie
-                    [hasLegend]="true"
-                    subTitle="���������"
-                    [height]="248"
-                    [lineWidth]="4"
-                    [total]="salesTotal"
-                    [data]="salesPieData"
-                    [valueFormat]="handlePieValueFormat">
-                </pie>
+                <h4 class="margin:8px 0 32px 0;">������������</h4>
+                <pie [hasLegend]="true" subTitle="������������" [height]="248" [lineWidth]="4" [total]="salesTotal" [data]="salesPieData" [valueFormat]="handlePieValueFormat"></pie>
             </ng-template>
         </nz-card>
     </div>

--
Gitblit v1.8.0