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 | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/app/routes/users/installer/installer.component.ts b/src/app/routes/users/installer/installer.component.ts
index 99bf082..d1cacb7 100644
--- a/src/app/routes/users/installer/installer.component.ts
+++ b/src/app/routes/users/installer/installer.component.ts
@@ -43,7 +43,7 @@
if (reload) {
this.q.pi = 1;
}
- this.http.get(environment.SERVER_BASH_URL + '/user/operate_user', this.q).subscribe((res: any) => {
+ this.http.get(environment.SERVER_BASH_URL + '/operateUser/list', {params: this.q}).subscribe((res: any) => {
// let data = res.data;
// const total = res.total;
//
@@ -68,8 +68,10 @@
// this.data = data.slice(start, start + this.q.ps);
// this.total = total;
- this.data = res.data;
- this.total = res.total;
+ this.data = res.data.data;
+ this.total = res.data.total;
+ this.dataChange(this.data);
+
});
}
@@ -89,7 +91,7 @@
}
delete(user) {
- this.http.delete(environment.SERVER_BASH_URL + '/user/operate_user/' + user.id).subscribe((res: any) => {
+ this.http.post(environment.SERVER_BASH_URL + '/operateUser/operateUser/id',user).subscribe((res: any) => {
this.msgSrv.success('���������������������������');
this.load(true);
});
@@ -100,15 +102,18 @@
this.selectedRows.forEach(i => {
ids.push(i.id);
});
- console.log(ids);
- this.http.post(environment.SERVER_BASH_URL + '/user/operate_user/deleteList', ids).subscribe((res: any) => {
+ this.http.post(environment.SERVER_BASH_URL + '/operateUser/operateUsers/ids', ids).subscribe((res: any) => {
this.load(true);
});
}
checkAll(value: boolean) {
this.curRows.forEach(i => {
- i.checked = value;
+ if (i.isDelete == '1') {
+ i.checked = false;
+ } else {
+ i.checked = value;
+ }
});
this.refreshStatus();
}
@@ -129,7 +134,7 @@
sort(field: string, value: any) {
this.sortMap = {};
this.sortMap[field] = value;
- this.q.sorter = value ? `${field}_${value}` : '';
+ this.q.sorter = value ? `${field} ${value}` : '';
this.load(true);
}
--
Gitblit v1.8.0