From 76cbed01cef406f686c2349e8fc8c01de00a4868 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 31 Jul 2018 11:09:57 +0800
Subject: [PATCH] 添加返回按钮

---
 src/app/routes/forecasting-warning/forecasting-warning.component.html |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/app/routes/forecasting-warning/forecasting-warning.component.html b/src/app/routes/forecasting-warning/forecasting-warning.component.html
index ef02380..02a081a 100644
--- a/src/app/routes/forecasting-warning/forecasting-warning.component.html
+++ b/src/app/routes/forecasting-warning/forecasting-warning.component.html
@@ -11,7 +11,7 @@
 
 </nz-card>
 
-<div nz-row >
+<div nz-row [ngStyle]="{'display':isShow ? 'block' : 'none'}">
 	<div nz-col [nzSpan]="12"><div id="warning_PM25" style="height: 300px; width: 100%"></div></div>
 	<div nz-col [nzSpan]="12"><div id="warning_PM10" style="height: 300px; width: 100%"></div></div>
 	<div nz-col [nzSpan]="12"><div id="warning_CO" style="height: 300px; width: 100%"></div></div>
@@ -20,10 +20,16 @@
 	<div nz-col [nzSpan]="12"><div id="warning_SO2" style="height: 300px; width: 100%"></div></div>
 </div>
 
-<div nz-row [ngStyle]="{'display':'none' }">
-	<!--  -->
+<div nz-row [ngStyle]="{'display':isShow ? 'none' : 'block'}">
+	<!-- 24������ -->
 	<div nz-col [nzSpan]="12"><div id="forecasting_temp" style="height: 300px; width: 100%"></div></div>
 	<div nz-col [nzSpan]="12"><div id="forecasting_humidity" style="height: 300px; width: 100%"></div></div>
 	<div nz-col [nzSpan]="12"><div id="forecasting_pressure" style="height: 300px; width: 100%"></div></div>
 	<div nz-col [nzSpan]="12"><div id="forecasting_uvi" style="height: 300px; width: 100%"></div></div>
+	<div nz-col [nzSpan]="12"><div id="forecasting_wind" style="height: 300px; width: 100%"></div></div>
+
+	<!-- 15��� -->
+	<div nz-col [nzSpan]="12"><div id="forecasting_temp_day" style="height: 300px; width: 100%"></div></div>
+	<!-- <div nz-col [nzSpan]="12"><div id="forecasting_uvi" style="height: 300px; width: 100%"></div></div> -->
+
 </div>

--
Gitblit v1.8.0