From f320f1970e5d80a423f377fb3253628bd1e7f5bf Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Thu, 08 Mar 2018 15:10:46 +0800
Subject: [PATCH] Merge branch 'develop' of ssh://121.40.92.176:29418/screen-frontend into develop
---
src/app/routes/users/users.module.ts | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/app/routes/users/users.module.ts b/src/app/routes/users/users.module.ts
index 859a284..2852962 100644
--- a/src/app/routes/users/users.module.ts
+++ b/src/app/routes/users/users.module.ts
@@ -4,17 +4,21 @@
import { RouterModule, Routes } from '@angular/router';
import { SharedModule } from '@shared/shared.module';
-import { ReceiverComponent } from './receiver/receiver.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: [
@@ -24,7 +28,10 @@
],
declarations: [
InstallerComponent,
- ReceiverComponent
- ]
+ ...COMPONENTS_NOROUNT,
+ AlarmUserComponent,
+ AlarmUserEditComponent
+ ],
+ entryComponents: COMPONENTS_NOROUNT
})
export class UsersModule { }
--
Gitblit v1.8.0