From 5fcdc8ba338a9f8730262970547274b0dcfe6b4d Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 09 Jan 2020 15:26:36 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/webapp/js/moralmap.js | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/main/webapp/js/moralmap.js b/src/main/webapp/js/moralmap.js
index 6031fd8..982c8a0 100644
--- a/src/main/webapp/js/moralmap.js
+++ b/src/main/webapp/js/moralmap.js
@@ -861,6 +861,9 @@
for (var key in sensorsUnitMap) {
if (prop == key) {
var sensorsUnit = sensorsUnitMap[key];
+ if(sensorsUnit==null){
+ sensorsUnit="";
+ }
}
}
adressOutHtml += ('<p style="height: 18px;line-height: 18px">' + sensorsDescription + "���" + jsonData[prop] + sensorsUnit + "</p>");
--
Gitblit v1.8.0