From 9d731840aff22ce68756fb70f50dcf90432bbe67 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Sat, 24 Feb 2018 11:43:52 +0800
Subject: [PATCH] cookie 添加
---
src/app/routes/users/installer/installer.component.ts | 58 +++++++++++++++++++++-------------------------------------
1 files changed, 21 insertions(+), 37 deletions(-)
diff --git a/src/app/routes/users/installer/installer.component.ts b/src/app/routes/users/installer/installer.component.ts
index 3be1bb8..3a07063 100644
--- a/src/app/routes/users/installer/installer.component.ts
+++ b/src/app/routes/users/installer/installer.component.ts
@@ -1,10 +1,10 @@
-import { Component, OnInit } from '@angular/core';
-import { NzMessageService } from 'ng-zorro-antd';
-import { ModalHelper } from '@delon/theme';
-import { HttpClient } from '@angular/common/http';
-import { UserInstallerEditComponent } from './edit/edit.component';
-import { environment } from '../../../../environments/environment';
-import { DateService } from '../../../core/services/date.service';
+import {Component, OnInit} from '@angular/core';
+import {NzMessageService} from 'ng-zorro-antd';
+import {ModalHelper} from '@delon/theme';
+import {HttpClient} from '@angular/common/http';
+import {UserInstallerEditComponent} from './edit/edit.component';
+import {environment} from 'environments/environment';
+import {DateService} from '@business/services/util/date.service';
@Component({
selector: 'app-installer',
@@ -28,6 +28,7 @@
allChecked = false;
indeterminate = false;
sortMap: any = {};
+ loading: boolean = true;
constructor(
public http: HttpClient,
@@ -44,39 +45,15 @@
this.q.pi = 1;
}
this.http.get(environment.SERVER_BASH_URL + '/operateUser/list', {params: this.q}).subscribe((res: any) => {
- // let data = res.data;
- // const total = res.total;
- //
- // if (this.q.sorter !== '') {
- // const s = this.q.sorter.split('_');
- // data.sort((prev, next) => {
- // if (s[1] === 'descend') {
- // return moment(next[s[0]]).unix() - moment(prev[s[0]]).unix();
- // }
- // return moment(prev[s[0]]).unix() - moment(next[s[0]]).unix();
- // });
- // }
- //
- // if (this.q.u_name) {
- // data = data.filter(d => d.name.indexOf(this.q.u_name) > -1);
- // }
- // if (this.q.u_mobile) {
- // data = data.filter(d => d.mobile.toString().indexOf(this.q.u_mobile) > -1);
- // }
- //
- // const start = (this.q.pi - 1) * this.q.ps;
- // this.data = data.slice(start, start + this.q.ps);
- // this.total = total;
-
this.data = res.data.data;
this.total = res.data.total;
this.dataChange(this.data);
-
+ this.loading = false;
});
}
edit(user) {
- this.modalHelper.static(UserInstallerEditComponent, { user }).subscribe(() => {
+ this.modalHelper.static(UserInstallerEditComponent, {user}).subscribe(() => {
this.load(true);
this.msgSrv.success('���������������������������');
});
@@ -84,14 +61,14 @@
add() {
const user = {};
- this.modalHelper.static(UserInstallerEditComponent, { user }).subscribe(() => {
+ this.modalHelper.static(UserInstallerEditComponent, {user}).subscribe(() => {
this.load(true);
this.msgSrv.success('���������������������������');
});
}
delete(user) {
- this.http.post(environment.SERVER_BASH_URL + '/operateUser/operateUser/id',user).subscribe((res: any) => {
+ this.http.post(environment.SERVER_BASH_URL + '/operateUser/operateUser/id', user).subscribe((res: any) => {
this.msgSrv.success('���������������������������');
this.load(true);
});
@@ -103,13 +80,18 @@
ids.push(i.id);
});
this.http.post(environment.SERVER_BASH_URL + '/operateUser/operateUsers/ids', ids).subscribe((res: any) => {
+ this.msgSrv.success('���������������������������');
this.load(true);
});
}
checkAll(value: boolean) {
this.curRows.forEach(i => {
- i.checked = value;
+ if (i.isDelete == '1') {
+ i.checked = false;
+ } else {
+ i.checked = value;
+ }
});
this.refreshStatus();
}
@@ -140,6 +122,8 @@
}
format_date(date) {
- return this.dateSrv.date_format(date, 'YYYY-MM-DD');
+ if (date) {
+ return this.dateSrv.date_format(date, 'YYYY-MM-DD');
+ }
}
}
--
Gitblit v1.8.0