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/installer.component.ts |   86 ++++++++++++++++++++++++++----------------
 1 files changed, 53 insertions(+), 33 deletions(-)

diff --git a/src/app/routes/users/installer/installer.component.ts b/src/app/routes/users/installer/installer.component.ts
index 1aaec00..d1cacb7 100644
--- a/src/app/routes/users/installer/installer.component.ts
+++ b/src/app/routes/users/installer/installer.component.ts
@@ -2,9 +2,9 @@
 import { NzMessageService } from 'ng-zorro-antd';
 import { ModalHelper } from '@delon/theme';
 import { HttpClient } from '@angular/common/http';
-import * as moment from 'moment';
 import { UserInstallerEditComponent } from './edit/edit.component';
 import { environment } from '../../../../environments/environment';
+import { DateService } from '../../../core/services/date.service';
 
 @Component({
   selector: 'app-installer',
@@ -22,6 +22,7 @@
   };
   data: any[] = [];
   total: 0;
+
   selectedRows: any[] = [];
   curRows: any[] = [];
   allChecked = false;
@@ -30,6 +31,7 @@
 
   constructor(
     public http: HttpClient,
+    public dateSrv: DateService,
     public msgSrv: NzMessageService,
     private modalHelper: ModalHelper) {}
 
@@ -41,31 +43,35 @@
     if (reload) {
       this.q.pi = 1;
     }
-    this.http.get(environment.SERVER_BASH_URL + '/user/operate_user', this.q).subscribe((res: any) => {
+    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;
 
-      let data = res.data;
-      const total = res.total;
+      this.data = res.data.data;
+      this.total = res.data.total;
+      this.dataChange(this.data);
 
-      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;
     });
   }
 
@@ -85,31 +91,41 @@
   }
 
   delete(user) {
-    this.http.delete(environment.SERVER_BASH_URL + '/user/operate_user/' + user.id).subscribe((res: any) => {
+    this.http.post(environment.SERVER_BASH_URL + '/operateUser/operateUser/id',user).subscribe((res: any) => {
       this.msgSrv.success('���������������������������');
       this.load(true);
     });
   }
 
   remove() {
+    const ids = [];
     this.selectedRows.forEach(i => {
-      this.http.delete(environment.SERVER_BASH_URL + '/user/operate_user/' + i.id).subscribe((res: any) => {
-        // TODO
-      });
+      ids.push(i.id);
     });
-    this.load(true);
+    this.http.post(environment.SERVER_BASH_URL + '/operateUser/operateUsers/ids', ids).subscribe((res: any) => {
+      this.load(true);
+    });
   }
 
   checkAll(value: boolean) {
     this.curRows.forEach(i => {
-      if (!i.disabled) i.checked = value;
+      if (i.isDelete == '1') {
+        i.checked = false;
+      } else {
+        i.checked = value;
+      }
     });
     this.refreshStatus();
   }
 
+  dataChange(res: any) {
+    this.curRows = res;
+    this.refreshStatus();
+  }
+
   refreshStatus() {
-    const allChecked = this.curRows.every(value => value.disabled || value.checked);
-    const allUnChecked = this.curRows.every(value => value.disabled || !value.checked);
+    const allChecked = this.curRows.every(value => value.checked);
+    const allUnChecked = this.curRows.every(value => !value.checked);
     this.allChecked = allChecked;
     this.indeterminate = (!allChecked) && (!allUnChecked);
     this.selectedRows = this.data.filter(value => value.checked);
@@ -118,7 +134,7 @@
   sort(field: string, value: any) {
     this.sortMap = {};
     this.sortMap[field] = value;
-    this.q.sorter = value ? `${field}_${value}` : '';
+    this.q.sorter = value ? `${field} ${value}` : '';
     this.load(true);
   }
 
@@ -126,4 +142,8 @@
     for (const item of ls) item.value = false;
     this.load(true);
   }
+
+  format_date(date) {
+    return this.dateSrv.date_format(date, 'YYYY-MM-DD');
+  }
 }

--
Gitblit v1.8.0