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

fengxiang

2018-07-13 3d49dbbd9a5e15d14fc0a4388b17c19c0ac2e5f7

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

@@ -15,6 +15,9 @@

import { ForecastingWarningComponent } from './forecasting-warning/forecasting-warning.component';
import { PollutionManagementComponent } from 'app/routes/pollution/management/management.component';
import { MonitorpointComponent } from 'app/routes/statistics/monitorpoint/monitorpoint.component';
import { CalendarComponent } from 'app/routes/statistics/calendar/calendar.component';
import { AnalysisComponent } from 'app/routes/statistics/analysis/analysis.component';

const routes: Routes = [
    {
@@ -38,7 +41,11 @@
            { path: 'reports', loadChildren: './reports/reports.module#ReportsModule' },

            { path: 'forecasting-warning', component: ForecastingWarningComponent },
            { path: 'pollution/management', component: PollutionManagementComponent }
            { path: 'pollution/management', component: PollutionManagementComponent },

            { path: 'statistics/monitorpoint', component: MonitorpointComponent },
            { path: 'statistics/calendar', component: CalendarComponent },
            { path: 'statistics/analysis', component: AnalysisComponent }
        ]
    },    // passport
    {