From d0120ef2272096cbcaf6e1b2e11edc029a7de511 Mon Sep 17 00:00:00 2001 From: 沈斌 <bluelazysb@hotmail.com> Date: Tue, 19 Dec 2017 23:29:29 +0800 Subject: [PATCH] updates --- src/app/routes/users/installer/installer.component.ts | 55 ++++++++++++++++++++++++++++++++----------------------- 1 files changed, 32 insertions(+), 23 deletions(-) diff --git a/src/app/routes/users/installer/installer.component.ts b/src/app/routes/users/installer/installer.component.ts index d7ce8aa..1aaec00 100644 --- a/src/app/routes/users/installer/installer.component.ts +++ b/src/app/routes/users/installer/installer.component.ts @@ -1,10 +1,10 @@ import { Component, OnInit } from '@angular/core'; import { NzMessageService } from 'ng-zorro-antd'; import { ModalHelper } from '@delon/theme'; -import { _HttpClient } from '@delon/theme'; -import { getInstaller, deleteInstaller } from '../../../../../_mock/installer.service'; +import { HttpClient } from '@angular/common/http'; import * as moment from 'moment'; import { UserInstallerEditComponent } from './edit/edit.component'; +import { environment } from '../../../../environments/environment'; @Component({ selector: 'app-installer', @@ -29,7 +29,7 @@ sortMap: any = {}; constructor( - public http: _HttpClient, + public http: HttpClient, public msgSrv: NzMessageService, private modalHelper: ModalHelper) {} @@ -41,8 +41,9 @@ if (reload) { this.q.pi = 1; } - this.http.get('./assets/users-installer-data.json', this.q).subscribe((res: any) => { - const data = res.data; + 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 !== '') { @@ -55,30 +56,47 @@ }); } + 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; }); } - edit(i) { - this.modalHelper.static(UserInstallerEditComponent, { i }).subscribe(() => { - this.load(); - this.msgSrv.info('���������������������������������'); + edit(user) { + this.modalHelper.static(UserInstallerEditComponent, { user }).subscribe(() => { + this.load(true); + this.msgSrv.success('���������������������������'); }); } add() { - const i = {}; - this.modalHelper.static(UserInstallerEditComponent, { i }); + 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 => deleteInstaller(i.name)); + this.selectedRows.forEach(i => { + this.http.delete(environment.SERVER_BASH_URL + '/user/operate_user/' + i.id).subscribe((res: any) => { + // TODO + }); + }); this.load(true); } @@ -107,14 +125,5 @@ reset(ls: any[]) { for (const item of ls) item.value = false; this.load(true); - } - - // Popconfirm - popConfirm(i) { - this.msgSrv.success('Next step.'); - } - - popCancel() { - this.msgSrv.error('Click on No'); } } -- Gitblit v1.8.0