From 36c5eeab117846d64aa632ca30ef7ac15ef20a27 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 19 Mar 2018 16:44:14 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/analysis/analysis.module.ts | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/app/routes/analysis/analysis.module.ts b/src/app/routes/analysis/analysis.module.ts
index eef181a..ac2b40e 100644
--- a/src/app/routes/analysis/analysis.module.ts
+++ b/src/app/routes/analysis/analysis.module.ts
@@ -1,12 +1,17 @@
import { MonitorPointService } from '@business/services/http/monitor-point.service';
import { AreacodeService } from '@business/services/http/areacode.service';
import { SensorsService } from '@business/services/http/sensors.service';
+import { NzTreeModule } from 'ng-tree-antd';
import { PipeModule } from '@business/pipe/pipe.module';
import { NgModule } from '@angular/core';
import { SharedModule } from '@shared/shared.module';
import { QueryComponent } from './query/query.component';
import { Routes, RouterModule } from '@angular/router';
import { CommonModule } from '@angular/common';
+import { DeviceService } from '@business/services/http/device.service';
+import { NgxEchartsModule } from 'ngx-echarts';
+import { DateService } from '@business/services/util/date.service';
+import { NzMessageService } from 'ng-zorro-antd';
const routes: Routes = [
{
path: '',
@@ -22,9 +27,11 @@
PipeModule,
CommonModule,
SharedModule,
+ NzTreeModule,
+ NgxEchartsModule,
RouterModule.forChild(routes)
],
declarations: [QueryComponent],
- providers: [SensorsService, AreacodeService, MonitorPointService]
+ providers: [SensorsService, NzMessageService, AreacodeService, MonitorPointService, DeviceService, DateService]
})
export class AnalysisModule { }
--
Gitblit v1.8.0