From 2d4cbcc4f92edbc4f926d9710bdda64520039c2b Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 05 Jan 2018 11:21:44 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/users/users.module.ts | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/app/routes/users/users.module.ts b/src/app/routes/users/users.module.ts
index d82f4af..0981a93 100644
--- a/src/app/routes/users/users.module.ts
+++ b/src/app/routes/users/users.module.ts
@@ -4,18 +4,21 @@
import { RouterModule, Routes } from '@angular/router';
import { SharedModule } from '@shared/shared.module';
-import { ReceiverComponent } from './receiver/receiver.component';
-import { EditComponent } from './installer/edit/edit.component';
+import { UserInstallerEditComponent } from './installer/edit/edit.component';
+import { AlarmUserComponent } from './alarm-user/alarm-user.component';
+import { AlarmUserEditComponent } from './alarm-user/alarm-user-edit/alarm-user-edit.component';
const routes: Routes = [
{
path: '',
children: [
{ path: 'installer', component: InstallerComponent },
- { path: 'receiver', component: ReceiverComponent }
+ { path: 'alarm-user', component: AlarmUserComponent }
]
}
];
+
+const COMPONENTS_NOROUNT = [ UserInstallerEditComponent,AlarmUserEditComponent ];
@NgModule({
imports: [
@@ -25,8 +28,10 @@
],
declarations: [
InstallerComponent,
- ReceiverComponent,
- EditComponent
- ]
+ ...COMPONENTS_NOROUNT,
+ AlarmUserComponent,
+ AlarmUserEditComponent
+ ],
+ entryComponents: COMPONENTS_NOROUNT
})
export class UsersModule { }
--
Gitblit v1.8.0