From 37942aefeb8986a97c0310a9fe3fe2d613519dab Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Tue, 31 Jul 2018 14:47:41 +0800
Subject: [PATCH] 风速单位调整
---
src/app/routes/statistics/analysis/analysis.component.html | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/app/routes/statistics/analysis/analysis.component.html b/src/app/routes/statistics/analysis/analysis.component.html
index 471c02b..f863b3f 100644
--- a/src/app/routes/statistics/analysis/analysis.component.html
+++ b/src/app/routes/statistics/analysis/analysis.component.html
@@ -1,16 +1,16 @@
<div nz-row [nzGutter]="24" class="pt-lg">
<div nz-col nzXs="24" nzSm="12" nzMd="12" nzLg="8">
- <chart-card [title]="'API������������'" total="216���" contentHeight="46px">
+ <chart-card [title]="'AQI������������'" total="112���" contentHeight="46px">
<mini-progress height="46" percent="60" target="60" strokeWidth="8" color="#13C2C2"></mini-progress>
</chart-card>
</div>
<div nz-col nzXs="24" nzSm="12" nzMd="12" nzLg="8">
- <chart-card [title]="'PM2.5������������'" total="158���" contentHeight="46px">
+ <chart-card [title]="'PM2.5������������'" total="148���" contentHeight="46px">
<mini-progress height="46" percent="50" target="50" strokeWidth="8" color="#108ee9"></mini-progress>
</chart-card>
</div>
<div nz-col nzXs="24" nzSm="12" nzMd="12" nzLg="8">
- <chart-card [title]="'PM10������������'" total="112���" contentHeight="46px">
+ <chart-card [title]="'PM10������������'" total="156���" contentHeight="46px">
<mini-progress height="46" percent="40" target="40" strokeWidth="8" color="#00a854"></mini-progress>
</chart-card>
</div>
@@ -23,7 +23,8 @@
������������
<span class="text-md font-weight-normal" style="color:red">PM2.5</span>
</ng-template>
- <timeline [data]="offlineChartData1" [height]="239" [padding]="[0, 0, 0, 0]" [titleMap]="{ y1: '������������', y2: '������������' }"></timeline>
+ <!-- <timeline [data]="offlineChartData1" [height]="239" [padding]="[0, 0, 0, 0]" [titleMap]="{ y1: '������������', y2: '������������' }"></timeline> -->
+ <div id="PM25" style="height: 300px; width: 100%"></div>
</nz-card>
</div>
</div>
@@ -35,7 +36,8 @@
������������
<span class="text-md font-weight-normal" style="color:red">PM10</span>
</ng-template>
- <timeline [data]="offlineChartData2" [height]="239" [padding]="[0, 0, 0, 0]" [titleMap]="{ y1: '������������', y2: '������������' }"></timeline>
+ <div id="PM10" style="height: 300px; width: 100%"></div>
+ <!-- <timeline [data]="offlineChartData2" [height]="239" [padding]="[0, 0, 0, 0]" [titleMap]="{ y1: '������������', y2: '������������' }"></timeline> -->
</nz-card>
</div>
</div>
--
Gitblit v1.8.0