From 309d1f9d649daa08bb9b068af014749f6d4a5bce Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 06 Jul 2018 14:00:45 +0800
Subject: [PATCH] 设备和监控点父页面 筛选条件不予 编辑页面联动
---
src/app/routes/devices/basic-info/basic-info.component.ts | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 50 insertions(+), 9 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 3494c41..3833c79 100644
--- a/src/app/routes/devices/basic-info/basic-info.component.ts
+++ b/src/app/routes/devices/basic-info/basic-info.component.ts
@@ -2,17 +2,17 @@
import { CoorPicker, Device } from '@business/entity/data';
import { AdjustConfigComponent } from './adjust-config/adjust-config.component';
import { DeviceEditComponent } from './device-edit/device-edit.component';
-import { ModalHelper } from '@delon/theme';
+import { ModalHelper, _HttpClient } from '@delon/theme';
import { NzModalService, NzMessageService } from 'ng-zorro-antd';
import { PageBean, ResultBean } from '@business/entity/grid';
import { DeviceService } from '@business/services/http/device.service';
import { Component, OnInit, ElementRef, ViewChild } from '@angular/core';
-import { SimpleTableColumn } from '@delon/abc';
+import { SimpleTableColumn, SimpleTableComponent } from '@delon/abc';
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';
+import { ExampleService, Criteria } from '@business/services/util/example.service';
@Component({
selector: 'app-basic-info',
@@ -63,7 +63,7 @@
}
];
queryTextStream: Subject<string> = new Subject<string>();
- private queryMap: {orgId?: number, mpointId?: number, devMacOrName?: string}
+ public queryMap: {orgId?: number, mpointId?: number, devMacOrName?: string}
= {orgId: null, mpointId: null, devMacOrName: ''};
extraParams = { queryParams: null };
public orgOptions = [];
@@ -75,7 +75,8 @@
public msgSrv: NzMessageService,
private modalHelper: ModalHelper,
private coorPickerService: CoorPickerService,
- private organizationService: OrganizationService
+ private organizationService: OrganizationService,
+ private http: _HttpClient
) { }
ngOnInit() {
@@ -115,9 +116,48 @@
});
}
load() {
- this.extraParams.queryParams = this.deviceService.getSqlParams(this.queryMap);
+ const example = this.initQueryExample();
+ this.extraParams.queryParams = example.getSqlParam();
this.selectedRows = [];
- this.simpleTable.load();
+ this.deviceService.countByExample(example).subscribe(
+ res => {
+ if (!!res && !!res.code) {
+ const count = res.data;
+ const pages = Math.ceil(count / this.simpleTable.ps);
+ const pi = this.simpleTable.pi > pages ? pages : this.simpleTable.pi;
+ this.simpleTable.load(pi);
+ }
+ }
+ );
+
+ }
+ private initQueryExample() {
+ const example = new ExampleService();
+ const orgId = !!this.queryMap.orgId ? this.queryMap.orgId : null;
+ const mpointId = !!this.queryMap.mpointId ? this.queryMap.mpointId : null;
+ const devMacOrName = !!this.queryMap.devMacOrName && !!(<string>this.queryMap.devMacOrName).trim() ? this.queryMap.devMacOrName : null;
+ let criWithMac: Criteria = null;
+ let criWithName: Criteria = null;
+ if (!!devMacOrName) {
+ criWithName = example.or().andLike({name: 'name', value: '%' + devMacOrName + '%'});
+ criWithMac = example.or().andLike({name: 'mac', value: '%' + devMacOrName + '%'});
+ }
+ if (!!mpointId) {
+ if (!!devMacOrName) {
+ criWithName.andEqualTo({name: 'monitorPointId', value: mpointId});
+ criWithMac.andEqualTo({name: 'monitorPointId', value: mpointId});
+ }else {
+ example.or().andEqualTo({name: 'monitorPointId', value: mpointId});
+ }
+ } else if (!!orgId) {
+ if (!!devMacOrName) {
+ criWithName.andCondition(`monitor_point_id in (select id from monitor_point where organization_id = ${orgId})`);
+ criWithMac.andCondition(`monitor_point_id in (select id from monitor_point where organization_id = ${orgId})`);
+ }else {
+ example.or().andCondition(`monitor_point_id in (select id from monitor_point where organization_id = ${orgId})`);
+ }
+ }
+ return example;
}
delete(...id: number[]) {
this.deviceService.delete(...id).subscribe(
@@ -129,7 +169,7 @@
}
);
}
- @ViewChild('simpleTable') simpleTable: { load: Function };
+ @ViewChild('simpleTable') simpleTable: SimpleTableComponent;
queryTextChanged(event) {
this.queryTextStream.next(this.queryText);
}
@@ -138,7 +178,8 @@
if (d != null) {
Object.assign(data, d);
}
- const configMap = this.queryMap;
+ let configMap = {};
+ configMap = Object.assign(configMap, this.queryMap);
// Object.assign(configMap, this.queryMap);
if (!!configMap['mpointId'] && !d['monitorPoint']) {
data['monitorPoint'] = this.getMonitorPoint(configMap['mpointId']);
--
Gitblit v1.8.0