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/entity/grid.ts | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/app/business/entity/grid.ts b/src/app/business/entity/grid.ts
index 628fea5..b6f908c 100644
--- a/src/app/business/entity/grid.ts
+++ b/src/app/business/entity/grid.ts
@@ -66,8 +66,10 @@
this.data = pageData.data.map(row => {
row['index'] = index++;
return row;
- });
+ });
this.total = pageData.total;
+ const pages = Math.ceil(this.total / this.pageSize);
+ this.pageIndex = this.pageIndex > pages ? pages : this.pageIndex;
}
}
refreshStatus() {
@@ -83,7 +85,7 @@
);
this.selectedIndexs = this.selectedIndexs == null ? [] : this.selectedIndexs;
}
- constructor(config: object) {
+ constructor(config?: object) {
if (config != null) {
const keys = Object.getOwnPropertyNames(config);
for (const index in keys) {
@@ -111,3 +113,8 @@
return arr;
}
}
+export interface ResultBean<T> {
+ code?: number;
+ data?: T;
+ message?: string;
+}
--
Gitblit v1.8.0