From 309d1f9d649daa08bb9b068af014749f6d4a5bce Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 06 Jul 2018 14:00:45 +0800
Subject: [PATCH] 设备和监控点父页面 筛选条件不予 编辑页面联动
---
src/app/routes/systems/account/account.component.ts | 163 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 121 insertions(+), 42 deletions(-)
diff --git a/src/app/routes/systems/account/account.component.ts b/src/app/routes/systems/account/account.component.ts
index 7d925d8..8f4f93c 100644
--- a/src/app/routes/systems/account/account.component.ts
+++ b/src/app/routes/systems/account/account.component.ts
@@ -1,12 +1,12 @@
import {Component, OnInit} from '@angular/core';
-import {NzMessageService} from 'ng-zorro-antd';
+import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {ModalHelper} from '@delon/theme';
import {HttpClient} from '@angular/common/http';
-import * as moment from 'moment';
import {environment} from '../../../../environments/environment';
-import {DateService} from '../../../core/services/date.service';
+import { DateService } from '../../../business/services/util/date.service';
import {AccountEditComponent} from './account-edit/account-edit.component';
-
+import { FormBuilder, Validators, FormControl, FormGroup } from '@angular/forms';
+import { ResultBean } from '@business/entity/grid';
@Component({
selector: 'app-account',
templateUrl: './account.component.html',
@@ -15,7 +15,7 @@
export class AccountComponent implements OnInit {
- options = [
+ public isDeleteOptions = [
{value: '1', label: '���'},
{value: '0', label: '���'}
];
@@ -23,7 +23,7 @@
query: any = {
pageIndex: 1,
pageSize: 10,
- isDelete: this.options[1].value
+ isDelete: this.isDeleteOptions[1].value
};
data: any[] = [];
total: 0;
@@ -31,50 +31,78 @@
selectedRows: any[] = [];
allChecked = false;
indeterminate = false;
- sortMap: any = {};
+ sortMap: string[] = [];
+ loading = true;
constructor(
public http: HttpClient,
+ private confirmServ: NzModalService,
public dateSrv: DateService,
public msgSrv: NzMessageService,
- private modalHelper: ModalHelper) {
+ private modalHelper: ModalHelper,
+ private fb: FormBuilder
+ ) {
}
load(reload: boolean = false) {
- if (reload) {
+ if (reload) {
this.query.pageIndex = 1;
}
this.http.get(environment.SERVER_BASH_URL + '/account/list', {params: this.query}).subscribe((res: any) => {
- this.data = res.data.data;
- this.total = res.data.total;
-
+ if (res.code === 0) {
+ this.msgSrv.error(res.message);
+ } else {
+ this.data = res.data.data;
+ this.total = res.data.total;
+ }
this.refreshStatus();
+ this.loading = false;
});
}
ngOnInit() {
this.load();
- }
-
- edit(account) {
- this.modalHelper.static(AccountEditComponent, {account}).subscribe(() => {
- this.load(true);
- this.msgSrv.success('���������������������');
+ // ������������������
+ this.resetPwdForm = this.fb.group({
+ accountName : [ null, [ Validators.email ] ],
+ password : [ null, [ Validators.required ] ],
+ checkPassword : [ null, [ Validators.required, this.confirmationValidator ] ]
});
}
- add() {
- const account = {};
- this.modalHelper.static(AccountEditComponent, {account}).subscribe(() => {
- this.load(true);
- this.msgSrv.success('���������������������');
+ edit(account?: any) {
+ if (!account) {
+ account = {};
+ }
+ this.modalHelper.static(AccountEditComponent, {account}).subscribe((res: any) => {
+ if (res.code === 0) {
+ this.msgSrv.error(res.message);
+ } else {
+ this.msgSrv.success('���������������������');
+ this.load(true);
+ }
});
}
- delete(account) {
- this.http.post(environment.SERVER_BASH_URL + '/account/account/id' , account).subscribe((res: any) => {
- if(res.data > 0){
+ remove() {
+ const ids: number[] = [];
+ this.confirmServ.confirm({
+ title: '������������',
+ content: '���������������������������?',
+ okText: '������',
+ cancelText: '������'
+ }).on('onOk', () => {
+ this.selectedRows.forEach(i => {
+ ids.push(i.id);
+ });
+ this.delete(...ids);
+ });
+ }
+
+ delete(...ids: number[]) {
+ this.http.post(environment.SERVER_BASH_URL + '/account/ids', ids).subscribe((res: any) => {
+ if (res.data > 0) {
this.msgSrv.success('���������������������');
this.load(true);
} else {
@@ -83,19 +111,13 @@
});
}
- remove() {
- const ids = [];
- this.selectedRows.forEach(i => {
- ids.push(i.id);
- });
- this.http.post(environment.SERVER_BASH_URL + '/account/accounts/ids', ids).subscribe((res: any) => {
- this.load(true);
- });
- }
-
checkAll(value: boolean) {
this.data.forEach(i => {
- i.checked = value;
+ if (i.isDelete === '1') {
+ i.checked = false;
+ } else {
+ i.checked = value;
+ }
});
this.refreshStatus();
}
@@ -109,14 +131,71 @@
}
sort(field: string, value: any) {
- this.sortMap = {};
- this.sortMap[field] = value;
- this.query.sorter = value ? `${field} ${value}` : '';
+ const temp = this.sortMap;
+ this.sortMap = [];
+ temp.forEach(i => {
+ if (!i.startsWith(field)) {
+ this.sortMap.push(i);
+ }
+ });
+ if (value) {
+ this.sortMap.push(`${field} ${value}`);
+ }
+ this.query.sorter = this.sortMap.length > 0 ? this.sortMap.join(',') : '';
this.load(true);
}
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 showResetPwdWindow(account) {
+ this.resetPwdWindowIsVisible = true;
+ this.resetPwdForm = this.fb.group({
+ id : [ account.id ],
+ accountName : [ account.accountName],
+ password : [ null, [ Validators.required ] ],
+ checkPassword : [ null, [ Validators.required, this.confirmationValidator ] ]
+ });
}
-
+ 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['accountName'] = null;
+ this.http.post(environment.SERVER_BASH_URL + '/account/account', data).subscribe((res: ResultBean<any>) => {
+ if ( res.code === 1 && res.data === 1 ) {
+ this.isResetPwdLoading = false;
+ this.resetPwdWindowIsVisible = false;
+ this.msgSrv.success('���������������������');
+ }
+ });
+ }
+ }
+ 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 };
+ }
+ }
+ getFormControl(name) {
+ return this.resetPwdForm.controls[ name ];
+ }
+ updateConfirmValidator() {
+ /** wait for refresh value */
+ setTimeout(_ => {
+ this.resetPwdForm.controls[ 'checkPassword' ].updateValueAndValidity();
+ });
+ }
}
--
Gitblit v1.8.0