From 43f2601b8a5706a029f333204f7f52f153d61dfe Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 08 Mar 2018 09:22:20 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/systems/account/account.component.ts | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/app/routes/systems/account/account.component.ts b/src/app/routes/systems/account/account.component.ts
index 4524daa..92c5346 100644
--- a/src/app/routes/systems/account/account.component.ts
+++ b/src/app/routes/systems/account/account.component.ts
@@ -13,7 +13,7 @@
export class AccountComponent implements OnInit {
- private isDeleteOptions = [
+ public isDeleteOptions = [
{value: '1', label: '���'},
{value: '0', label: '���'}
];
@@ -30,7 +30,7 @@
allChecked = false;
indeterminate = false;
sortMap: string[] = [];
- loading: boolean = true;
+ loading = true;
constructor(
public http: HttpClient,
@@ -47,7 +47,7 @@
this.query.pageIndex = 1;
}
this.http.get(environment.SERVER_BASH_URL + '/account/list', {params: this.query}).subscribe((res: any) => {
- if (res.code == 0) {
+ if (res.code === 0) {
this.msgSrv.error(res.message);
} else {
this.data = res.data.data;
@@ -67,7 +67,7 @@
account = {};
}
this.modalHelper.static(AccountEditComponent, {account}).subscribe((res: any) => {
- if (res.code == 0) {
+ if (res.code === 0) {
this.msgSrv.error(res.message);
} else {
this.msgSrv.success('���������������������');
@@ -104,7 +104,7 @@
checkAll(value: boolean) {
this.data.forEach(i => {
- if (i.isDelete == '1') {
+ if (i.isDelete === '1') {
i.checked = false;
} else {
i.checked = value;
@@ -132,7 +132,7 @@
if (value) {
this.sortMap.push(`${field} ${value}`);
}
- this.query.sorter = this.sortMap.length > 0 ? this.sortMap.join(",") : '';
+ this.query.sorter = this.sortMap.length > 0 ? this.sortMap.join(',') : '';
this.load(true);
}
@@ -141,5 +141,4 @@
return this.dateSrv.date_format(date, 'YYYY-MM-DD');
}
}
-
}
--
Gitblit v1.8.0