From 7f93b01660cae23d38e9fa8083fe24a952b7ef4c Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 13 Jul 2018 14:37:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/app/routes/home-page/home-page/home-page.component.html | 70 ++++++++++++++++++++++++++++++-----
1 files changed, 60 insertions(+), 10 deletions(-)
diff --git a/src/app/routes/home-page/home-page/home-page.component.html b/src/app/routes/home-page/home-page/home-page.component.html
index 2b8d1c7..7c145d7 100644
--- a/src/app/routes/home-page/home-page/home-page.component.html
+++ b/src/app/routes/home-page/home-page/home-page.component.html
@@ -96,14 +96,64 @@
</div>
</div>
<div nz-row [nzGutter]="24" class="pt-lg">
- <div nz-col nzXs="24" nzMd="12">
- <nz-card [nzBordered]="false">
- <!-- <div echarts style="margin-top: 12px;" [options]="chartOption" [loading]="aqiChartLoading" class="line-chart" (chartInit)="onApiChartInit($event)"></div> -->
- </nz-card>
- </div>
- <div nz-col nzXs="24" nzMd="12">
- <nz-card [nzBordered]="false">
- 22222222222
- </nz-card>
- </div>
+ <div nz-col style="display: block;" nzXs="24" nzMd="24">
+ <nz-card [nzBordered]="false">
+ <ng-template #title>
+ ������������������
+ <nz-dropdown>
+ <a class="ant-dropdown-link" nz-dropdown>
+ PM2.5 <i class="anticon anticon-down"></i>
+ </a>
+ <ul nz-menu>
+ <li nz-menu-item>
+ PM10
+ </li>
+ <li nz-menu-item>
+ ������������
+ </li>
+ <li nz-menu-item>
+ ������������
+ </li>
+ <li nz-menu-item>
+ ������������
+ </li>
+ <li nz-menu-item>
+ ������
+ </li>
+ </ul>
+ </nz-dropdown>
+ </ng-template>
+ <div echarts style="margin-top: 12px;" class="line-chart" [options]="aqiChartOption" [loading]="aqiChartLoading" (chartInit)="onApiChartInit($event)"></div>
+ </nz-card>
+ </div>
</div>
+ <div nz-row [nzGutter]="24" class="pt-lg">
+ <div nz-col style="display: block;" nzXs="24" nzMd="24">
+ <nz-card [nzBordered]="false">
+ <ng-template #title>
+ ������������
+ <nz-dropdown>
+ <a class="ant-dropdown-link" nz-dropdown>
+ ������<i class="anticon anticon-down"></i>
+ </a>
+ <ul nz-menu>
+ <li nz-menu-item>
+ ������
+ </li>
+ <li nz-menu-item>
+ ������
+ </li>
+ <li nz-menu-item>
+ ������
+ </li>
+ <li nz-menu-item>
+ ������
+ </li>
+ </ul>
+ </nz-dropdown>
+ </ng-template>
+ <div echarts style="margin-top: 12px;" class="line-chart" [options]="meteChartOption" [loading]="meteChartLoading" (chartInit)="onMeteChartInit($event)"></div>
+ </nz-card>
+ </div>
+ </div>
+
--
Gitblit v1.8.0