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 | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/app/routes/reports/demo/demo.component.ts b/src/app/routes/reports/demo/demo.component.ts
index 5060607..0e3fa7e 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: ''
});
}
--
Gitblit v1.8.0