From 7ca521e4267b987270f6ccbb9a6c076aeb467d96 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 04 Jul 2018 17:11:33 +0800
Subject: [PATCH] 设备，监控站 管理功能增强
---
src/app/routes/systems/account/account-edit/account-edit.component.ts | 45 +++++++++++++++++++++++++++++----------------
1 files changed, 29 insertions(+), 16 deletions(-)
diff --git a/src/app/routes/systems/account/account-edit/account-edit.component.ts b/src/app/routes/systems/account/account-edit/account-edit.component.ts
index 4964b13..809b306 100644
--- a/src/app/routes/systems/account/account-edit/account-edit.component.ts
+++ b/src/app/routes/systems/account/account-edit/account-edit.component.ts
@@ -3,6 +3,8 @@
import {HttpClient} from '@angular/common/http';
import {environment} from '../../../../../environments/environment';
import {FormGroup, FormBuilder, FormControl, Validators} from '@angular/forms';
+import * as $ from 'jquery';
+
@Component({
selector: 'app-account-edit',
@@ -24,30 +26,39 @@
}
ngOnInit() {
+ const account = this.account;
this.validateForm = this.formBuilder.group({
- accountName: [this.account.accountName],
- mobile: [this.account.mobile],
- email: [this.account.email],
- weixin: [this.account.weixin],
- organizationId: [this.account.organizationId],
- expireTime: [this.account.expireTime],
- id: [this.account.id]
+ accountName: [account.accountName],
+ mobile: [account.mobile],
+ email: [account.email],
+ weixin: [account.weixin],
+ organizationId: [account.organizationId],
+ expireTime: [account.expireTime],
+ id: [account.id]
});
- this.searchOptions = this.account.organization ? [this.account.organization] : [];
+ this.searchOptions = account.organization ? [account.organization] : [];
+
+ $(document).keydown(function(event) {
+ switch (event.keyCode) {
+ case 13: return false;
+ }
+ });
}
save() {
- if (this.validateForm.valid) {
- for (const i in this.validateForm.controls) {
- this.validateForm.controls[i].disable();
+ const validateForm = this.validateForm;
+ const controls = validateForm.controls;
+ if (validateForm.valid) {
+ for (const i in controls) {
+ controls[i].disable();
}
- this.http.post(environment.SERVER_BASH_URL + '/account/account', this.validateForm.value).subscribe(() => {
+ this.http.post(environment.SERVER_BASH_URL + '/account/account', validateForm.value).subscribe(() => {
this.subject.next('true');
this.close();
});
} else {
- for (const i in this.validateForm.controls) {
- this.validateForm.controls[i].markAsDirty();
+ for (const i in controls) {
+ controls[i].markAsDirty();
}
}
}
@@ -57,14 +68,15 @@
}
check(accountName) {
+ const controlsAccountName = this.validateForm.controls.accountName;
if (accountName) {
this.http.get(environment.SERVER_BASH_URL + '/account/' + accountName).subscribe((res: any) => {
if (res.data > 0) {
- this.validateForm.controls.accountName.setErrors({unique: true});
+ controlsAccountName.setErrors({unique: true});
}
});
} else {
- this.validateForm.controls.accountName.setErrors({required: true});
+ controlsAccountName.setErrors({required: true});
}
}
@@ -78,4 +90,5 @@
}
}
}
+
}
--
Gitblit v1.8.0