Merge remote-tracking branch 'origin/develop' into develop

沈斌

2018-02-02 18df46f1bbdf5f3aa29aedb828ae2bc9d33e0f90

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

@@ -10,6 +10,7 @@
import { DashboardAnalysisComponent } from './dashboard/analysis/analysis.component';
import { DashboardMonitorComponent } from './dashboard/monitor/monitor.component';
import { DashboardWorkplaceComponent } from './dashboard/workplace/workplace.component';
import { UserLoginComponent } from 'app/routes/passport/login/login.component';


const routes: Routes = [
@@ -29,8 +30,15 @@
            { path: 'sensors', loadChildren: './sensors/sensors.module#SensorsModule' },
            { path: 'systems', loadChildren: './systems/systems.module#SystemsModule' },
        ]
    },    // passport
    {
        path: 'passport',
        component: LayoutPassportComponent,
        children: [
            { path: 'login', component: UserLoginComponent }
        ]
    },
    { path: '**', redirectTo: 'dashboard' }
    { path: '**', redirectTo: 'passport/login' }
];

@NgModule({