From cd4992acac988e83a115f75a62e1f29d1c772009 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Wed, 20 Dec 2017 13:48:22 +0800
Subject: [PATCH] updates
---
src/app/routes/users/installer/installer.component.ts | 147 +++++++++++++++++++++++++++++--------------------
1 files changed, 87 insertions(+), 60 deletions(-)
diff --git a/src/app/routes/users/installer/installer.component.ts b/src/app/routes/users/installer/installer.component.ts
index 68e8d55..99bf082 100644
--- a/src/app/routes/users/installer/installer.component.ts
+++ b/src/app/routes/users/installer/installer.component.ts
@@ -1,7 +1,10 @@
import { Component, OnInit } from '@angular/core';
import { NzMessageService } from 'ng-zorro-antd';
-import { getRule, saveRule, removeRule } from '../../../../../_mock/rule.service';
-import { getInstaller } from '../../../../../_mock/installer.service';
+import { ModalHelper } from '@delon/theme';
+import { HttpClient } from '@angular/common/http';
+import { UserInstallerEditComponent } from './edit/edit.component';
+import { environment } from '../../../../environments/environment';
+import { DateService } from '../../../core/services/date.service';
@Component({
selector: 'app-installer',
@@ -18,79 +21,96 @@
u_mobile: ''
};
data: any[] = [];
- loading = false;
+ total: 0;
+
selectedRows: any[] = [];
curRows: any[] = [];
- totalCallNo = 0;
allChecked = false;
indeterminate = false;
-
sortMap: any = {};
- modalVisible = false;
- constructor(public msg: NzMessageService) {}
+ constructor(
+ public http: HttpClient,
+ public dateSrv: DateService,
+ public msgSrv: NzMessageService,
+ private modalHelper: ModalHelper) {}
ngOnInit() {
- this.getData();
+ this.load();
}
- getData() {
- this.pageChange(1).then(() => {
- // this.q.statusList = this.status.map((i, index) => i.value ? index : -1).filter(w => w !== -1);
- // if (this.q.status && this.q.status > -1) this.q.statusList.push(this.q.status);
- // console.log(this.q);
- this.data = getInstaller(this.q).map(i => {
- return i;
- });
+ load(reload: boolean = false) {
+ if (reload) {
+ this.q.pi = 1;
+ }
+ this.http.get(environment.SERVER_BASH_URL + '/user/operate_user', this.q).subscribe((res: any) => {
+ // let data = res.data;
+ // const total = res.total;
+ //
+ // if (this.q.sorter !== '') {
+ // const s = this.q.sorter.split('_');
+ // data.sort((prev, next) => {
+ // if (s[1] === 'descend') {
+ // return moment(next[s[0]]).unix() - moment(prev[s[0]]).unix();
+ // }
+ // return moment(prev[s[0]]).unix() - moment(next[s[0]]).unix();
+ // });
+ // }
+ //
+ // if (this.q.u_name) {
+ // data = data.filter(d => d.name.indexOf(this.q.u_name) > -1);
+ // }
+ // if (this.q.u_mobile) {
+ // data = data.filter(d => d.mobile.toString().indexOf(this.q.u_mobile) > -1);
+ // }
+ //
+ // const start = (this.q.pi - 1) * this.q.ps;
+ // this.data = data.slice(start, start + this.q.ps);
+ // this.total = total;
+
+ this.data = res.data;
+ this.total = res.total;
+ });
+ }
+
+ edit(user) {
+ this.modalHelper.static(UserInstallerEditComponent, { user }).subscribe(() => {
+ this.load(true);
+ this.msgSrv.success('���������������������������');
});
}
add() {
- this.modalVisible = true;
+ const user = {};
+ this.modalHelper.static(UserInstallerEditComponent, { user }).subscribe(() => {
+ this.load(true);
+ this.msgSrv.success('���������������������������');
+ });
}
- save() {
-
+ delete(user) {
+ this.http.delete(environment.SERVER_BASH_URL + '/user/operate_user/' + user.id).subscribe((res: any) => {
+ this.msgSrv.success('���������������������������');
+ this.load(true);
+ });
}
remove() {
- this.selectedRows.forEach(i => removeRule(i.no));
- this.getData();
- this.clear();
- }
-
- approval() {
- this.msg.success(`��������� ${this.selectedRows.length} ���`);
- }
-
- clear() {
- this.selectedRows = [];
- this.totalCallNo = 0;
- this.data.forEach(i => i.checked = false);
- this.refreshStatus();
+ const ids = [];
+ 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.load(true);
+ });
}
checkAll(value: boolean) {
this.curRows.forEach(i => {
- if (!i.disabled) i.checked = value;
+ i.checked = value;
});
this.refreshStatus();
- }
-
- refreshStatus() {
- const allChecked = this.curRows.every(value => value.disabled || value.checked);
- const allUnChecked = this.curRows.every(value => value.disabled || !value.checked);
- this.allChecked = allChecked;
- this.indeterminate = (!allChecked) && (!allUnChecked);
- this.selectedRows = this.data.filter(value => value.checked);
- this.totalCallNo = this.selectedRows.reduce((total, cv) => total + cv.callNo, 0);
- }
-
- sort(field: string, value: any) {
- this.sortMap = {};
- this.sortMap[field] = value;
- this.q.sorter = value ? `${field}_${value}` : '';
- this.getData();
}
dataChange(res: any) {
@@ -98,20 +118,27 @@
this.refreshStatus();
}
- pageChange(pi: number): Promise<any> {
- this.q.pi = pi;
- this.loading = true;
- return new Promise((resolve) => {
- setTimeout(() => {
- this.loading = false;
- resolve();
- }, 500);
- });
+ refreshStatus() {
+ const allChecked = this.curRows.every(value => value.checked);
+ const allUnChecked = this.curRows.every(value => !value.checked);
+ this.allChecked = allChecked;
+ this.indeterminate = (!allChecked) && (!allUnChecked);
+ this.selectedRows = this.data.filter(value => value.checked);
+ }
+
+ sort(field: string, value: any) {
+ this.sortMap = {};
+ this.sortMap[field] = value;
+ this.q.sorter = value ? `${field}_${value}` : '';
+ this.load(true);
}
reset(ls: any[]) {
for (const item of ls) item.value = false;
- this.getData();
+ this.load(true);
}
+ format_date(date) {
+ return this.dateSrv.date_format(date, 'YYYY-MM-DD');
+ }
}
--
Gitblit v1.8.0