Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_demo2

fengxiang

2018-07-31 a2bd66a59a51c84100474d1ce3eb79d7ed3b754e

 src/app/routes/statistics/statistics.module.ts

@@ -9,6 +9,7 @@
import { CalendarComponent } from './calendar/calendar.component';
import { MonitorpointComponent } from './monitorpoint/monitorpoint.component';
import { NzCalendarModule } from 'ng-zorro-antd';
import { AqiDetailComponent } from './calendar/aqi-detail/aqi-detail.component';

const routes: Routes = [
  {
@@ -21,7 +22,9 @@
  }
];

const COMPONENT_NOROUNT = [];
const COMPONENT_NOROUNT = [
  AqiDetailComponent,
];

@NgModule({
  imports: [
@@ -38,7 +41,7 @@
      ...COMPONENT_NOROUNT,
      AnalysisComponent,
      CalendarComponent,
      MonitorpointComponent
      MonitorpointComponent,
  ],
  entryComponents: COMPONENT_NOROUNT
})