From c159a9fe4d8269dd7d29f879db6ef7202a074154 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 28 Sep 2020 11:50:28 +0800
Subject: [PATCH] 更新获取风向和设备信息，添加经纬度，修改rabbit MQ代码。
---
src/main/webapp/view/newmap.jsp | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/src/main/webapp/view/newmap.jsp b/src/main/webapp/view/newmap.jsp
index c2e63d8..c042725 100644
--- a/src/main/webapp/view/newmap.jsp
+++ b/src/main/webapp/view/newmap.jsp
@@ -709,11 +709,12 @@
/* if (moralMap.showSensors && typeof (moralMap.showSensors) == "function") {
moralMap.showSensors(JSON.parse(JSON.parse(msg.data)));
}*/
+ if ($("#close").html() == "CloseMq") {
+ ws.close();
+ }
+ moralMap.showSensors(JSON.parse(JSON.parse(msg.data)));
};
- if ($("#close").html()=="CloseMq") {
- ws.close();
- }
//������������
ws.onclose = function () {
$("#close").html("websocket������������");
@@ -722,7 +723,6 @@
ws.onerror = function () {
$("#close").html("websocket������������");
};
-
}
})(jQuery);
@@ -839,14 +839,9 @@
} else if ("RefreshState" == methodName) {
var states = jsonData.states;
moralMap.refreshState(states);
- } else if ("DeliverSensors" == methodName) {
- $("#close").html(methodName);
- moralMap.showSensors(jsonData);
} else if ("CloseMq" == methodName) {
- //window.location = "http://www.baidu.com"
$("#close").html(methodName);
}
}
-
</script>
--
Gitblit v1.8.0