From 2d4cbcc4f92edbc4f926d9710bdda64520039c2b Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 05 Jan 2018 11:21:44 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/users/installer/edit/edit.component.ts | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/app/routes/users/installer/edit/edit.component.ts b/src/app/routes/users/installer/edit/edit.component.ts
index 71e0c3b..fa8d5ff 100644
--- a/src/app/routes/users/installer/edit/edit.component.ts
+++ b/src/app/routes/users/installer/edit/edit.component.ts
@@ -22,20 +22,19 @@
public http: HttpClient) { }
ngOnInit() {
- if (this.user.id > 0) {
- this.http.get(environment.SERVER_BASH_URL + '/user/operate_user/' + this.user.id).subscribe((res: any) => {
- this.user = res;
- this.user.createTime = this.dateSrv.date_format(this.user.createTime, 'YYYY-MM-DD');
- this.user.expireTime = this.dateSrv.date_format(this.user.expireTime, 'YYYY-MM-DD');
- });
- } else {
- this.user.createTime = this.dateSrv.today('YYYY-MM-DD');
- this.user.expireTime = this.dateSrv.today('YYYY-MM-DD');
- }
+// if (this.user.id > 0) {
+// this.http.get(environment.SERVER_BASH_URL + '/user/operate_user/' + this.user.id).subscribe((res: any) => {
+// this.user = res;
+// this.user.createTime = this.dateSrv.date_format(this.user.createTime, 'YYYY-MM-DD');
+// this.user.expireTime = this.dateSrv.date_format(this.user.expireTime, 'YYYY-MM-DD');
+// });
+// } else {
+// this.user.createTime = this.dateSrv.today('YYYY-MM-DD');
+// this.user.expireTime = this.dateSrv.today('YYYY-MM-DD');
+// }
}
save() {
- console.log(this.user);
if (this.user.name == null || this.user.name === '') {
this.msgSrv.error('���������������');
} else if (this.user.mobile == null || this.user.mobile === '') {
@@ -45,7 +44,7 @@
} else if (this.user.password == null || this.user.password === '') {
this.msgSrv.error('���������������');
} else {
- this.http.post(environment.SERVER_BASH_URL + '/user/operate_user/save', this.user).subscribe(() => {
+ this.http.post(environment.SERVER_BASH_URL + '/operateUser/operateUser', this.user).subscribe(() => {
this.subject.next('true');
this.close();
});
--
Gitblit v1.8.0