From 6a6d3bbb3748c12c2dc94beec05d21d82d0faba1 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 13 Mar 2018 14:43:01 +0800
Subject: [PATCH] 数据报表
---
src/app/routes/reports/demo/demo.component.ts | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/app/routes/reports/demo/demo.component.ts b/src/app/routes/reports/demo/demo.component.ts
index 5060607..ad81b13 100644
--- a/src/app/routes/reports/demo/demo.component.ts
+++ b/src/app/routes/reports/demo/demo.component.ts
@@ -24,7 +24,9 @@
monitorPoint: null,
mac: '',
time: null,
- formatTime: null
+ formatTime: null,
+ monitorPointName: '',
+ deviceName: ''
}];
public sensorOptions = [];
@@ -56,7 +58,9 @@
monitorPoint: null,
mac: '',
time: null,
- formatTime: null
+ formatTime: null,
+ monitorPointName: '',
+ deviceName: ''
});
}
@@ -117,7 +121,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) {
@@ -154,4 +159,7 @@
}
+ _disabledDate(current: Date): boolean {
+ return current && current.getTime() > Date.now() ;
+ }
}
--
Gitblit v1.8.0