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/devices/devices.module.ts | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/app/routes/devices/devices.module.ts b/src/app/routes/devices/devices.module.ts
index 3e17229..e65f3b7 100644
--- a/src/app/routes/devices/devices.module.ts
+++ b/src/app/routes/devices/devices.module.ts
@@ -1,3 +1,4 @@
+import { MonitorPointService } from 'app/routes/devices/monitor-point/monitor-point.service';
import { ToolsService } from './../../core/services/tools.service';
import { NgModule } from '@angular/core';
@@ -10,11 +11,12 @@
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 { 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';
-const COMPONENTS_NOROUNT = [ AddOrEditComponent ];
+const COMPONENTS_NOROUNT = [ VersionEditComponent, MonitorPointEditComponent ];
const routes: Routes = [
{
@@ -39,9 +41,9 @@
BasicInfoComponent,
VersionComponent,
MonitorPointComponent,
- ...COMPONENTS_NOROUNT
+ ...COMPONENTS_NOROUNT
],
- providers: [ToolsService, VersionService, _HttpClient, FormBuilder],
+ providers: [ToolsService, VersionService, MonitorPointService, _HttpClient, FormBuilder],
entryComponents: COMPONENTS_NOROUNT
})
export class DevicesModule { }
--
Gitblit v1.8.0