From 7f762717c4580a17377a33cf04351fa3abaea61d Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 23 Mar 2018 15:25:18 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop

---
 src/app/routes/reports/demo/demo.component.ts |   54 +++++++++++++++++++++++++++++-------------------------
 1 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/src/app/routes/reports/demo/demo.component.ts b/src/app/routes/reports/demo/demo.component.ts
index 6d17800..990a166 100644
--- a/src/app/routes/reports/demo/demo.component.ts
+++ b/src/app/routes/reports/demo/demo.component.ts
@@ -18,19 +18,18 @@
     public router: Router,
     public msgSrv: NzMessageService
   ) {
-    const timeType = this.timeType = this.typeOptions[1];
-    this.query.type = timeType.value;
-    this.time.format = timeType.format.toUpperCase();
+    this.query.timeType = this.typeOptions[1];
+    this.time.format = this.query.timeType.format.toUpperCase();
     this.query.reportType = this.reportOptions[1].value;
   }
   [x: string]: any;
   public query: any = {};
   public sensorOptions = [];
   public typeOptions = [
-    {value: 'year', label: '���', xAxisName: '���', format: 'yyyy', typeFormat: '%Y-%m', timeLength: 12},
-    {value: 'month', label: '���', xAxisName: '���', format: 'yyyy-MM', typeFormat: '%Y-%m-%d', timeLength: 28},
-    {value: 'day', label: '���', xAxisName: '���', format: 'yyyy-MM-dd', typeFormat: '%Y-%m-%d %H', timeLength: 24},
-    {value: 'hour', label: '���', xAxisName: '���', format: 'yyyy-MM-dd HH', typeFormat: '%Y-%m-%d %H:%i', timeLength: 60}
+    {value: 'year', label: '���', format: 'yyyy', typeFormat: '%Y-%m', timeLength: 12},
+    {value: 'month', label: '���', format: 'yyyy-MM', typeFormat: '%Y-%m-%d', timeLength: 28},
+    {value: 'day', label: '���', format: 'yyyy-MM-dd', typeFormat: '%Y-%m-%d %H', timeLength: 24},
+    {value: 'hour', label: '���', format: 'yyyy-MM-dd HH', typeFormat: '%Y-%m-%d %H:%i', timeLength: 60}
   ];
   public reportOptions = [
     {value: 'bar', label: '���������'},
@@ -38,17 +37,14 @@
   ];
   public monitorPointOptions = [];
   public time: any = {};
-  public timeType: any = {};
   public items = [{
     id: 0,
     monitorPoint: null,
-    mac: '',
-    time: null,
-    formatTime: null,
     monitorPointName: '',
-    deviceName: '',
     monitorPointAddress: '',
-    deviceCount: '',
+    mac: '',
+    deviceName: '',
+    time: null,
     deviceOptions: []
   }];
 
@@ -64,8 +60,7 @@
 
   typeChange(searchText) {
     this.typeOptions.forEach(types => {
-      if (types.value === searchText) {
-        this.timeType = types;
+      if (types === searchText) {
         this.time.format = types.format.toUpperCase();
       }
     });
@@ -76,13 +71,11 @@
     const index = this.items.push({
       id: id,
       monitorPoint: null,
-      mac: '',
-      time: null,
-      formatTime: null,
       monitorPointName: '',
-      deviceName: '',
       monitorPointAddress: '',
-      deviceCount: '',
+      mac: '',
+      deviceName: '',
+      time: null,
       deviceOptions: []
     });
   }
@@ -116,7 +109,6 @@
           this.msgSrv.error(res.message);
         } else {
           this.items[i].deviceOptions = res.data;
-          this.items[i].deviceCount = res.data.length;
           this.items[i].mac = null;
         }
       });
@@ -124,6 +116,7 @@
       this.items[i].monitorPoint = null;
       this.items[i].mac = null;
       this.items[i].monitorPointName = '';
+      this.items[i].monitorPointAddress = '';
     }
   }
 
@@ -146,16 +139,27 @@
   reportQuery() {
     const query = this.query;
     let validate = true;
+    const queryItems = [];
     for (let i = 0; i < this.items.length; i++) {
       let item = this.items[i];
+      let queryItem: any = {};
       if (item.monitorPoint && item.time) {
-        item.formatTime = this.dateSrv.date_format(item.time, this.time.format);
+        queryItem.formatTime = this.dateSrv.date_format(item.time, this.time.format);
+        for (var key in item) {
+          if (item[key]) {
+            queryItem[key] = item[key];
+          }
+        }
+        queryItem.deviceCount = queryItem.deviceOptions.length;
+        delete queryItem.deviceOptions;
+        delete queryItem.time;
+        queryItems.push(queryItem);
       } else {
         validate = false;
         break;
       }
     }
-    if (validate && query.type && query.reportType) {
+    if (validate && query.timeType && query.reportType) {
       query.sensors = null;
       if (query.sensorKey && query.sensorKey.length > 0) {
         const sensors = [];
@@ -164,8 +168,8 @@
         });
         query.sensors = JSON.stringify(sensors);
       }
-      query.timeType = JSON.stringify(this.timeType);
-      query.items = JSON.stringify(this.items);
+      query.items = JSON.stringify(queryItems);
+      query.timeTypes = JSON.stringify(query.timeType);
       this.router.navigate(['report'], {queryParams: query});
     } else {
       this.msgSrv.error('���������������������������������������');

--
Gitblit v1.8.0