From e3f745b1839f3c3c8be58efb7b81681f4f2d2e4c Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 02 Feb 2018 10:30:33 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/sensors/sensors.module.ts | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/app/routes/sensors/sensors.module.ts b/src/app/routes/sensors/sensors.module.ts
index 73e08a1..440d5e9 100644
--- a/src/app/routes/sensors/sensors.module.ts
+++ b/src/app/routes/sensors/sensors.module.ts
@@ -1,7 +1,13 @@
+import { SensorsService } from '@business/services/http/sensors.service';
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { BasicInfoComponent } from './basic-info/basic-info.component';
import {RouterModule, Routes} from '@angular/router';
+import { PipeModule } from '@business/pipe/pipe.module';
+import { SharedModule } from '@shared/shared.module';
+import { _HttpClient } from '@delon/theme/services/http/http.client';
+import { FormBuilder } from '@angular/forms';
+import { SensorEditComponent } from './basic-info/sensor-edit/sensor-edit.component';
const routes: Routes = [
{
@@ -11,12 +17,20 @@
]
}
];
-
+const COMPONENTS_NOROUNT = [SensorEditComponent];
@NgModule({
imports: [
+ // ������������������������������������
+ PipeModule,
CommonModule,
+ SharedModule,
RouterModule.forChild(routes)
],
- declarations: [BasicInfoComponent]
+ declarations: [
+ BasicInfoComponent,
+ SensorEditComponent
+ ],
+ providers: [SensorsService, _HttpClient, FormBuilder],
+ entryComponents: COMPONENTS_NOROUNT
})
export class SensorsModule { }
--
Gitblit v1.8.0