From 0e1e92f2e14b07942f2d8c21b4d96468322aecfe Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 19 Dec 2017 10:00:41 +0800
Subject: [PATCH] updates
---
src/app/routes/users/installer/edit/edit.component.ts | 6 +++---
src/app/routes/users/installer/installer.component.html | 2 +-
src/app/routes/users/installer/edit/edit.component.html | 18 +++++++++---------
src/app/routes/users/installer/installer.component.ts | 6 +++---
4 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/app/routes/users/installer/edit/edit.component.html b/src/app/routes/users/installer/edit/edit.component.html
index 15ae0a1..0cbf353 100644
--- a/src/app/routes/users/installer/edit/edit.component.html
+++ b/src/app/routes/users/installer/edit/edit.component.html
@@ -1,15 +1,15 @@
<div class="modal-header">
- <div class="modal-title">{{i.id > 0 ? '������' : '������'}}-������������</div>
+ <div class="modal-title">{{user.id > 0 ? '������' : '������'}}-������������</div>
</div>
<form #f="ngForm" (ngSubmit)="save()" nz-form [nzType]="'horizontal'">
<div nz-form-item nz-row class="mb-sm">
<div nz-form-label nz-col [nzSpan]="4"><label>������</label></div>
<div nz-form-control nz-col [nzSpan]="8">
- <input nz-input [(ngModel)]="i.name" name="name" maxlength="30" required />
+ <input nz-input [(ngModel)]="user.name" name="name" maxlength="30" required />
</div>
<div nz-form-label nz-col [nzSpan]="4"><label>������</label></div>
<div nz-form-control nz-col [nzSpan]="8">
- <nz-select [(ngModel)]="i.sex" name="sex" required [nzAllowClear]="false">
+ <nz-select [(ngModel)]="user.sex" name="sex" required [nzAllowClear]="false">
<nz-option
*ngFor="let i of gender"
[nzLabel]="i"
@@ -21,31 +21,31 @@
<div nz-form-item nz-row class="mb-sm">
<div nz-form-label nz-col [nzSpan]="4"><label>������</label></div>
<div nz-form-control nz-col [nzSpan]="8">
- <input nz-input [(ngModel)]="i.mobile" name="mobile" maxlength="11" required />
+ <input nz-input [(ngModel)]="user.mobile" name="mobile" maxlength="11" required />
</div>
<div nz-form-label nz-col [nzSpan]="4"><label>������</label></div>
<div nz-form-control nz-col [nzSpan]="8">
- <input nz-input [(ngModel)]="i.password" name="password" maxlength="50" required />
+ <input nz-input [(ngModel)]="user.password" name="password" maxlength="50" required />
</div>
</div>
<div nz-form-item nz-row class="mb-sm">
<div nz-form-label nz-col [nzSpan]="4"><label>������������</label></div>
<div nz-form-control nz-col [nzSpan]="8">
- <input nz-input [(ngModel)]="i.email" name="email" required />
+ <input nz-input [(ngModel)]="user.email" name="email" required />
</div>
<div nz-form-label nz-col [nzSpan]="4"><label>���������</label></div>
<div nz-form-control nz-col [nzSpan]="8">
- <input nz-input [(ngModel)]="i.weixin" name="weixin" required />
+ <input nz-input [(ngModel)]="user.weixin" name="weixin" required />
</div>
</div>
<div nz-form-item nz-row class="mb-sm">
<div nz-form-label nz-col [nzSpan]="4"><label>������</label></div>
<div nz-form-control nz-col [nzSpan]="8">
- <input nz-input [(ngModel)]="i.organization" name="organization" maxlength="50" placeholder="50���������" />
+ <input nz-input [(ngModel)]="user.organization" name="organization" maxlength="50" placeholder="50���������" />
</div>
<div nz-form-label nz-col [nzSpan]="4"><label>������</label></div>
<div nz-form-control nz-col [nzSpan]="8">
- <input nz-input [(ngModel)]="i.nickname" name="nickname" maxlength="20" placeholder="20���������" />
+ <input nz-input [(ngModel)]="user.nickname" name="nickname" maxlength="20" placeholder="20���������" />
</div>
</div>
<div class="modal-footer">
diff --git a/src/app/routes/users/installer/edit/edit.component.ts b/src/app/routes/users/installer/edit/edit.component.ts
index 246fd1f..09ed0b9 100644
--- a/src/app/routes/users/installer/edit/edit.component.ts
+++ b/src/app/routes/users/installer/edit/edit.component.ts
@@ -11,7 +11,7 @@
})
export class UserInstallerEditComponent implements OnInit {
- i: any;
+ user: any;
gender: string[] = [ '���', '���' ];
constructor(
@@ -21,8 +21,8 @@
public http: _HttpClient) { }
ngOnInit() {
- if (this.i.id > 0) {
- this.http.get('./assets/pois.json').subscribe(res => this.i = res.data[0]);
+ if (this.user.id > 0) {
+ this.http.get('./assets/pois.json').subscribe(res => this.user = res.data[0]);
}
}
diff --git a/src/app/routes/users/installer/installer.component.html b/src/app/routes/users/installer/installer.component.html
index 295c5a6..413e329 100644
--- a/src/app/routes/users/installer/installer.component.html
+++ b/src/app/routes/users/installer/installer.component.html
@@ -20,7 +20,7 @@
</div>
<div nz-col [nzSpan]="8" class="mb-md">
<button nz-button type="submit" [nzType]="'primary'" [nzLoading]="loading" [nzSize]="'large'">������</button>
- <button nz-button type="reset" (click)="getData()" [nzSize]="'large'" class="mx-sm">������</button>
+ <button nz-button type="reset" (click)="load(true)" [nzSize]="'large'" class="mx-sm">������</button>
</div>
</div>
</form>
diff --git a/src/app/routes/users/installer/installer.component.ts b/src/app/routes/users/installer/installer.component.ts
index fc752e7..4ab218f 100644
--- a/src/app/routes/users/installer/installer.component.ts
+++ b/src/app/routes/users/installer/installer.component.ts
@@ -68,9 +68,9 @@
});
}
- edit(i) {
- this.modalHelper.static(UserInstallerEditComponent, { i }).subscribe(() => {
- this.load();
+ edit(user) {
+ this.modalHelper.static(UserInstallerEditComponent, { user }).subscribe(() => {
+ this.load(true);
this.msgSrv.info('���������������������������������');
});
}
--
Gitblit v1.8.0