From a1c7c8f01bc80853b0b591bbb1742e7be9c72f5c Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 20 Mar 2018 17:06:35 +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 |  136 ++++++++++++++++++++++++--------------------
 1 files changed, 74 insertions(+), 62 deletions(-)

diff --git a/src/app/routes/users/installer/installer.component.ts b/src/app/routes/users/installer/installer.component.ts
index 68e8d55..5d5bcd4 100644
--- a/src/app/routes/users/installer/installer.component.ts
+++ b/src/app/routes/users/installer/installer.component.ts
@@ -1,7 +1,10 @@
-import { Component, OnInit } from '@angular/core';
-import { NzMessageService } from 'ng-zorro-antd';
-import { getRule, saveRule, removeRule } from '../../../../../_mock/rule.service';
-import { getInstaller } from '../../../../../_mock/installer.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',
@@ -18,79 +21,79 @@
     u_mobile: ''
   };
   data: any[] = [];
-  loading = false;
+  total: 0;
+
   selectedRows: any[] = [];
   curRows: any[] = [];
-  totalCallNo = 0;
   allChecked = false;
   indeterminate = false;
-
   sortMap: any = {};
-  modalVisible = false;
+  loading = true;
 
-  constructor(public msg: NzMessageService) {}
+  constructor(
+    public http: HttpClient,
+    public dateSrv: DateService,
+    public msgSrv: NzMessageService,
+    private modalHelper: ModalHelper) {}
 
   ngOnInit() {
-    this.getData();
+    this.load();
   }
 
-  getData() {
-    this.pageChange(1).then(() => {
-      // this.q.statusList = this.status.map((i, index) => i.value ? index : -1).filter(w => w !== -1);
-      // if (this.q.status && this.q.status > -1) this.q.statusList.push(this.q.status);
-      // console.log(this.q);
-      this.data = getInstaller(this.q).map(i => {
-        return i;
-      });
+  load(reload: boolean = false) {
+    if (reload) {
+      this.q.pi = 1;
+    }
+    this.http.get(environment.SERVER_BASH_URL + '/operateUser/list', {params: this.q}).subscribe((res: any) => {
+      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.load(true);
+      this.msgSrv.success('���������������������������');
     });
   }
 
   add() {
-    this.modalVisible = true;
+    const user = {};
+    this.modalHelper.static(UserInstallerEditComponent, {user}).subscribe(() => {
+      this.load(true);
+      this.msgSrv.success('���������������������������');
+    });
   }
 
-  save() {
-
+  delete(user) {
+    this.http.post(environment.SERVER_BASH_URL + '/operateUser/operateUser/id', user).subscribe((res: any) => {
+      this.msgSrv.success('���������������������������');
+      this.load(true);
+    });
   }
 
   remove() {
-    this.selectedRows.forEach(i => removeRule(i.no));
-    this.getData();
-    this.clear();
-  }
-
-  approval() {
-    this.msg.success(`��������� ${this.selectedRows.length} ���`);
-  }
-
-  clear() {
-    this.selectedRows = [];
-    this.totalCallNo = 0;
-    this.data.forEach(i => i.checked = false);
-    this.refreshStatus();
+    const ids = [];
+    this.selectedRows.forEach(i => {
+      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 => {
-      if (!i.disabled) i.checked = value;
+      if (i.isDelete === '1') {
+        i.checked = false;
+      } else {
+        i.checked = value;
+      }
     });
     this.refreshStatus();
-  }
-
-  refreshStatus() {
-    const allChecked = this.curRows.every(value => value.disabled || value.checked);
-    const allUnChecked = this.curRows.every(value => value.disabled || !value.checked);
-    this.allChecked = allChecked;
-    this.indeterminate = (!allChecked) && (!allUnChecked);
-    this.selectedRows = this.data.filter(value => value.checked);
-    this.totalCallNo = this.selectedRows.reduce((total, cv) => total + cv.callNo, 0);
-  }
-
-  sort(field: string, value: any) {
-    this.sortMap = {};
-    this.sortMap[field] = value;
-    this.q.sorter = value ? `${field}_${value}` : '';
-    this.getData();
   }
 
   dataChange(res: any) {
@@ -98,20 +101,29 @@
     this.refreshStatus();
   }
 
-  pageChange(pi: number): Promise<any> {
-    this.q.pi = pi;
-    this.loading = true;
-    return new Promise((resolve) => {
-      setTimeout(() => {
-        this.loading = false;
-        resolve();
-      }, 500);
-    });
+  refreshStatus() {
+    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);
+  }
+
+  sort(field: string, value: any) {
+    this.sortMap = {};
+    this.sortMap[field] = value;
+    this.q.sorter = value ? `${field} ${value}` : '';
+    this.load(true);
   }
 
   reset(ls: any[]) {
     for (const item of ls) item.value = false;
-    this.getData();
+    this.load(true);
   }
 
+  format_date(date) {
+    if (date) {
+      return this.dateSrv.date_format(date, 'YYYY-MM-DD');
+    }
+  }
 }

--
Gitblit v1.8.0