From 60b58b47cecd7611ad8df2561a84bf0548ad6ad9 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 20 Dec 2017 13:54:45 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend.git into develop
---
src/app/routes/users/installer/edit/edit.component.ts | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/app/routes/users/installer/edit/edit.component.ts b/src/app/routes/users/installer/edit/edit.component.ts
index a13483d..9d5b573 100644
--- a/src/app/routes/users/installer/edit/edit.component.ts
+++ b/src/app/routes/users/installer/edit/edit.component.ts
@@ -2,6 +2,8 @@
import { Component, OnInit } from '@angular/core';
import { ModalHelper } from '@delon/theme';
import { HttpClient } from '@angular/common/http';
+import { environment } from '../../../../../environments/environment';
+import { DateService } from '../../../../core/services/date.service';
@Component({
selector: 'app-edit',
@@ -15,20 +17,22 @@
constructor(
private modalHelper: ModalHelper,
private subject: NzModalSubject,
+ public dateSrv: DateService,
public msgSrv: NzMessageService,
public http: HttpClient) { }
ngOnInit() {
if (this.user.id > 0) {
- this.http.get('http://localhost:8001/user/operate_user/' + this.user.id).subscribe((res: any) => {
- this.user = res.data[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');
});
}
}
save() {
- this.http.get('./assets/pois.json').subscribe(() => {
- this.msgSrv.success('���������������������������������������������');
+ this.http.post(environment.SERVER_BASH_URL + '/user/operate_user/save', this.user).subscribe(() => {
this.subject.next('true');
this.close();
});
--
Gitblit v1.8.0