From f320f1970e5d80a423f377fb3253628bd1e7f5bf Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Thu, 08 Mar 2018 15:10:46 +0800
Subject: [PATCH] Merge branch 'develop' of ssh://121.40.92.176:29418/screen-frontend into develop
---
src/app/routes/sensors/basic-info/sensor-edit/sensor-edit.component.ts | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/app/routes/sensors/basic-info/sensor-edit/sensor-edit.component.ts b/src/app/routes/sensors/basic-info/sensor-edit/sensor-edit.component.ts
index 4d06e27..63a1882 100644
--- a/src/app/routes/sensors/basic-info/sensor-edit/sensor-edit.component.ts
+++ b/src/app/routes/sensors/basic-info/sensor-edit/sensor-edit.component.ts
@@ -23,7 +23,7 @@
const data = this.data;
const validates: Sensor = {
name: [data.name, [Validators.required] ],
- key: [data.key, [Validators.required] ],
+ sensorKey: [data.sensorKey, [Validators.required] ],
lower: [data.lower ],
upper: [data.upper ],
unit: [data.unit ],
@@ -50,7 +50,7 @@
}
} );
this.subject.next( this );
- }else {
+ } else {
this.validate();
}
}
--
Gitblit v1.8.0