From 309d1f9d649daa08bb9b068af014749f6d4a5bce Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 06 Jul 2018 14:00:45 +0800
Subject: [PATCH] 设备和监控点父页面 筛选条件不予 编辑页面联动
---
src/app/routes/systems/systems.module.ts | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/src/app/routes/systems/systems.module.ts b/src/app/routes/systems/systems.module.ts
index 0418569..e3e7ba5 100644
--- a/src/app/routes/systems/systems.module.ts
+++ b/src/app/routes/systems/systems.module.ts
@@ -1,35 +1,60 @@
+import { FormBuilder } from '@angular/forms';
+import { _HttpClient } from '@delon/theme';
import { Component, OnInit } from '@angular/core';
import { NgModule } from '@angular/core';
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 '@business/pipe/pipe.module';
+import { OrganizationEditComponent } from './organization/organization-edit/organization-edit.component';
+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: 'account', component: AccountComponent },
+ { path: 'organization', component: OrganizationComponent },
+ { path: 'registration', component: RegistrationComponent }
]
}
];
-const COMPONENTS_NOROUNT = [ AccountEditComponent ];
+const COMPONENTS_NOROUNT = [ AccountEditComponent, OrganizationEditComponent ];
@NgModule({
imports: [
+ // ������������������������������������
+ PipeModule,
CommonModule,
SharedModule,
- RouterModule.forChild(routes)
+ RouterModule.forChild(routes),
+ BusinessModule
],
declarations: [
...COMPONENTS_NOROUNT,
AccountComponent,
- AccountEditComponent
-
+ AccountEditComponent,
+ OrganizationComponent,
+ OrganizationConfigComponent,
+ OrganizationListComponent,
+ OrganizationConfigScreenComponent,
+ OrganizationConfigUnitComponent,
+ RegistrationComponent
],
+ providers: [ToolsService, SensorsService, OrganizationService, _HttpClient, FormBuilder, AreacodeService],
entryComponents: COMPONENTS_NOROUNT
})
export class SystemsModule { }
--
Gitblit v1.8.0