Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into...

fengxiang

2018-03-20 a1c7c8f01bc80853b0b591bbb1742e7be9c72f5c

 src/app/routes/systems/organization/organization-list/organization-list.component.ts

@@ -93,8 +93,8 @@
    public msgSrv: NzMessageService,
    private modalHelper: ModalHelper,
    private router: Router,
    private sensorsService:SensorsService,
    private alarmConfigService:AlarmConfigService,
    private sensorsService: SensorsService,
    private alarmConfigService: AlarmConfigService,
  ) {}

  ngOnInit() {
@@ -216,14 +216,14 @@
          this.grid.loading = true;
         }, 1);
    zip(
      this.sensorsService.getPagingList({pageIndex:0,pageSize:0}, null),
      this.sensorsService.getPagingList({pageIndex: 0, pageSize: 0}, null),
      this.alarmConfigService.getByOid( row.id )
    ).subscribe(([pageBean, resultBean]) => {
      console.log(pageBean);
      this.grid.loading = false;
      this.organizationService.handle = 'config' ;
      this.organizationService.data = row;
      this.organizationService.config = {pageBean,resultBean};
      this.organizationService.config = {pageBean, resultBean};
      this.organizationService.title = '组织配置';
    });
  }