From 43f2601b8a5706a029f333204f7f52f153d61dfe Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 08 Mar 2018 09:22:20 +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 | 149 +++++++++++++++++--------------------------------
1 files changed, 51 insertions(+), 98 deletions(-)
diff --git a/src/app/routes/reports/demo/demo.component.ts b/src/app/routes/reports/demo/demo.component.ts
index f1e2c10..0e3fa7e 100644
--- a/src/app/routes/reports/demo/demo.component.ts
+++ b/src/app/routes/reports/demo/demo.component.ts
@@ -5,7 +5,6 @@
import {HttpClient} from '@angular/common/http';
import {Router} from '@angular/router';
-
@Component({
selector: 'app-demo',
templateUrl: './demo.component.html',
@@ -20,26 +19,29 @@
format: 'YYYY',
mode: 'month'
};
+ items = [{
+ id: 0,
+ monitorPoint: null,
+ mac: '',
+ time: null,
+ formatTime: null,
+ monitorPointName: '',
+ deviceName: ''
+ }];
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,21 @@
});
}
- 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: '',
+ time: null,
+ formatTime: null,
+ monitorPointName: '',
+ deviceName: ''
+ });
+ }
+
+
+ searchChange(searchText, i) {
if (searchText) {
const query = encodeURI(searchText);
if (query) {
@@ -64,13 +80,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.items[i].monitorPointName = monitorPoint.name;
}
});
this.http.get(environment.SERVER_BASH_URL + 'device/monitorPointId', {params: {monitorPointId: value}}).subscribe((res: any) => {
@@ -81,74 +96,29 @@
}
});
} else {
- this.monitorPointa = null;
+ this.items[i].monitorPoint = null;
+ this.items[i].mac = '';
+ this.items[i].monitorPointName = '';
}
}
- 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) {
if (value) {
this.deviceOptions.forEach(device => {
if (device.mac === value) {
- this.devicea = device;
+ this.items[i].deviceName = device.name;
}
});
} 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.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}
];
@@ -164,45 +134,28 @@
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);
+ 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 (query.timeb) {
- query.timeb = this.dateSrv.date_format(query.timeb, this.time.format);
- }
+ }
+ 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.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.timeLength = this.timeType.timeLength;
+ query.items = JSON.stringify(this.items);
this.router.navigate(['report'], {queryParams: query});
-
} else {
- this.msgSrv.error('������������������');
+ this.msgSrv.error('���������������������������������������');
}
- }
-
- sensorChange(value) {
- this.sensorOptions.forEach(sensor => {
- if (sensor.sensorKey === value) {
- this.sensor = sensor;
- }
- });
}
}
--
Gitblit v1.8.0