提交

fengxiang

2018-07-11 1a30ba4211462589698d26688ec24319e48b740c

提交

 package.json

@@ -21,7 +21,6 @@
    "scaffold"
  ],
  "scripts": {
    "precommit": "npm run lint-staged",
    "ng": "ng",
    "start": "ng serve -o",
    "hmr": "ng serve -c=hmr",

 src/app/app.module.ts

@@ -8,8 +8,8 @@
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';

import { DelonModule } from './delon.module';
import { CoreModule } from './core/core.module';
import { SharedModule } from './shared/shared.module';
import { CoreModule } from '@core/core.module';
import { SharedModule } from '@shared/shared.module';
import { AppComponent } from './app.component';
import { RoutesModule } from './routes/routes.module';
import { LayoutModule } from './layout/layout.module';

 src/app/routes/home-page/home-page.component.html

New file
@@ -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>

 src/app/routes/home-page/home-page.component.less

 src/app/routes/home-page/home-page.component.ts

New file
@@ -0,0 +1,36 @@
import { Component, OnInit } from "@angular/core";
import { _HttpClient } from "@delon/theme";
import { zip } from "rxjs";

@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(
    //   (value) => {
    //     debugger;
    //     console.log(value);
    //     // console.log(aqiRes);
    //     }
    //  )
    this.http.get('/user-context').subscribe(
      res => {
         console.log(res);
      }
    );
  }
}

 src/app/routes/routes-routing.module.ts

@@ -20,6 +20,7 @@
import { Exception403Component } from './exception/403.component';
import { Exception404Component } from './exception/404.component';
import { Exception500Component } from './exception/500.component';
import { HomePageComponent } from './home-page/home-page.component';

const routes: Routes = [
  {
@@ -29,6 +30,7 @@
      { path: '', redirectTo: 'dashboard/v1', pathMatch: 'full' },
      { path: 'dashboard', redirectTo: 'dashboard/v1', pathMatch: 'full' },
      { path: 'dashboard/v1', component: DashboardV1Component },
      { path: 'home-page', component: HomePageComponent },
      { path: 'dashboard/analysis', component: DashboardAnalysisComponent },
      { path: 'dashboard/monitor', component: DashboardMonitorComponent },
      { path: 'dashboard/workplace', component: DashboardWorkplaceComponent },

 src/app/routes/routes.module.ts

@@ -17,6 +17,7 @@
import { Exception403Component } from './exception/403.component';
import { Exception404Component } from './exception/404.component';
import { Exception500Component } from './exception/500.component';
import { HomePageComponent } from './home-page/home-page.component';

const COMPONENTS = [
  DashboardV1Component,
@@ -32,7 +33,9 @@
  CallbackComponent,
  Exception403Component,
  Exception404Component,
  Exception500Component
  Exception500Component,
  // moral pages
  HomePageComponent
];
const COMPONENTS_NOROUNT = [];


 src/app/routes/widgets/widgets/widgets.component.ts

@@ -55,6 +55,11 @@
  dislike = false;

  constructor(public msg: NzMessageService, private http: _HttpClient) {
    this.http.get('/user-context').subscribe(
      res => {
         console.log(res);
      }
    );
    this.http.get('/chart/visit').subscribe((res: any[]) => {
      this.data = res;
      this.smallData = res.slice(0, 6);