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/devices/basic-info/basic-info.component.ts | 87 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 72 insertions(+), 15 deletions(-)
diff --git a/src/app/routes/devices/basic-info/basic-info.component.ts b/src/app/routes/devices/basic-info/basic-info.component.ts
index 1d5b1c4..43c8723 100644
--- a/src/app/routes/devices/basic-info/basic-info.component.ts
+++ b/src/app/routes/devices/basic-info/basic-info.component.ts
@@ -11,6 +11,8 @@
import { Subject } from 'rxjs/Subject';
import { CoordinatesPickerComponent } from 'app/routes/map/coordinates-picker/coordinates-picker.component';
import { CoorPickerService } from 'app/routes/map/coordinates-picker/coordinates-picker.service';
+import { OrganizationService } from '@business/services/http/organization.service';
+import { ExampleService } from '@business/services/util/example.service';
@Component({
selector: 'app-basic-info',
@@ -61,13 +63,19 @@
}
];
queryTextStream: Subject<string> = new Subject<string>();
+ public queryMap: {orgId?: number, mpointId?: number, devMacOrName?: string}
+ = {orgId: null, mpointId: null, devMacOrName: ''};
+ extraParams = { queryParams: null };
+ public orgOptions = [];
+ public monitorPoints = [];
constructor(
private monitorPointService: MonitorPointService,
private deviceService: DeviceService,
private confirmServ: NzModalService,
public msgSrv: NzMessageService,
private modalHelper: ModalHelper,
- private coorPickerService: CoorPickerService
+ private coorPickerService: CoorPickerService,
+ private organizationService: OrganizationService
) { }
ngOnInit() {
@@ -75,14 +83,14 @@
.debounceTime(900)
.distinctUntilChanged()
.subscribe(value => {
- this.extraParams.queryParams = this.deviceService.getSqlParams(value);
+ this.queryMap.devMacOrName = value;
this.load();
});
+ this.orgSelectChange();
}
get listUrl() {
return this.deviceService.getListUrl();
}
- extraParams = { queryParams: null };
queryText: string;
selectedRows: any[] = [];
checkboxChange(list: any[]) {
@@ -107,6 +115,7 @@
});
}
load() {
+ this.extraParams.queryParams = this.deviceService.getSqlParams(this.queryMap);
this.selectedRows = [];
this.simpleTable.load();
}
@@ -129,7 +138,12 @@
if (d != null) {
Object.assign(data, d);
}
- this.modalHelper.static(DeviceEditComponent, { data }).subscribe(
+ const configMap = this.queryMap;
+ // Object.assign(configMap, this.queryMap);
+ if (!!configMap['mpointId'] && !d['monitorPoint']) {
+ data['monitorPoint'] = this.getMonitorPoint(configMap['mpointId']);
+ }
+ this.modalHelper.static(DeviceEditComponent, { data, configMap }).subscribe(
(ret: { data: any, close: Function }) => {
// ������������
if (ret.data['id'] != null) {
@@ -157,36 +171,42 @@
);
});
}
+ private getMonitorPoint(mpointId: number) {
+ return this.monitorPoints.find(
+ mpoint => mpoint.id === mpointId
+ );
+ }
configCoord(record: Device): void {
- //������ ��������������� ������������������
- if((!!record.latitude||!!record.longitude)&&!!record.monitorPointId){
+ // ������������������������������������������adress������������
+ Object.assign(this.coorPickerService.data, record);
+ this.coorPickerService.data['describe'] = '������������';
+ // ������ ��������������� ������������������
+ if ((!record.latitude || !record.longitude) && !!record.monitorPointId) {
this.monitorPointService.getEntity(record.monitorPointId).subscribe(
res => {
if (res != null && res.code === 1 && res.data != null) {
const areaNames = res.data.areaNames;
let adress = '';
if (areaNames != null) {
- adress += !!areaNames.provinceName?areaNames.provinceName:'';
+ adress += !!areaNames.provinceName ? areaNames.provinceName : '';
adress += ' ';
- adress += !!areaNames.cityName?areaNames.cityName:'';
+ adress += !!areaNames.cityName ? areaNames.cityName : '';
adress += ' ';
- adress += !!areaNames.areaName?areaNames.areaName:'';
+ adress += !!areaNames.areaName ? areaNames.areaName : '';
adress += ' ';
- adress += !!res.data.address?res.data.address:'';
+ adress += !!res.data.address ? res.data.address : '';
}
this.coorPickerService.data.address = adress;
this.openMap(record);
}
}
);
- }else{
+ } else {
this.openMap(record);
}
}
- private openMap(record: Device){
- Object.assign(this.coorPickerService.data, record);
- const _data = this.coorPickerService.data;
- this.coorPickerService.data['describe'] = '������������';
+ private openMap(record: Device) {
+ const _data = this.coorPickerService.data;
this.modalHelper.static(CoordinatesPickerComponent).subscribe(
(staticComp) => {
const data: Device = {
@@ -206,4 +226,41 @@
}
);
}
+ public setOrgId(orgId) {
+ this.queryMap.orgId = orgId;
+ this.queryMap.mpointId = null;
+ // this.queryMap.devMacOrName = null;
+ this.monitorPointChange();
+ this.load();
+ }
+ public setMpointId(mpointId) {
+ this.queryMap.mpointId = mpointId;
+ this.load();
+ }
+ orgSelectChange(text?: string) {
+ const pageBean: PageBean = {pageIndex: 0, pageSize: 20};
+ this.organizationService.getPagingList(pageBean, text).subscribe(
+ (res: PageBean) => {
+ if (res != null && res.data != null) {
+ this.orgOptions = res.data;
+ }
+ }
+ );
+ }
+ monitorPointChange(text?: string) {
+ const pageBean: PageBean = {pageIndex: 0, pageSize: 20};
+ const example = new ExampleService();
+ const organizationId = !!this.queryMap.orgId ? this.queryMap.orgId : null;
+ const mpointName = !!text ? '%' + text + '%' : null;
+ example.or()
+ .andEqualTo({name: 'organizationId', value: organizationId })
+ .andLike({name: 'name', value: mpointName });
+ this.monitorPointService.getPageByExample(pageBean, example).subscribe(
+ (res: PageBean) => {
+ if (res != null && res.data != null) {
+ this.monitorPoints = res.data;
+ }
+ }
+ );
+ }
}
--
Gitblit v1.8.0