From a52dc7a6e7119d575c611f9c2800649dff029f5e Mon Sep 17 00:00:00 2001 From: fengxiang <110431245@qq.com> Date: Wed, 27 Jun 2018 09:29:25 +0800 Subject: [PATCH] 大屏布局 --- src/app/routes/systems/systems.module.ts | 31 ++++++++++++++++++++++--------- 1 files changed, 22 insertions(+), 9 deletions(-) diff --git a/src/app/routes/systems/systems.module.ts b/src/app/routes/systems/systems.module.ts index 7c14ab3..e3e7ba5 100644 --- a/src/app/routes/systems/systems.module.ts +++ b/src/app/routes/systems/systems.module.ts @@ -5,22 +5,29 @@ import { CommonModule } from '@angular/common'; import { RouterModule, Routes } from '@angular/router'; import { SharedModule } from '@shared/shared.module'; - import { AccountComponent } from './account/account.component'; import { AccountEditComponent } from './account/account-edit/account-edit.component'; import { OrganizationComponent } from './organization/organization.component'; -import { PipeModule } from '@core/pipe/pipe.module'; +import { PipeModule } from '@business/pipe/pipe.module'; import { OrganizationEditComponent } from './organization/organization-edit/organization-edit.component'; -import { ToolsService } from '@core/services/tools.service'; -import { OrganizationService } from 'app/routes/systems/organization/organization.service'; -import { AreacodeService } from '@core/services/areacode.service'; +import { ToolsService } from '@business/services/util/tools.service'; +import { OrganizationService } from '@business/services/http/organization.service'; +import { AreacodeService } from '@business/services/http/areacode.service'; +import { OrganizationConfigComponent } from './organization/organization-config/organization-config.component'; +import { OrganizationListComponent } from './organization/organization-list/organization-list.component'; +import { RegistrationComponent } from './registration/registration.component'; +import { SensorsService } from '@business/services/http/sensors.service'; +import { BusinessModule } from '@business/business.module'; +import { OrganizationConfigScreenComponent } from './organization/organization-config-screen/organization-config-screen.component'; +import { OrganizationConfigUnitComponent } from './organization/organization-config-unit/organization-config-unit.component'; const routes: Routes = [ { path: '', children: [ { path: 'account', component: AccountComponent }, - { path: 'organization', component: OrganizationComponent } + { path: 'organization', component: OrganizationComponent }, + { path: 'registration', component: RegistrationComponent } ] } ]; @@ -33,15 +40,21 @@ PipeModule, CommonModule, SharedModule, - RouterModule.forChild(routes) + RouterModule.forChild(routes), + BusinessModule ], declarations: [ ...COMPONENTS_NOROUNT, AccountComponent, AccountEditComponent, - OrganizationComponent + OrganizationComponent, + OrganizationConfigComponent, + OrganizationListComponent, + OrganizationConfigScreenComponent, + OrganizationConfigUnitComponent, + RegistrationComponent ], - providers: [ToolsService, OrganizationService, _HttpClient, FormBuilder, AreacodeService], + providers: [ToolsService, SensorsService, OrganizationService, _HttpClient, FormBuilder, AreacodeService], entryComponents: COMPONENTS_NOROUNT }) export class SystemsModule { } -- Gitblit v1.8.0