From 6efb2a0076a544b5714bccba214d81904264540d Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Tue, 12 Jun 2018 08:49:31 +0800
Subject: [PATCH] 报表展示 增加镇村选项

---
 src/app/routes/users/alarm-user/alarm-user.component.ts |   90 ++++++++++++++++++++++++++------------------
 1 files changed, 53 insertions(+), 37 deletions(-)

diff --git a/src/app/routes/users/alarm-user/alarm-user.component.ts b/src/app/routes/users/alarm-user/alarm-user.component.ts
index db313c3..c1342f7 100644
--- a/src/app/routes/users/alarm-user/alarm-user.component.ts
+++ b/src/app/routes/users/alarm-user/alarm-user.component.ts
@@ -1,11 +1,10 @@
 import {Component, OnInit} from '@angular/core';
-import {NzMessageService} from 'ng-zorro-antd';
+import {NzMessageService, NzModalService} from 'ng-zorro-antd';
 import {ModalHelper} from '@delon/theme';
 import {HttpClient} from '@angular/common/http';
-import * as moment from 'moment';
 import {environment} from '../../../../environments/environment';
-import {DateService} from '../../../core/services/date.service';
-import { AlarmUserEditComponent } from './alarm-user-edit/alarm-user-edit.component';
+import {DateService} from '@business/services/util/date.service';
+import {AlarmUserEditComponent} from './alarm-user-edit/alarm-user-edit.component';
 
 @Component({
   selector: 'app-alarm-user',
@@ -14,7 +13,7 @@
 })
 export class AlarmUserComponent implements OnInit {
 
-  options = [
+  isDeleteOptions = [
     {value: '1', label: '���'},
     {value: '0', label: '���'}
   ];
@@ -22,7 +21,7 @@
   query: any = {
     pageIndex: 1,
     pageSize: 10,
-    isDelete: this.options[1].value
+    isDelete: this.isDeleteOptions[1].value
   };
   data: any[] = [];
   total: 0;
@@ -30,18 +29,21 @@
   selectedRows: any[] = [];
   allChecked = false;
   indeterminate = false;
-  sortMap: any = {};
+  sortMap: string[] = [];
+  loading = true;
 
   constructor(
     public http: HttpClient,
+    private confirmServ: NzModalService,
     public dateSrv: DateService,
     public msgSrv: NzMessageService,
-    private modalHelper: ModalHelper) {
+    private modalHelper: ModalHelper
+  ) {
 
   }
 
   load(reload: boolean = false) {
-   if (reload) {
+    if (reload) {
       this.query.pageIndex = 1;
     }
     this.http.get(environment.SERVER_BASH_URL + '/alarmUser/list', {params: this.query}).subscribe((res: any) => {
@@ -49,6 +51,7 @@
       this.total = res.data.total;
 
       this.refreshStatus();
+      this.loading = false;
     });
   }
 
@@ -56,24 +59,38 @@
     this.load();
   }
 
-  edit(alarmUser) {
-    this.modalHelper.static(AlarmUserEditComponent, {alarmUser}).subscribe(() => {
-      this.load(true);
-      this.msgSrv.success('���������������������');
+  edit(alarmUser?: any) {
+    if (!alarmUser) {
+      alarmUser = {};
+    }
+    this.modalHelper.static(AlarmUserEditComponent, {alarmUser}).subscribe((res: any) => {
+      if (res.code === 0) {
+        this.msgSrv.error(res.message);
+      } else {
+        this.msgSrv.success('���������������������');
+        this.load(true);
+      }
     });
   }
 
-  add() {
-    const alarmUser = {};
-    this.modalHelper.static(AlarmUserEditComponent, {alarmUser}).subscribe(() => {
-      this.load(true);
-      this.msgSrv.success('���������������������');
+  remove() {
+    const ids: number[] = [];
+    this.confirmServ.confirm({
+      title: '������������',
+      content: '���������������������������?',
+      okText: '������',
+      cancelText: '������'
+    }).on('onOk', () => {
+      this.selectedRows.forEach(i => {
+        ids.push(i.id);
+      });
+      this.delete(...ids);
     });
   }
 
-  delete(alarmUser) {
-    this.http.post(environment.SERVER_BASH_URL + '/alarmUser/alarmUser/id' , alarmUser).subscribe((res: any) => {
-      if(res.data > 0){
+  delete(...ids: number[]) {
+    this.http.post(environment.SERVER_BASH_URL + '/alarmUser/ids', ids).subscribe((res: any) => {
+      if (res.data > 0) {
         this.msgSrv.success('���������������������');
         this.load(true);
       } else {
@@ -82,19 +99,9 @@
     });
   }
 
-  remove() {
-    const ids = [];
-    this.selectedRows.forEach(i => {
-      ids.push(i.id);
-    });
-    this.http.post(environment.SERVER_BASH_URL + '/alarmUser/alarmUsers/ids', ids).subscribe((res: any) => {
-      this.load(true);
-    });
-  }
-
   checkAll(value: boolean) {
     this.data.forEach(i => {
-      if (i.isDelete == '1') {
+      if (i.isDelete === '1') {
         i.checked = false;
       } else {
         i.checked = value;
@@ -112,14 +119,23 @@
   }
 
   sort(field: string, value: any) {
-    this.sortMap = {};
-    this.sortMap[field] = value;
-    this.query.sorter = value ? `${field} ${value}` : '';
+    const temp = this.sortMap;
+    this.sortMap = [];
+    temp.forEach(i => {
+      if (!i.startsWith(field)) {
+        this.sortMap.push(i);
+      }
+    });
+    if (value) {
+      this.sortMap.push(`${field} ${value}`);
+    }
+    this.query.sorter = this.sortMap.length > 0 ? this.sortMap.join(',') : '';
     this.load(true);
   }
 
   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