From e91e87b7b86e8d1d66caeab727a3cdc68fdc09ef Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 03 Aug 2018 16:56:41 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_demo2
---
src/app/routes/raise-dust/real-time/real-time.component.ts | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/app/routes/raise-dust/real-time/real-time.component.ts b/src/app/routes/raise-dust/real-time/real-time.component.ts
index 6d48880..8e817a7 100644
--- a/src/app/routes/raise-dust/real-time/real-time.component.ts
+++ b/src/app/routes/raise-dust/real-time/real-time.component.ts
@@ -9,8 +9,11 @@
})
export class RealTimeComponent implements OnInit {
+ [x: string]: any;
public monitorPointOptions = [];
- public avgs = {};
+ public monitorPoint = 0;
+
+ public avgs = {e1: '', e2: '', e3: '', e13: ''};
public levels = [35, 115, 200];
public devices = [];
constructor(
@@ -24,7 +27,7 @@
}
monitorPointChange(id) {
- this.avgs = {};
+ this.avgs = {e1: '', e2: '', e3: '', e13: ''};
this.devices = [];
zip(
this.http.get(environment.SERVER_BASH_URL + 'demo/avg', {params: {monitorPointId: id}}),
@@ -32,7 +35,7 @@
).subscribe(
([avgs, devices]) => {
if (!!avgs) {
- this.avgs = avgs;
+ this.avgs = <any>avgs;
}
if (!!devices['data']) {
this.devices = devices['data'];
--
Gitblit v1.8.0