From 36c5eeab117846d64aa632ca30ef7ac15ef20a27 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 19 Mar 2018 16:44:14 +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 |   80 +++++++++++++++++++++------------------
 1 files changed, 43 insertions(+), 37 deletions(-)

diff --git a/src/app/routes/reports/demo/demo.component.ts b/src/app/routes/reports/demo/demo.component.ts
index 1fcaee6..1189314 100644
--- a/src/app/routes/reports/demo/demo.component.ts
+++ b/src/app/routes/reports/demo/demo.component.ts
@@ -4,8 +4,6 @@
 import {Component, OnInit} from '@angular/core';
 import {HttpClient} from '@angular/common/http';
 import {Router} from '@angular/router';
-import * as $ from 'jquery'
-
 
 @Component({
   selector: 'app-demo',
@@ -24,9 +22,14 @@
   items = [{
     id: 0,
     monitorPoint: null,
-    mac: null,
+    mac: '',
     time: null,
-    formatTime: null
+    formatTime: null,
+    monitorPointName: '',
+    deviceName: '',
+    monitorPointAddress: '',
+    deviceCount: ''
+
   }];
 
   public sensorOptions = [];
@@ -54,11 +57,15 @@
   addItem() {
     const id = (this.items.length > 0) ? this.items[this.items.length - 1].id + 1 : 0;
     const index = this.items.push({
-      id,
+      id: id,
       monitorPoint: null,
-      mac: null,
+      mac: '',
       time: null,
-      formatTime: null
+      formatTime: null,
+      monitorPointName: '',
+      deviceName: '',
+      monitorPointAddress: '',
+      deviceCount: ''
     });
   }
 
@@ -83,7 +90,8 @@
     if (value) {
       this.monitorPointOptions.forEach(monitorPoint => {
         if (monitorPoint.id === value) {
-          this.monitorPoint = monitorPoint;
+          this.items[i].monitorPointName = monitorPoint.name;
+          this.items[i].monitorPointAddress = monitorPoint.address;
         }
       });
       this.http.get(environment.SERVER_BASH_URL + 'device/monitorPointId', {params: {monitorPointId: value}}).subscribe((res: any) => {
@@ -91,33 +99,37 @@
           this.msgSrv.error(res.message);
         } else {
           this.deviceOptions = res.data;
+          this.items[i].deviceCount = res.data.length;
         }
       });
     } else {
       this.items[i].monitorPoint = null;
-      this.items[i].mac = null;
+      this.items[i].mac = '';
+      this.items[i].monitorPointName = '';
     }
   }
 
   deviceChange(value, i) {
-    this.device = null;
     if (value) {
       this.deviceOptions.forEach(device => {
         if (device.mac === value) {
-          this.device = device;
+          this.items[i].deviceName = device.name;
         }
       });
+    } else {
+      this.items[i].deviceName = '';
     }
   }
 
   public typeOptions = [
-    {value: 'year', label: '���', mode: 'month', xAxisName: '���', format: 'yyyy', typeFormat: '%Y-%m'},
-    {value: 'month', label: '���', mode: 'month', xAxisName: '���', format: 'yyyy-MM', typeFormat: '%Y-%m-%d'},
-    {value: 'day', label: '���', mode: 'day', xAxisName: '���', format: 'yyyy-MM-dd', typeFormat: '%Y-%m-%d %H'},
-    {value: 'hour', label: '���', mode: 'day', xAxisName: '���', format: 'yyyy-MM-dd HH', typeFormat: '%Y-%m-%d %H:%i'}
+    {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) {
@@ -130,20 +142,20 @@
 
   reportQuery() {
     const query = this.query;
-    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;
+    let validate = true;
+    for (let i = 0; i < this.items.length; i++) {
+      let item = this.items[i];
+      if (item.monitorPoint && item.time) {
+        item.formatTime = this.dateSrv.date_format(item.time, this.time.format);
+      } else {
+        validate = false;
+        break;
+      }
+    }
+    if (validate && query.type) {
+      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('���������������������������������������');
@@ -151,13 +163,7 @@
 
   }
 
-  sensorChange(value) {
-    this.sensor = {};
-    this.sensorOptions.forEach(sensor => {
-      if (sensor.sensorKey === value) {
-        this.sensor = sensor;
-      }
-    });
+  _disabledDate(current: Date): boolean {
+    return current && current.getTime() > Date.now() ;
   }
-
 }

--
Gitblit v1.8.0