From e91e87b7b86e8d1d66caeab727a3cdc68fdc09ef Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 03 Aug 2018 16:56:41 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_demo2
---
src/app/routes/environment/management/management.component.html | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/app/routes/environment/management/management.component.html b/src/app/routes/environment/management/management.component.html
index 0f40300..b6ca37f 100644
--- a/src/app/routes/environment/management/management.component.html
+++ b/src/app/routes/environment/management/management.component.html
@@ -22,8 +22,10 @@
<ng-template #nzTitle>
������������
<small class="text-sm font-weight-normal"></small>
+ <span class="text-md font-weight-normal" style="color:red">PM2.5</span>
</ng-template>
- <timeline [data]="offlineChartData" [height]="239" [padding]="[0, 0, 0, 0]" [titleMap]="{ y1: '������������', y2: '������������' }"></timeline>
+ <div id="PM25" style="height: 300px; width: 100%"></div>
+ <!-- <timeline [data]="offlineChartData" [height]="239" [padding]="[0, 0, 0, 0]" [titleMap]="{ y1: '������������', y2: '������������' }"></timeline> -->
</nz-card>
</div>
</div>
--
Gitblit v1.8.0