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/business/services/http/version.service.ts | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/app/business/services/http/version.service.ts b/src/app/business/services/http/version.service.ts
index 8bc27ae..8a5861a 100644
--- a/src/app/business/services/http/version.service.ts
+++ b/src/app/business/services/http/version.service.ts
@@ -11,7 +11,7 @@
@Injectable()
export class VersionService {
private urls = {
- edit: environment.SERVER_BASH_URL + '/device-version/page-list',
+ list: environment.SERVER_BASH_URL + '/device-version/page-list',
save: environment.SERVER_BASH_URL + '/device-version/add-or-modify',
delete: environment.SERVER_BASH_URL + '/device-version/delete-by-ids',
getSensorIds: environment.SERVER_BASH_URL + '/device-version/get-sensor-ids',
@@ -24,9 +24,13 @@
example.or().andLike({name: 'name', value: '%' + queryText + '%'});
example.or().andEqualTo({name: 'version', value: queryText});
}
+ let orderByClause = '';
+ if ( page.getOrderByClause != null && page.getOrderByClause instanceof Function) {
+ orderByClause = page.getOrderByClause();
+ }
const param: PageBean = {pageSize: page.pageSize, pageIndex: page.pageIndex,
- queryParams: example.getSqlParam(), orderByClause: page.getOrderByClause()};
- return this.http.get(this.urls.edit, param);
+ queryParams: example.getSqlParam(), orderByClause: orderByClause};
+ return this.http.get(this.urls.list, param);
}
public save(data: any): Observable<any> {
return this.http.post(this.urls.save, data);
--
Gitblit v1.8.0