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

fengxiang

2018-07-13 ef5b73ea0b7aed593312f728638d84b5358458ae

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

@@ -18,6 +18,7 @@
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';
import { EnvironmentManagementComponent } from 'app/routes/environment/management/management.component';

const routes: Routes = [
    {
@@ -45,7 +46,9 @@

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

            { path: 'environment/management', component: EnvironmentManagementComponent }
        ]
    },    // passport
    {