From 2d4cbcc4f92edbc4f926d9710bdda64520039c2b Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 05 Jan 2018 11:21:44 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/users/installer/installer.component.ts | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/app/routes/users/installer/installer.component.ts b/src/app/routes/users/installer/installer.component.ts
index 2f52de4..d1cacb7 100644
--- a/src/app/routes/users/installer/installer.component.ts
+++ b/src/app/routes/users/installer/installer.component.ts
@@ -15,7 +15,7 @@
q: any = {
pi: 1,
- ps: 1,
+ ps: 10,
sorter: '',
u_name: '',
u_mobile: ''
@@ -109,7 +109,11 @@
checkAll(value: boolean) {
this.curRows.forEach(i => {
- i.checked = value;
+ if (i.isDelete == '1') {
+ i.checked = false;
+ } else {
+ i.checked = value;
+ }
});
this.refreshStatus();
}
--
Gitblit v1.8.0