From b7aa850069d53ca1cc2aea791e7401216f5b795c Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 19 Mar 2018 16:44:07 +0800
Subject: [PATCH] 数据查看
---
src/app/routes/reports/demo/demo.component.ts | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/src/app/routes/reports/demo/demo.component.ts b/src/app/routes/reports/demo/demo.component.ts
index 5060607..1189314 100644
--- a/src/app/routes/reports/demo/demo.component.ts
+++ b/src/app/routes/reports/demo/demo.component.ts
@@ -24,7 +24,12 @@
monitorPoint: null,
mac: '',
time: null,
- formatTime: null
+ formatTime: null,
+ monitorPointName: '',
+ deviceName: '',
+ monitorPointAddress: '',
+ deviceCount: ''
+
}];
public sensorOptions = [];
@@ -52,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: '',
time: null,
- formatTime: null
+ formatTime: null,
+ monitorPointName: '',
+ deviceName: '',
+ monitorPointAddress: '',
+ deviceCount: ''
});
}
@@ -82,6 +91,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) => {
@@ -89,6 +99,7 @@
this.msgSrv.error(res.message);
} else {
this.deviceOptions = res.data;
+ this.items[i].deviceCount = res.data.length;
}
});
} else {
@@ -117,7 +128,8 @@
{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) {
@@ -141,12 +153,9 @@
}
}
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;
+ 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('���������������������������������������');
@@ -154,4 +163,7 @@
}
+ _disabledDate(current: Date): boolean {
+ return current && current.getTime() > Date.now() ;
+ }
}
--
Gitblit v1.8.0