From a1c7c8f01bc80853b0b591bbb1742e7be9c72f5c Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 20 Mar 2018 17:06:35 +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 |   98 +++++++++++++++++++++++++-----------------------
 1 files changed, 51 insertions(+), 47 deletions(-)

diff --git a/src/app/routes/reports/demo/demo.component.ts b/src/app/routes/reports/demo/demo.component.ts
index 0e3fa7e..755551b 100644
--- a/src/app/routes/reports/demo/demo.component.ts
+++ b/src/app/routes/reports/demo/demo.component.ts
@@ -12,34 +12,45 @@
 })
 
 export class DemoComponent implements OnInit {
-  [x: string]: any;
-  query: any = {
-  };
-  time: any = {
-    format: 'YYYY',
-    mode: 'month'
-  };
-  items = [{
-    id: 0,
-    monitorPoint: null,
-    mac: '',
-    time: null,
-    formatTime: null,
-    monitorPointName: '',
-    deviceName: ''
-  }];
-
-  public sensorOptions = [];
-  public monitorPointOptions = [];
-  public deviceOptions = [];
-
   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;
+  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 deviceOptions = [];
+  public time: any = {};
+  public timeType: any = {};
+  public items = [{
+    id: 0,
+    monitorPoint: null,
+    mac: '',
+    time: null,
+    formatTime: null,
+    monitorPointName: '',
+    deviceName: '',
+    monitorPointAddress: '',
+    deviceCount: ''
+  }];
 
   ngOnInit() {
     this.http.get(environment.SERVER_BASH_URL + 'sensor/all').subscribe((res: any) => {
@@ -51,19 +62,29 @@
     });
   }
 
+  typeChange(searchText) {
+    this.typeOptions.forEach(types => {
+      if (types.value === searchText) {
+        this.timeType = types;
+        this.time.format = types.format.toUpperCase();
+      }
+    });
+  }
+
   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: '',
       time: null,
       formatTime: null,
       monitorPointName: '',
-      deviceName: ''
+      deviceName: '',
+      monitorPointAddress: '',
+      deviceCount: ''
     });
   }
-
 
   searchChange(searchText, i) {
     if (searchText) {
@@ -86,6 +107,7 @@
       this.monitorPointOptions.forEach(monitorPoint => {
         if (monitorPoint.id === value) {
           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) => {
@@ -93,6 +115,7 @@
           this.msgSrv.error(res.message);
         } else {
           this.deviceOptions = res.data;
+          this.items[i].deviceCount = res.data.length;
         }
       });
     } else {
@@ -114,22 +137,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}
-  ];
-
-
-  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() {
@@ -144,12 +153,8 @@
         break;
       }
     }
-    if (validate && query.type) {
-      query.format = this.timeType.format;
-      query.typeFormat = this.timeType.typeFormat;
-      query.xAxisName = this.timeType.xAxisName;
-      query.label = this.timeType.label;
-      query.timeLength = this.timeType.timeLength;
+    if (validate && query.type && query.reportType) {
+      query.timeType = JSON.stringify(this.timeType);
       query.items = JSON.stringify(this.items);
       this.router.navigate(['report'], {queryParams: query});
     } else {
@@ -157,5 +162,4 @@
     }
 
   }
-
 }

--
Gitblit v1.8.0