From 9adc219110433853d9e7017e94502aa0a3819e7f Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Mon, 05 Mar 2018 10:36:10 +0800
Subject: [PATCH] 报表优化

---
 src/app/routes/reports/demo/demo.component.ts |  129 ++++++++++++++-----------------------------
 1 files changed, 42 insertions(+), 87 deletions(-)

diff --git a/src/app/routes/reports/demo/demo.component.ts b/src/app/routes/reports/demo/demo.component.ts
index f1e2c10..1fcaee6 100644
--- a/src/app/routes/reports/demo/demo.component.ts
+++ b/src/app/routes/reports/demo/demo.component.ts
@@ -4,6 +4,7 @@
 import {Component, OnInit} from '@angular/core';
 import {HttpClient} from '@angular/common/http';
 import {Router} from '@angular/router';
+import * as $ from 'jquery'
 
 
 @Component({
@@ -20,26 +21,27 @@
     format: 'YYYY',
     mode: 'month'
   };
+  items = [{
+    id: 0,
+    monitorPoint: null,
+    mac: null,
+    time: null,
+    formatTime: null
+  }];
 
   public sensorOptions = [];
-
   public monitorPointOptions = [];
   public deviceOptions = [];
-  public monitorPointbOptions = [];
-  public devicebOptions = [];
 
   constructor(
     public http: HttpClient,
     public dateSrv: DateService,
     public router: Router,
     public msgSrv: NzMessageService
-  ) {}
-
-
+  ) {
+  }
 
   ngOnInit() {
-    this.query.time = null;
-    this.query.timeb = null;
     this.http.get(environment.SERVER_BASH_URL + 'sensor/all').subscribe((res: any) => {
       if (res.code === 0) {
         this.msgSrv.error(res.message);
@@ -49,7 +51,19 @@
     });
   }
 
-  searchChange(searchText) {
+  addItem() {
+    const id = (this.items.length > 0) ? this.items[this.items.length - 1].id + 1 : 0;
+    const index = this.items.push({
+      id,
+      monitorPoint: null,
+      mac: null,
+      time: null,
+      formatTime: null
+    });
+  }
+
+
+  searchChange(searchText, i) {
     if (searchText) {
       const query = encodeURI(searchText);
       if (query) {
@@ -64,13 +78,12 @@
     }
   }
 
-  monitorPointChange(value) {
-    this.query.mac = null;
+  monitorPointChange(value, i) {
     this.deviceOptions = [];
     if (value) {
       this.monitorPointOptions.forEach(monitorPoint => {
         if (monitorPoint.id === value) {
-          this.monitorPointa = monitorPoint;
+          this.monitorPoint = monitorPoint;
         }
       });
       this.http.get(environment.SERVER_BASH_URL + 'device/monitorPointId', {params: {monitorPointId: value}}).subscribe((res: any) => {
@@ -81,64 +94,17 @@
         }
       });
     } else {
-      this.monitorPointa = null;
+      this.items[i].monitorPoint = null;
+      this.items[i].mac = null;
     }
   }
 
-  searchChangeb(searchText) {
-    if (searchText) {
-      const query = encodeURI(searchText);
-      if (query) {
-        this.http.get(environment.SERVER_BASH_URL + '/monitor-point/list/' + query).subscribe((res: any) => {
-          if (res.code === 0) {
-            this.msgSrv.error(res.message);
-          } else {
-            this.monitorPointbOptions = res.data;
-          }
-        });
-      }
-    }
-  }
-
-  devicebChange(value) {
-    if (value) {
-      this.devicebOptions.forEach(device => {
-        if (device.mac === value) {
-          this.deviceb = device;
-        }
-      });
-    } else {
-      this.deviceb = null;
-    }
-  }
-
-  deviceChange(value) {
-    this.devicea = null;
+  deviceChange(value, i) {
+    this.device = null;
     if (value) {
       this.deviceOptions.forEach(device => {
         if (device.mac === value) {
-          this.devicea = device;
-        }
-      });
-    } else {
-      this.devicea = null;
-    }
-  }
-
-  monitorPointbChange(searchText) {
-    this.query.macb = null;
-    this.devicebOptions = [];
-    if (searchText) {
-      this.monitorPointbOptions.forEach(monitorPoint => {
-        if (monitorPoint.id === searchText) {
-          this.monitorPointb = monitorPoint;
-        }
-      });
-      this.http.get(environment.SERVER_BASH_URL + 'device/monitorPointId', {params: {monitorPointId: searchText}}).subscribe((res: any) => {
-        if (res.code === 0) {
-          this.msgSrv.error(res.message);
-        } else {
-          this.devicebOptions = res.data;
+          this.device = device;
         }
       });
     }
@@ -164,40 +130,29 @@
 
   reportQuery() {
     const query = this.query;
-    if (query.sensorKey && query.type && ((query.monitorPoint && query.time) || (query.monitorPointb && query.timeb))) {
-      if (query.time) {
-        query.time = this.dateSrv.date_format(query.time, this.time.format);
-      }
-      if (query.timeb) {
-        query.timeb = this.dateSrv.date_format(query.timeb, this.time.format);
-      }
+    if (query.type) {
+      this.items.forEach(item => {
+        if (item.monitorPoint && item.time) {
+          item.formatTime = this.dateSrv.date_format(item.time, this.time.format);
+        } else {
+          this.msgSrv.error('���������������������������������������');
+          return;
+        }
+      });
       query.format = this.timeType.format;
       query.typeFormat = this.timeType.typeFormat;
       query.xAxisName = this.timeType.xAxisName;
       query.label = this.timeType.label;
-      query.sensorName = this.sensor.name;
-      query.sensorUnit = this.sensor.unit;
-      if (this.devicea) {
-        query.deviceaName = this.devicea.name;
-      }
-      if (this.deviceb) {
-        query.devicebName = this.deviceb.name;
-      }
-      if (this.monitorPointa) {
-        query.monitorPointaName = this.monitorPointa.name;
-      }
-      if (this.monitorPointb) {
-        query.monitorPointbName = this.monitorPointb.name;
-      }
+      query.items = JSON.stringify(this.items);
       this.router.navigate(['report'], {queryParams: query});
-
     } else {
-      this.msgSrv.error('������������������');
+      this.msgSrv.error('���������������������������������������');
     }
 
   }
 
   sensorChange(value) {
+    this.sensor = {};
     this.sensorOptions.forEach(sensor => {
       if (sensor.sensorKey === value) {
         this.sensor = sensor;

--
Gitblit v1.8.0