From 9b9f6e309a0b0ffd5c2495eaf8438b36704991a6 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 28 Sep 2020 11:02:07 +0800
Subject: [PATCH] update
---
src/main/webapp/view/newmap.jsp | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/view/newmap.jsp b/src/main/webapp/view/newmap.jsp
index 1ad7ba7..c042725 100644
--- a/src/main/webapp/view/newmap.jsp
+++ b/src/main/webapp/view/newmap.jsp
@@ -365,7 +365,12 @@
}
</style>
<body>
+<div>
+</div>
+<textarea id="close" hidden></textarea>
+
<div class="main_body">
+ <%--<input id="button" type="button" value="������" onclick="getJs();">--%>
<div class="tools_box">
<div class="charts_btn">
</div>
@@ -522,15 +527,15 @@
alert(equStr);
}
}
- if("���������"===obj["monitorPoint"]["description"]){
+ if ("���������" === obj["monitorPoint"]["description"]) {
var icon05 = new BMap.Icon("/img/ico05.png", new BMap.Size(50, 50));
var mark05 = new BMap.Marker(new BMap.Point(obj["monitorPoint"]["longitude"], obj["monitorPoint"]["latitude"]), {icon: icon05});
moralMap.addOverlay(mark05);
- }else if("���������"===obj["monitorPoint"]["description"]){
+ } else if ("���������" === obj["monitorPoint"]["description"]) {
var icon06 = new BMap.Icon("/img/ico06.png", new BMap.Size(50, 50));
var mark06 = new BMap.Marker(new BMap.Point(obj["monitorPoint"]["longitude"], obj["monitorPoint"]["latitude"]), {icon: icon06});
moralMap.addOverlay(mark06);
- }else if("���������"===obj["monitorPoint"]["description"]){
+ } else if ("���������" === obj["monitorPoint"]["description"]) {
var icon08 = new BMap.Icon("/img/ico08.png", new BMap.Size(50, 50));
var mark08 = new BMap.Marker(new BMap.Point(obj["monitorPoint"]["longitude"], obj["monitorPoint"]["latitude"]), {icon: icon08});
moralMap.addOverlay(mark08);
@@ -697,7 +702,6 @@
ws = new WebSocket('ws://' + hostAndPort + '/screen/webSocket/' + orgId + '&' + accountId + '_' + regionCode);
ws.onopen = function () {
};
-
//������������������
ws.onmessage = function (msg) {
// $("#searchParam").val(JSON.parse(msg.data));
@@ -705,13 +709,19 @@
/* 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)));
};
//������������
ws.onclose = function () {
+ $("#close").html("websocket������������");
};
//���������������������
ws.onerror = function () {
+ $("#close").html("websocket������������");
};
}
@@ -820,6 +830,7 @@
}
function callJS(jsonData) {
+ $("#close").html(jsonData);
var jsonData = JSON.parse(jsonData);
var methodName = jsonData.methodName;
// $("#searchParam").val(JSON.stringify(jsonData));
@@ -828,8 +839,9 @@
} else if ("RefreshState" == methodName) {
var states = jsonData.states;
moralMap.refreshState(states);
- } else if ("DeliverSensors" == methodName) {
- moralMap.showSensors(jsonData);
+ } else if ("CloseMq" == methodName) {
+ $("#close").html(methodName);
}
}
+
</script>
--
Gitblit v1.8.0