From 655edbc7405188c4bb32e63bf52a9a31ac00d75c Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 12 Jul 2018 10:26:45 +0800
Subject: [PATCH] home-page
---
src/app/routes/home-page/home-page/home-page.component.ts | 31 +++++++++++++++
src/app/routes/routes.ts | 6 ++
src/app/routes/home-page/home-page-routing.module.ts | 11 +++++
src/app/routes/home-page/home-page/home-page.component.less | 0
.angulardoc.json | 4 ++
src/app/routes/home-page/home-page.module.ts | 11 +++++
src/app/routes/home-page/home-page/home-page.component.html | 37 ++++++++++++++++++
7 files changed, 99 insertions(+), 1 deletions(-)
diff --git a/.angulardoc.json b/.angulardoc.json
new file mode 100644
index 0000000..2e20cf5
--- /dev/null
+++ b/.angulardoc.json
@@ -0,0 +1,4 @@
+{
+ "repoId": "618725ce-edd5-4e4a-bc7a-dec9a2bfd5ba",
+ "lastSync": 0
+}
\ No newline at end of file
diff --git a/src/app/routes/home-page/home-page-routing.module.ts b/src/app/routes/home-page/home-page-routing.module.ts
new file mode 100644
index 0000000..5601a76
--- /dev/null
+++ b/src/app/routes/home-page/home-page-routing.module.ts
@@ -0,0 +1,11 @@
+import { NgModule } from "@angular/core";
+import { HomePageComponent } from "./home-page/home-page.component";
+import { Routes, RouterModule } from "@angular/router";
+
+const routes: Routes = [{ path: "", component: HomePageComponent }];
+
+@NgModule({
+ imports: [RouterModule.forChild(routes)],
+ exports: [RouterModule]
+})
+export class HomePageRoutingModule {}
diff --git a/src/app/routes/home-page/home-page.module.ts b/src/app/routes/home-page/home-page.module.ts
new file mode 100644
index 0000000..a3adbbb
--- /dev/null
+++ b/src/app/routes/home-page/home-page.module.ts
@@ -0,0 +1,11 @@
+import { NgModule } from "@angular/core";
+import { Routes, RouterModule } from "@angular/router";
+import { SharedModule } from "@shared/shared.module";
+import { HomePageRoutingModule } from "./home-page-routing.module";
+import { HomePageComponent } from "./home-page/home-page.component";
+
+@NgModule({
+ imports: [SharedModule, HomePageRoutingModule],
+ declarations: [HomePageComponent]
+})
+export class HomePageModule {}
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
new file mode 100644
index 0000000..1e5a9bf
--- /dev/null
+++ b/src/app/routes/home-page/home-page/home-page.component.html
@@ -0,0 +1,37 @@
+<div class="content__title">
+ <h1>������������������</h1>
+</div>
+<div nz-row [nzGutter]="24" class="pt-lg">
+ <div nz-col nzXs="24" nzSm="12" nzMd="6" class="mb-md">
+ <div nz-row nzType="flex" nzAlign="middle" class="bg-primary rounded-md">
+ <div nz-col nzSpan="24" class="p-md text-white" style="text-align: center;">
+ <div class="h2 mt0">123,456</div>
+ <p class="text-nowrap mb0">AQI</p>
+ </div>
+ </div>
+ </div>
+ <div nz-col nzXs="24" nzSm="12" nzMd="6" class="mb-md">
+ <div nz-row nzType="flex" nzAlign="middle" class="bg-success rounded-md">
+ <div nz-col nzSpan="24" class="p-md text-white" style="text-align: center;">
+ <div class="h2 mt0">123,456</div>
+ <p class="text-nowrap mb0">������</p>
+ </div>
+ </div>
+ </div>
+ <div nz-col nzXs="24" nzSm="12" nzMd="6" class="mb-md">
+ <div nz-row nzType="flex" nzAlign="middle" class="bg-orange rounded-md">
+ <div nz-col nzSpan="24" class="p-md text-white" style="text-align: center;">
+ <div class="h2 mt0">123,456</div>
+ <p class="text-nowrap mb0">������</p>
+ </div>
+ </div>
+ </div>
+ <div nz-col nzXs="24" nzSm="12" nzMd="6" class="mb-md">
+ <div nz-row nzType="flex" nzAlign="middle" class="bg-magenta rounded-md">
+ <div nz-col nzSpan="24" class="p-md text-white" style="text-align: center;">
+ <div class="h2 mt0">123,456</div>
+ <p class="text-nowrap mb0">PM2.5</p>
+ </div>
+ </div>
+ </div>
+</div>
diff --git a/src/app/routes/home-page/home-page/home-page.component.less b/src/app/routes/home-page/home-page/home-page.component.less
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/app/routes/home-page/home-page/home-page.component.less
diff --git a/src/app/routes/home-page/home-page/home-page.component.ts b/src/app/routes/home-page/home-page/home-page.component.ts
new file mode 100644
index 0000000..d52b29f
--- /dev/null
+++ b/src/app/routes/home-page/home-page/home-page.component.ts
@@ -0,0 +1,31 @@
+import { Component, OnInit } from "@angular/core";
+import { _HttpClient } from "@delon/theme";
+import { zip } from 'rxjs/observable/zip';
+
+@Component({
+ selector: "app-home-page",
+ templateUrl: "./home-page.component.html",
+ styleUrls: ["./home-page.component.less"]
+})
+export class HomePageComponent implements OnInit {
+ public cardData: {'api'?:number,'temperature'?:number,'windDirection'?: string,'pm2.5'?: number}
+ = {};
+ constructor(
+ private http:_HttpClient,
+ ) {
+ }
+
+ ngOnInit() {
+ zip(
+ this.http.get('http://sapi.7drlb.com/api/mj?cityID=1102&apiKey=condition'),
+ this.http.get('http://sapi.7drlb.com/api/mj?cityID=1102&apiKey=aqi')
+
+ ).subscribe(
+ ([conRes,aqiRes]) => {
+ debugger;
+ console.log(conRes);
+ console.log(aqiRes);
+ }
+ )
+ }
+}
diff --git a/src/app/routes/routes.ts b/src/app/routes/routes.ts
index 8bfbb54..53cb27a 100644
--- a/src/app/routes/routes.ts
+++ b/src/app/routes/routes.ts
@@ -23,7 +23,11 @@
path: '',
component: LayoutComponent,
children: [
- { path: '', redirectTo: 'dashboard/v1', pathMatch: 'full' },
+ { path: "", redirectTo: "home-page", pathMatch: "full" },
+ {
+ path: "home-page",
+ loadChildren: "./home-page/home-page.module#HomePageModule"
+ },
{ path: 'dashboard', redirectTo: 'dashboard/v1', pathMatch: 'full' },
{ path: 'dashboard/v1', component: DashboardV1Component, data: { translate: 'dashboard_v1' } },
{ path: 'dashboard/analysis', component: DashboardAnalysisComponent, data: { translate: 'dashboard_analysis' } },
--
Gitblit v1.8.0