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 | 143 ++++++++++++++++++++++++-----------------------
1 files changed, 73 insertions(+), 70 deletions(-)
diff --git a/src/app/routes/reports/demo/demo.component.ts b/src/app/routes/reports/demo/demo.component.ts
index 41abb54..755551b 100644
--- a/src/app/routes/reports/demo/demo.component.ts
+++ b/src/app/routes/reports/demo/demo.component.ts
@@ -12,32 +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
- }];
-
- 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) => {
@@ -49,17 +62,29 @@
});
}
- 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
+ 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,
+ monitorPoint: null,
+ mac: '',
+ time: null,
+ formatTime: null,
+ monitorPointName: '',
+ deviceName: '',
+ monitorPointAddress: '',
+ deviceCount: ''
+ });
+ }
searchChange(searchText, i) {
if (searchText) {
@@ -81,7 +106,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) => {
@@ -89,59 +115,46 @@
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 = '';
+ 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', 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() {
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;
- query.timeLength = this.timeType.timeLength;
+ 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.reportType) {
+ query.timeType = JSON.stringify(this.timeType);
query.items = JSON.stringify(this.items);
this.router.navigate(['report'], {queryParams: query});
} else {
@@ -149,14 +162,4 @@
}
}
-
- sensorChange(value) {
- this.sensor = {};
- this.sensorOptions.forEach(sensor => {
- if (sensor.sensorKey === value) {
- this.sensor = sensor;
- }
- });
- }
-
}
--
Gitblit v1.8.0