From efe936a73370a55d4c3336fb9973a92fcf87efff Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 08 Mar 2018 09:22:09 +0800
Subject: [PATCH] ts语法修正，报表部分功能实现
---
src/app/business/services/http/sensors.service.ts | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/app/business/services/http/sensors.service.ts b/src/app/business/services/http/sensors.service.ts
index 91ae9d5..1c18e3e 100644
--- a/src/app/business/services/http/sensors.service.ts
+++ b/src/app/business/services/http/sensors.service.ts
@@ -13,7 +13,7 @@
list: environment.SERVER_BASH_URL + '/sensor/page-list',
save: environment.SERVER_BASH_URL + '/sensor/add-or-modify',
delete: environment.SERVER_BASH_URL + '/sensor/delete-by-ids',
- listByVersionId:environment.SERVER_BASH_URL + '/sensor/list-by-vid',
+ listByVersionId: environment.SERVER_BASH_URL + '/sensor/list-by-vid',
};
constructor(private http: _HttpClient) { }
public getPagingList(page: PageBean, queryText: string): Observable<PageBean> {
@@ -23,15 +23,19 @@
example.or().andEqualTo({name: 'version', value: queryText});
}
let orderByClause = '';
- if ( page.getOrderByClause != null && page.getOrderByClause instanceof Function) {
- orderByClause = page.getOrderByClause();
+ if (!!page) {
+ if (page.getOrderByClause != null && page.getOrderByClause instanceof Function) {
+ orderByClause = page.getOrderByClause();
+ }
+ } else {
+ page = {pageSize: 0, pageIndex: 0};
}
const param: PageBean = {pageSize: page.pageSize, pageIndex: page.pageIndex,
queryParams: example.getSqlParam(), orderByClause: orderByClause};
return this.http.get(this.urls.list, param);
}
-public getPageByVersionId(versionId:number): Observable<PageBean> {
- return this.http.get(this.urls.listByVersionId,{versionId:versionId});
+public getPageByVersionId(versionId: number): Observable<PageBean> {
+ return this.http.get(this.urls.listByVersionId, {versionId: versionId});
}
public save(data: any): Observable<any> {
return this.http.post(this.urls.save, data);
--
Gitblit v1.8.0