Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_demo2

fengxiang

2018-07-31 a2bd66a59a51c84100474d1ce3eb79d7ed3b754e

Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_demo2

 src/app/routes/forecasting-warning/forecasting-warning.component.ts

@@ -88,7 +88,7 @@
        };

        return [

          params[0].value[0],

          '风速：' + params[0].value[1] + '节',

          '风速：' + params[0].value[1],

          '风向：' + directionName[params[0].value[2]]

        ].join('<br>');

      }

@@ -98,7 +98,7 @@
      boundaryGap: true

    },

    yAxis: {

      name: '风速（节）'

      name: '风速（m/s）'

    },

    series: [

      {


 src/app/routes/raise-dust/image-grabbing/image-grabbing.component.html

New file
@@ -0,0 +1,4 @@
<div class="content__title">

    <h1>Page Name</h1>

</div>

<pro-header [title]="'Page Name'"></pro-header>


 src/app/routes/raise-dust/image-grabbing/image-grabbing.component.ts

New file
@@ -0,0 +1,17 @@
import { Component, OnInit } from '@angular/core';

import { _HttpClient } from '@delon/theme';



@Component({

  selector: 'app-image-grabbing',

  templateUrl: './image-grabbing.component.html',

})

export class ImageGrabbingComponent implements OnInit {



    constructor(

        private http: _HttpClient

    ) { }



    ngOnInit() {

    }



}


 src/app/routes/raise-dust/real-time/real-time.component.html

New file
@@ -0,0 +1,4 @@
<div class="content__title">

    <h1>Page Name</h1>

</div>

<pro-header [title]="'Page Name'"></pro-header>


 src/app/routes/raise-dust/real-time/real-time.component.ts

New file
@@ -0,0 +1,17 @@
import { Component, OnInit } from '@angular/core';

import { _HttpClient } from '@delon/theme';



@Component({

  selector: 'app-real-time',

  templateUrl: './real-time.component.html',

})

export class RealTimeComponent implements OnInit {



    constructor(

        private http: _HttpClient

    ) { }



    ngOnInit() {

    }



}


 src/app/routes/raise-dust/statistical-query/statistical-query.component.html

New file
@@ -0,0 +1,4 @@
<div class="content__title">

    <h1>Page Name</h1>

</div>

<pro-header [title]="'Page Name'"></pro-header>


 src/app/routes/raise-dust/statistical-query/statistical-query.component.ts

New file
@@ -0,0 +1,17 @@
import { Component, OnInit } from '@angular/core';

import { _HttpClient } from '@delon/theme';



@Component({

  selector: 'app-statistical-query',

  templateUrl: './statistical-query.component.html',

})

export class StatisticalQueryComponent implements OnInit {



    constructor(

        private http: _HttpClient

    ) { }



    ngOnInit() {

    }



}


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

@@ -17,8 +17,11 @@
import { PollutionManagementComponent } from 'app/routes/pollution/management/management.component';
import { EnvironmentManagementComponent } from 'app/routes/environment/management/management.component';
import { GridTraceComponent } from './grid-trace/grid-trace.component';
import { ImageGrabbingComponent } from './raise-dust/image-grabbing/image-grabbing.component';
import { SandTableComponent } from './sand-table/sand-table.component';
import { RaiseDustComponent } from './raise-dust/raise-dust.component';
import { RealTimeComponent } from './raise-dust/real-time/real-time.component';
import { StatisticalQueryComponent } from './raise-dust/statistical-query/statistical-query.component';

const routes: Routes = [
    {
@@ -46,6 +49,9 @@
            },
            { path: 'sand-table', component: SandTableComponent },
            { path: 'raise-dust', component: RaiseDustComponent },
            { path: 'raise-dust/real-time', component: RealTimeComponent },
            { path: 'raise-dust/statistical-query', component: StatisticalQueryComponent },
            { path: 'raise-dust/image-grabbing', component: ImageGrabbingComponent },
        ]
    },    // passport
    {

 src/app/routes/routes.module.ts

@@ -36,6 +36,9 @@
import { GridTraceComponent } from './grid-trace/grid-trace.component';
import { RaiseDustComponent } from './raise-dust/raise-dust.component';
import { SandTableComponent } from './sand-table/sand-table.component';
import { RealTimeComponent } from './raise-dust/real-time/real-time.component';
import { StatisticalQueryComponent } from './raise-dust/statistical-query/statistical-query.component';
import { ImageGrabbingComponent } from './raise-dust/image-grabbing/image-grabbing.component';

@NgModule({
    imports: [ SharedModule, RouteRoutingModule ],
@@ -54,7 +57,10 @@
        EnvironmentManagementComponent,
        GridTraceComponent,
        RaiseDustComponent,
        SandTableComponent
        SandTableComponent,
        RealTimeComponent,
        StatisticalQueryComponent,
        ImageGrabbingComponent
    ],
    providers: [
        _HttpClient,

 src/assets/app-data.json

@@ -97,12 +97,23 @@
            {
              "text": "扬尘监控",
              "icon": "icon-flag",
              "link": "/sand-table"
              "children":[
                {
                  "text": "实时监控和警告",
                  "link": "/raise-dust/real-time"
                },{
                  "text": "统计查询和分析",
                  "link": "/raise-dust/statistical-query"
                },{
                  "text": "图像抓拍",
                  "link": "/raise-dust/image-grabbing"
                }
              ]
            },
            {
              "text": "会商沙盘",
              "icon": "icon-people",
              "link": "/raise-dust"
              "link": "/sand-table"
            }
          ]
        }