From 780f76a3e8dd68abe6b007006f85a76991ea2c54 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 16 Apr 2018 13:40:28 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/dashboard/workplace/workplace.component.html | 39 ++-------------------------------------
1 files changed, 2 insertions(+), 37 deletions(-)
diff --git a/src/app/routes/dashboard/workplace/workplace.component.html b/src/app/routes/dashboard/workplace/workplace.component.html
index 3d08c8c..b9901ed 100644
--- a/src/app/routes/dashboard/workplace/workplace.component.html
+++ b/src/app/routes/dashboard/workplace/workplace.component.html
@@ -38,7 +38,7 @@
</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">
<ng-template #action1>
@@ -89,7 +89,7 @@
</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>
@@ -292,41 +292,6 @@
</nz-card>
</div>
</div>
-<nz-card [nzLoading]="loading" [nzBordered]="false" [nzBodyStyle]="{'padding': '0 0 32px'}" class="offline-card mt-lg">
- <ng-template #body>
- <nz-tabset [(nzSelectedIndex)]="_activeTab" (nzSelectChange)="_tabChange($event)">
- <nz-tab *ngFor="let tab of data.offlineData; let i = index;">
- <ng-template #nzTabHeading>
- <div nz-row [nzGutter]="8" style="width: 138px; margin: 8px 0">
- <div nz-col [nzSpan]="12">
- <number-info
- [title]="tab.name"
- subTitle="���������"
- gap="2"
- [total]="(tab.cvr * 100) + '%'"
- [theme]="i !== _activeTab && 'light'"></number-info>
- </div>
- <div nz-col [nzSpan]="12" style="padding-top: 36px">
- <pie
- [animate]="false"
- [color]="i !== _activeTab && '#BDE4FF'"
- [inner]="0.55"
- [tooltip]="false"
- [padding]="[0, 0, 0, 0]"
- [percent]="tab.cvr * 100"
- [height]="64">
- </pie>
- </div>
- </div>
- </ng-template>
- <div class="px-lg">
- <timeline [data]="tab.chart"
- [titleMap]="{ y1: '���������', y2: '������������' }"></timeline>
- </div>
- </nz-tab>
- </nz-tabset>
- </ng-template>
-</nz-card>
<div nz-row [nzGutter]="24">
<div nz-col nzXs="24" nzSm="24" nzMd="16">
--
Gitblit v1.8.0