From 7d210afd7f9beccae57f5d234fbbb5dc3e07f435 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 30 Jul 2018 09:06:23 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_demo2
---
src/app/routes/forecasting-warning/forecasting-warning.component.html | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/src/app/routes/forecasting-warning/forecasting-warning.component.html b/src/app/routes/forecasting-warning/forecasting-warning.component.html
index 5baeb28..02a081a 100644
--- a/src/app/routes/forecasting-warning/forecasting-warning.component.html
+++ b/src/app/routes/forecasting-warning/forecasting-warning.component.html
@@ -2,12 +2,34 @@
<h1>������������������������</h1>
</div>
<nz-card [nzBordered]="false">
-<div class="sales-type-radio">
- <nz-radio-group >
- <label nz-radio-button [nzValue]="'warning'"><span>������</span></label>
- <label nz-radio-button [nzValue]="'forecasting'"><span>������</span></label>
- </nz-radio-group>
-</div>
+ <div class="sales-type-radio">
+ <nz-radio-group [(ngModel)]="type" (ngModelChange)="changeType($event)">
+ <label nz-radio-button [nzValue]="'warning'"><span>������</span></label>
+ <label nz-radio-button [nzValue]="'forecasting'"><span>������</span></label>
+ </nz-radio-group>
+ </div>
</nz-card>
-<nz-card [nzBordered]="false"></nz-card>
+
+<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>
+ <div nz-col [nzSpan]="12"><div id="warning_NO2" style="height: 300px; width: 100%"></div></div>
+ <div nz-col [nzSpan]="12"><div id="warning_O3" style="height: 300px; width: 100%"></div></div>
+ <div nz-col [nzSpan]="12"><div id="warning_SO2" style="height: 300px; width: 100%"></div></div>
+</div>
+
+<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