From f320f1970e5d80a423f377fb3253628bd1e7f5bf Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Thu, 08 Mar 2018 15:10:46 +0800
Subject: [PATCH] Merge branch 'develop' of ssh://121.40.92.176:29418/screen-frontend into develop
---
src/app/routes/systems/organization/organization-list/organization-list.component.ts | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/app/routes/systems/organization/organization-list/organization-list.component.ts b/src/app/routes/systems/organization/organization-list/organization-list.component.ts
index eb79a20..abe84f8 100644
--- a/src/app/routes/systems/organization/organization-list/organization-list.component.ts
+++ b/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 = '������������';
});
}
--
Gitblit v1.8.0