From 8815d4c3d666cbc96988087e9c21f9e1a9f64a06 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 10 May 2018 14:09:39 +0800
Subject: [PATCH] 安装用户密码修改
---
src/app/routes/users/installer/installer.component.ts | 132 +++++++++++++++++++++++++++++++-------------
1 files changed, 93 insertions(+), 39 deletions(-)
diff --git a/src/app/routes/users/installer/installer.component.ts b/src/app/routes/users/installer/installer.component.ts
index 3be1bb8..56af9e0 100644
--- a/src/app/routes/users/installer/installer.component.ts
+++ b/src/app/routes/users/installer/installer.component.ts
@@ -1,10 +1,12 @@
-import { Component, OnInit } from '@angular/core';
-import { NzMessageService } from 'ng-zorro-antd';
-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';
+import {Component, OnInit} from '@angular/core';
+import {NzMessageService} from 'ng-zorro-antd';
+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 '@business/services/util/date.service';
+import { FormGroup, FormBuilder, Validators, FormControl } from '@angular/forms';
+import { ResultBean } from '@business/entity/grid';
@Component({
selector: 'app-installer',
@@ -12,10 +14,14 @@
styles: []
})
export class InstallerComponent implements OnInit {
-
+ isDeleteOptions = [
+ {value: '1', label: '���'},
+ {value: '0', label: '���'}
+ ];
q: any = {
pi: 1,
ps: 10,
+ isDelete: this.isDeleteOptions[1].value,
sorter: '',
u_name: '',
u_mobile: ''
@@ -28,15 +34,24 @@
allChecked = false;
indeterminate = false;
sortMap: any = {};
+ loading = true;
constructor(
public http: HttpClient,
public dateSrv: DateService,
public msgSrv: NzMessageService,
- private modalHelper: ModalHelper) {}
+ private modalHelper: ModalHelper,
+ private fb: FormBuilder
+ ) {}
ngOnInit() {
this.load();
+ // ���������������������������
+ this.resetPwdForm = this.fb.group({
+ name : [ null, [ Validators.email ] ],
+ password : [ null, [ Validators.required ] ],
+ checkPassword : [ null, [ Validators.required, this.confirmationValidator ] ]
+ });
}
load(reload: boolean = false) {
@@ -44,39 +59,15 @@
this.q.pi = 1;
}
this.http.get(environment.SERVER_BASH_URL + '/operateUser/list', {params: 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.data;
this.total = res.data.total;
this.dataChange(this.data);
-
+ this.loading = false;
});
}
edit(user) {
- this.modalHelper.static(UserInstallerEditComponent, { user }).subscribe(() => {
+ this.modalHelper.static(UserInstallerEditComponent, {user}).subscribe(() => {
this.load(true);
this.msgSrv.success('���������������������������');
});
@@ -84,14 +75,14 @@
add() {
const user = {};
- this.modalHelper.static(UserInstallerEditComponent, { user }).subscribe(() => {
+ this.modalHelper.static(UserInstallerEditComponent, {user}).subscribe(() => {
this.load(true);
this.msgSrv.success('���������������������������');
});
}
delete(user) {
- this.http.post(environment.SERVER_BASH_URL + '/operateUser/operateUser/id',user).subscribe((res: any) => {
+ this.http.post(environment.SERVER_BASH_URL + '/operateUser/operateUser/id', user).subscribe((res: any) => {
this.msgSrv.success('���������������������������');
this.load(true);
});
@@ -103,13 +94,18 @@
ids.push(i.id);
});
this.http.post(environment.SERVER_BASH_URL + '/operateUser/operateUsers/ids', ids).subscribe((res: any) => {
+ this.msgSrv.success('���������������������������');
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();
}
@@ -140,6 +136,64 @@
}
format_date(date) {
- return this.dateSrv.date_format(date, 'YYYY-MM-DD');
+ if (date) {
+ return this.dateSrv.date_format(date, 'YYYY-MM-DD');
+ }
+ }
+ public resetPwdWindowIsVisible = false;
+ public isResetPwdLoading = false;
+ public resetPwdForm: FormGroup;
+ public resetPwdCancel() {
+ this.resetPwdWindowIsVisible = false;
+}
+public resetPwdOk() {
+ for (const i in this.resetPwdForm.controls) {
+ this.resetPwdForm.controls[ i ].markAsDirty();
+ }
+ if (this.resetPwdForm.valid) {
+ this.isResetPwdLoading = true;
+ const data = this.resetPwdForm.value;
+ data['name'] = null;
+ this.http.post(environment.SERVER_BASH_URL + '/operateUser/operateUser', data).subscribe((res: ResultBean<any>) => {
+ if ( res.code === 1 && res.data === 1 ) {
+ this.isResetPwdLoading = false;
+ this.resetPwdWindowIsVisible = false;
+ this.msgSrv.success('���������������������');
+ }
+ });
+ }
+}
+ /**
+ * ������������������������
+ * @param account
+ */
+ public showResetPwdWindow(install) {
+ this.resetPwdWindowIsVisible = true;
+ this.resetPwdForm = this.fb.group({
+ id : [ install.id ],
+ name : [ install.name],
+ password : [ null, [ Validators.required ] ],
+ checkPassword : [ null, [ Validators.required, this.confirmationValidator ] ]
+ });
+ }
+ confirmationValidator = (control: FormControl): { [s: string]: boolean } => {
+ if (!control.value) {
+ return { required: true };
+ } else if (control.value !== this.resetPwdForm.controls[ 'password' ].value) {
+ return { confirm: true, error: true };
+ }
+ }
+ /**
+ * ������ formControl������ ������ ���������������������
+ * @param name y
+ */
+ public getFormControl(name) {
+ return this.resetPwdForm.controls[ name ];
+ }
+ updateConfirmValidator() {
+ /** wait for refresh value */
+ setTimeout(_ => {
+ this.resetPwdForm.controls[ 'checkPassword' ].updateValueAndValidity();
+ });
}
}
--
Gitblit v1.8.0