From 1bf1750a2c2cafdbd7413fe18d16915a7f71ff52 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 05 Jul 2018 11:54:46 +0800
Subject: [PATCH] 设备保存bug修复
---
src/app/routes/systems/organization/organization-list/organization-list.component.ts | 59 +++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 49 insertions(+), 10 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..3cce5b9 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
@@ -1,11 +1,11 @@
import { AlarmConfigService } from '@business/services/http/alarm-config.service';
import { SensorsService } from '@business/services/http/sensors.service';
import { Router } from '@angular/router';
-import { ModalHelper } from '@delon/theme';
+import { ModalHelper, _HttpClient } from '@delon/theme';
import { NzModalService, NzMessageService } from 'ng-zorro-antd';
import { OrganizationService } from '@business/services/http/organization.service';
-import { Grid, Column, PageBean } from '@business/entity/grid';
-import { Organization } from '@business/entity/data';
+import { Grid, Column, PageBean, ResultBean } from '@business/entity/grid';
+import { Organization, OrganizationSensorUnit } from '@business/entity/data';
import { Component, OnInit } from '@angular/core';
import { Subject } from 'rxjs/Subject';
import { Types } from '@business/enum/types.enum';
@@ -93,8 +93,9 @@
public msgSrv: NzMessageService,
private modalHelper: ModalHelper,
private router: Router,
- private sensorsService:SensorsService,
- private alarmConfigService:AlarmConfigService,
+ private sensorsService: SensorsService,
+ private alarmConfigService: AlarmConfigService,
+ private http: _HttpClient
) {}
ngOnInit() {
@@ -210,21 +211,59 @@
}
this.load();
}
- config(row) {
+ configAlarm(row) {
// ������������������ExpressionChangedAfterItHasBeenCheckedError
setTimeout(() => {
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.title = '������������';
+ this.organizationService.config = {pageBean, resultBean};
+ this.organizationService.title = '������������������';
});
}
+ configScreenLayout(row) {
+ // ������������������ExpressionChangedAfterItHasBeenCheckedError
+ setTimeout(() => {
+ this.grid.loading = true;
+ }, 1);
+ this.http.get('org-layout/rtd-config', {orgId: row.id}).subscribe(
+ (res: ResultBean<any>) => {
+ if ( res.code > 0 ) {
+ this.grid.loading = false;
+ this.organizationService.handle = 'screen' ;
+ this.organizationService.data = row;
+ this.organizationService.config['resultBean'] = res;
+ console.log(res);
+ this.organizationService.title = '������������������';
+ }
+ }
+ );
+ }
+ configShowUnit(row) {
+ // ������������������ExpressionChangedAfterItHasBeenCheckedError
+ setTimeout(() => {
+ this.grid.loading = true;
+ }, 1);
+ this.http.get('org-sunit/gets-byoid', {orgId: row.id}).subscribe(
+ (res: ResultBean<any>) => {
+ if ( res.code > 0 ) {
+ this.grid.loading = false;
+ this.organizationService.handle = 'unit' ;
+ this.organizationService.data = row;
+ this.organizationService.config['resultBean'] = res;
+ console.log(res);
+ this.organizationService.title = '������������������';
+ }
+ }
+ );
+ }
+ registration(row) {
+ sessionStorage.setItem('organization', JSON.stringify(row));
+ }
}
--
Gitblit v1.8.0