Merge remote-tracking branch 'origin/develop' into develop

沈斌

2018-03-13 9c9b8250b973eea72f6970e1ceb46facca9f0a99

 src/app/routes/analysis/analysis.module.ts

@@ -7,6 +7,10 @@
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 +26,10 @@
    PipeModule,
    CommonModule,
    SharedModule,
    NgxEchartsModule,
    RouterModule.forChild(routes)    
  ],
  declarations: [QueryComponent],
  providers: [SensorsService, AreacodeService, MonitorPointService]
  providers: [SensorsService, NzMessageService, AreacodeService, MonitorPointService, DeviceService, DateService]
})
export class AnalysisModule { }