From a439eed077c3a157ed3b9096cf8e793671fe8cdf Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Thu, 22 Mar 2018 11:40:03 +0800
Subject: [PATCH] 报表 优化

---
 src/app/routes/reports/demo/demo.component.ts |  106 ++++++++++++++++++++++++++++-------------------------
 1 files changed, 56 insertions(+), 50 deletions(-)

diff --git a/src/app/routes/reports/demo/demo.component.ts b/src/app/routes/reports/demo/demo.component.ts
index 1189314..6d17800 100644
--- a/src/app/routes/reports/demo/demo.component.ts
+++ b/src/app/routes/reports/demo/demo.component.ts
@@ -12,14 +12,34 @@
 })
 
 export class DemoComponent implements OnInit {
+  constructor(
+    public http: HttpClient,
+    public dateSrv: DateService,
+    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.reportType = this.reportOptions[1].value;
+  }
   [x: string]: any;
-  query: any = {
-  };
-  time: any = {
-    format: 'YYYY',
-    mode: 'month'
-  };
-  items = [{
+  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}
+  ];
+  public reportOptions = [
+    {value: 'bar', label: '���������'},
+    {value: 'line', label: '���������'}
+  ];
+  public monitorPointOptions = [];
+  public time: any = {};
+  public timeType: any = {};
+  public items = [{
     id: 0,
     monitorPoint: null,
     mac: '',
@@ -28,21 +48,9 @@
     monitorPointName: '',
     deviceName: '',
     monitorPointAddress: '',
-    deviceCount: ''
-
+    deviceCount: '',
+    deviceOptions: []
   }];
-
-  public sensorOptions = [];
-  public monitorPointOptions = [];
-  public deviceOptions = [];
-
-  constructor(
-    public http: HttpClient,
-    public dateSrv: DateService,
-    public router: Router,
-    public msgSrv: NzMessageService
-  ) {
-  }
 
   ngOnInit() {
     this.http.get(environment.SERVER_BASH_URL + 'sensor/all').subscribe((res: any) => {
@@ -50,6 +58,15 @@
         this.msgSrv.error(res.message);
       } else {
         this.sensorOptions = res.data;
+      }
+    });
+  }
+
+  typeChange(searchText) {
+    this.typeOptions.forEach(types => {
+      if (types.value === searchText) {
+        this.timeType = types;
+        this.time.format = types.format.toUpperCase();
       }
     });
   }
@@ -65,10 +82,10 @@
       monitorPointName: '',
       deviceName: '',
       monitorPointAddress: '',
-      deviceCount: ''
+      deviceCount: '',
+      deviceOptions: []
     });
   }
-
 
   searchChange(searchText, i) {
     if (searchText) {
@@ -86,7 +103,7 @@
   }
 
   monitorPointChange(value, i) {
-    this.deviceOptions = [];
+    this.items[i].deviceOptions = [];
     if (value) {
       this.monitorPointOptions.forEach(monitorPoint => {
         if (monitorPoint.id === value) {
@@ -98,20 +115,21 @@
         if (res.code === 0) {
           this.msgSrv.error(res.message);
         } else {
-          this.deviceOptions = res.data;
+          this.items[i].deviceOptions = res.data;
           this.items[i].deviceCount = res.data.length;
+          this.items[i].mac = null;
         }
       });
     } else {
       this.items[i].monitorPoint = null;
-      this.items[i].mac = '';
+      this.items[i].mac = null;
       this.items[i].monitorPointName = '';
     }
   }
 
   deviceChange(value, i) {
     if (value) {
-      this.deviceOptions.forEach(device => {
+      this.items[i].deviceOptions.forEach(device => {
         if (device.mac === value) {
           this.items[i].deviceName = device.name;
         }
@@ -121,23 +139,8 @@
     }
   }
 
-  public typeOptions = [
-    {value: 'year', label: '���', mode: 'month', xAxisName: '���', format: 'yyyy', typeFormat: '%Y-%m', timeLength: 12},
-    {value: 'month', label: '���', mode: 'month', xAxisName: '���', format: 'yyyy-MM', typeFormat: '%Y-%m-%d', timeLength: 28},
-    {value: 'day', label: '���', mode: 'day', xAxisName: '���', format: 'yyyy-MM-dd', typeFormat: '%Y-%m-%d %H', timeLength: 24},
-    {value: 'hour', label: '���', mode: 'day', xAxisName: '���', format: 'yyyy-MM-dd HH', typeFormat: '%Y-%m-%d %H:%i', timeLength: 60}
-  ];
-
-  timeType = this.typeOptions[0];
-  
-  typeChange(searchText) {
-    this.typeOptions.forEach(types => {
-      if (types.value === searchText) {
-        this.timeType = types;
-        this.time.format = types.format.toUpperCase();
-        this.time.mode = types.mode;
-      }
-    });
+  _disabledDate(current: Date): boolean {
+    return current && current.getTime() > Date.now();
   }
 
   reportQuery() {
@@ -152,18 +155,21 @@
         break;
       }
     }
-    if (validate && query.type) {
+    if (validate && query.type && query.reportType) {
+      query.sensors = null;
+      if (query.sensorKey && query.sensorKey.length > 0) {
+        const sensors = [];
+        query.sensorKey.forEach(sensor => {
+          sensors.push(sensor.sensorKey + '-' + sensor.name + '-' + sensor.unit);
+        });
+        query.sensors = JSON.stringify(sensors);
+      }
       query.timeType = JSON.stringify(this.timeType);
       query.items = JSON.stringify(this.items);
-      console.info(this.items);
       this.router.navigate(['report'], {queryParams: query});
     } else {
       this.msgSrv.error('���������������������������������������');
     }
 
-  }
-
-  _disabledDate(current: Date): boolean {
-    return current && current.getTime() > Date.now() ;
   }
 }

--
Gitblit v1.8.0