From 3405a42d4434bb77026c029ed20f2898ba665107 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 11 Jan 2018 09:25:50 +0800
Subject: [PATCH] 框架升级
---
src/app/routes/devices/devices.module.ts | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/app/routes/devices/devices.module.ts b/src/app/routes/devices/devices.module.ts
index efa7913..9ad3e5b 100644
--- a/src/app/routes/devices/devices.module.ts
+++ b/src/app/routes/devices/devices.module.ts
@@ -1,5 +1,8 @@
-
-import { ToolsService } from './../../core/services/tools.service';
+import { SensorsService } from '@business/services/http/sensors.service';
+import { OrganizationService } from '@business/services/http/organization.service';
+import { MonitorPointService } from '@business/services/http/monitor-point.service';
+import { VersionService } from '@business/services/http/version.service';
+import { AreacodeService } from '@business/services/http/areacode.service';
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { BasicInfoComponent } from './basic-info/basic-info.component';
@@ -7,13 +10,15 @@
import { MonitorPointComponent } from './monitor-point/monitor-point.component';
import {RouterModule, Routes} from '@angular/router';
import { SharedModule } from '@shared/shared.module';
-import { VersionService } from 'app/routes/devices/version/version.service';
import { Version } from '@angular/compiler/src/util';
import { _HttpClient } from '@delon/theme/services/http/http.client';
-import { AddOrEditComponent } from './version/add-or-edit/add-or-edit.component';
-import { PipeModule } from '@core/pipe/pipe.module';
+import { PipeModule } from '@business/pipe/pipe.module';
+import { FormBuilder } from '@angular/forms';
+import { VersionEditComponent } from './version/version-edit/version-edit.component';
+import { MonitorPointEditComponent } from './monitor-point/monitor-point-edit/monitor-point-edit.component';
+import { VersionSensorConfigComponent } from './version/version-sensor-config/version-sensor-config.component';
-const COMPONENTS_NOROUNT = [ AddOrEditComponent ];
+const COMPONENTS_NOROUNT = [ VersionEditComponent, MonitorPointEditComponent, VersionSensorConfigComponent ];
const routes: Routes = [
{
@@ -28,7 +33,7 @@
@NgModule({
imports: [
- //������������������������������������
+ // ������������������������������������
PipeModule,
CommonModule,
SharedModule,
@@ -38,10 +43,11 @@
BasicInfoComponent,
VersionComponent,
MonitorPointComponent,
- ...COMPONENTS_NOROUNT,
- AddOrEditComponent
+ ...COMPONENTS_NOROUNT
],
- providers: [ToolsService, VersionService, _HttpClient],
+ providers: [OrganizationService, VersionService,
+ SensorsService, AreacodeService, MonitorPointService,
+ _HttpClient, FormBuilder],
entryComponents: COMPONENTS_NOROUNT
})
export class DevicesModule { }
--
Gitblit v1.8.0