From 30d07fbe902f3013a65a7c00fa141b119610a8f7 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 22 Sep 2020 08:34:54 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/webapp/view/newmap.jsp | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/view/newmap.jsp b/src/main/webapp/view/newmap.jsp
index c2e63d8..d411bc4 100644
--- a/src/main/webapp/view/newmap.jsp
+++ b/src/main/webapp/view/newmap.jsp
@@ -709,11 +709,11 @@
/* 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();
- }
//������������
ws.onclose = function () {
$("#close").html("websocket������������");
@@ -843,10 +843,8 @@
$("#close").html(methodName);
moralMap.showSensors(jsonData);
} else if ("CloseMq" == methodName) {
- //window.location = "http://www.baidu.com"
$("#close").html(methodName);
}
}
-
</script>
--
Gitblit v1.8.0