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/device-edit/device-edit.component.ts | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/app/routes/devices/basic-info/device-edit/device-edit.component.ts b/src/app/routes/devices/basic-info/device-edit/device-edit.component.ts
index 26d687b..2c35a62 100644
--- a/src/app/routes/devices/basic-info/device-edit/device-edit.component.ts
+++ b/src/app/routes/devices/basic-info/device-edit/device-edit.component.ts
@@ -7,7 +7,6 @@
import { DeviceService } from '@business/services/http/device.service';
import { Component, OnInit } from '@angular/core';
import { Device, MonitorPoint} from '@business/entity/data';
-import { _Validators } from '@delon/abc';
import { PageBean, ResultBean } from '@business/entity/grid';
import { _HttpClient } from '@delon/theme';
import { environment } from '@env/environment';
@@ -44,7 +43,7 @@
orgId: number = null;
validateForm: FormGroup;
ngOnInit() {
- console.log(this.configMap);
+ // console.log(this.configMap);
if (!!this.data) {
Object.assign(this.originalData, this.data);
}
@@ -67,8 +66,8 @@
const validates: Device = {
name: [data.name, [Validators.required]],
mac: [data.mac, [Validators.required], [this.macAsyncValidator]],
- deviceVersionId: [data.deviceVersionId],
- monitorPointId: [data.monitorPointId],
+ deviceVersionId: [data.deviceVersionId, [Validators.required]],
+ monitorPointId: [data.monitorPointId, [Validators.required]],
professionId: [data.professionId],
operateUserId: [data.operateUserId],
address: [data.address],
@@ -115,7 +114,7 @@
this.subject.destroy();
}
save($event, value, valid) {
- $event.preventDefault();
+ const _prevent = !!$event ? $event.preventDefault() : null ;
if (valid) {
this.isSaving = true;
this.data = value;
@@ -137,10 +136,10 @@
const pageBean: PageBean = {pageIndex: 0, pageSize: 100};
const orgId = this.configMap.orgId;
const example = new ExampleService();
- text = !!text && !!text.trim() ? text : null;
+ text = !!text && !!text.trim() ? '%' + text + '%' : null;
example.or()
.andEqualTo({name: 'organizationId', value: this.configMap.orgId})
- .andEqualTo({name: 'name', value: text});
+ .andLike({name: 'name', value: text});
this.monitorPointService.getPageByExample(pageBean, example).subscribe(
(res: PageBean) => {
if (res != null && res.data != null) {
--
Gitblit v1.8.0