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 | 99 +++++++++++++++++++++++++++++++++---------------- 1 files changed, 66 insertions(+), 33 deletions(-) diff --git a/src/app/routes/users/installer/installer.component.ts b/src/app/routes/users/installer/installer.component.ts index 0b6766e..99bf082 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 * as moment from 'moment'; +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', @@ -22,6 +22,7 @@ }; data: any[] = []; total: 0; + selectedRows: any[] = []; curRows: any[] = []; allChecked = false; @@ -29,7 +30,8 @@ sortMap: any = {}; constructor( - public http: _HttpClient, + public http: HttpClient, + public dateSrv: DateService, public msgSrv: NzMessageService, private modalHelper: ModalHelper) {} @@ -41,57 +43,84 @@ if (reload) { this.q.pi = 1; } - this.http.get('./assets/users-installer-data.json', this.q).subscribe((res: any) => { - const data = res.data; - const total = res.total; + 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; - 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(); - }); - } - - 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(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.load(true); + 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(); } + dataChange(res: any) { + this.curRows = res; + this.refreshStatus(); + } + refreshStatus() { - const allChecked = this.curRows.every(value => value.disabled || value.checked); - const allUnChecked = this.curRows.every(value => value.disabled || !value.checked); + 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); @@ -108,4 +137,8 @@ for (const item of ls) item.value = false; this.load(true); } + + format_date(date) { + return this.dateSrv.date_format(date, 'YYYY-MM-DD'); + } } -- Gitblit v1.8.0