From c5b814dcf5ae60e89169dadf6cb039261bb23a23 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 19 Dec 2017 16:26:41 +0800
Subject: [PATCH] updates
---
src/app/routes/users/installer/installer.component.ts | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/src/app/routes/users/installer/installer.component.ts b/src/app/routes/users/installer/installer.component.ts
index 0b6766e..844a329 100644
--- a/src/app/routes/users/installer/installer.component.ts
+++ b/src/app/routes/users/installer/installer.component.ts
@@ -1,7 +1,7 @@
import { Component, OnInit } from '@angular/core';
import { NzMessageService } from 'ng-zorro-antd';
import { ModalHelper } from '@delon/theme';
-import { _HttpClient } from '@delon/theme';
+import { HttpClient } from '@angular/common/http';
import { getInstaller, deleteInstaller } from '../../../../../_mock/installer.service';
import * as moment from 'moment';
import { UserInstallerEditComponent } from './edit/edit.component';
@@ -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('http://localhost:8001/user/operate_user', this.q).subscribe((res: any) => {
+
+ let data = res.data;
const total = res.total;
if (this.q.sorter !== '') {
@@ -55,22 +56,29 @@
});
}
+ 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();
+ edit(user) {
+ this.modalHelper.static(UserInstallerEditComponent, { user }).subscribe(() => {
+ this.load(true);
this.msgSrv.info('���������������������������������');
});
}
add() {
- const i = {};
- this.modalHelper.static(UserInstallerEditComponent, { i });
+ const user = {};
+ this.modalHelper.static(UserInstallerEditComponent, { user });
}
save() {
@@ -108,4 +116,13 @@
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