From 121a5b01a2461b5d9d5c188f9dd36c2e4673db9d Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 28 Sep 2020 10:41:08 +0800
Subject: [PATCH] 实时风向与因子数据从同一个websokceket获取优化
---
src/main/webapp/view/newmap.jsp | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/src/main/webapp/view/newmap.jsp b/src/main/webapp/view/newmap.jsp
index 395d3fb..0648bcc 100644
--- a/src/main/webapp/view/newmap.jsp
+++ b/src/main/webapp/view/newmap.jsp
@@ -367,7 +367,7 @@
<body>
<div>
</div>
-<%--<textarea id="close" hidden></textarea>--%>
+<textarea id="close" hidden></textarea>
<div class="main_body">
<%--<input id="button" type="button" value="������" onclick="getJs();">--%>
@@ -709,20 +709,20 @@
/* if (moralMap.showSensors && typeof (moralMap.showSensors) == "function") {
moralMap.showSensors(JSON.parse(JSON.parse(msg.data)));
}*/
- /*if ($("#close").html() == "CloseMq") {
- ws.close();
- }*/
+ if ($("#close").html() == "CloseMq") {
+ ws.close(JSON.parse(msg.data));
+ }
+ moralMap.showSensors(JSON.parse(JSON.parse(msg.data)));
};
//������������
ws.onclose = function () {
- //$("#close").html("websocket������������");
+ $("#close").html("websocket������������");
};
//���������������������
ws.onerror = function () {
- //$("#close").html("websocket������������");
+ $("#close").html("websocket������������");
};
-
}
})(jQuery);
@@ -839,12 +839,9 @@
} else if ("RefreshState" == methodName) {
var states = jsonData.states;
moralMap.refreshState(states);
- } else if ("DeliverSensors" == methodName) {
+ } else if ("CloseMq" == methodName) {
$("#close").html(methodName);
- moralMap.showSensors(jsonData);
- } /*else if ("CloseMq" == methodName) {
- $("#close").html(methodName);
- }*/
+ }
}
</script>
--
Gitblit v1.8.0