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

fengxiang

2018-07-31 a2bd66a59a51c84100474d1ce3eb79d7ed3b754e

 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
    {