From 6af4ca37a5fa72cedaadfc202e56c9729353fe0a Mon Sep 17 00:00:00 2001
From: ZhuDongming <zdm773644075@hotmail.com>
Date: Mon, 22 Jun 2020 17:35:16 +0800
Subject: [PATCH] update
---
src/main/webapp/view/newmap.jsp | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/view/newmap.jsp b/src/main/webapp/view/newmap.jsp
index 89b9c76..01abedf 100644
--- a/src/main/webapp/view/newmap.jsp
+++ b/src/main/webapp/view/newmap.jsp
@@ -14,6 +14,8 @@
<script type="text/javascript"
src="http://api.map.baidu.com/api?v=2.0&ak=rER1sgBIcQxkfNSlm2wmBGZGgEERrooM"></script>
<script type="text/javascript" src="/js/jquery.min.js"></script>
+ <script type="text/javascript" src="/js/sockjs.min.js"></script>
+ <script type="text/javascript" src="/js/stomp.min.js"></script>
<script type="text/javascript" src="/js/utils.js"></script>
<script type="text/javascript">
if (typeof (JSON) == 'undefined') {
@@ -346,9 +348,9 @@
</div>
</div>
<%-- <div class="search_box">
- <button id="searchBtn" type="button">������</button>
- <textarea style="width: 200px;height:200px;" id="searchParam"></textarea>
- </div>--%>
+ <button id="searchBtn" type="button">������</button>
+ <textarea style="width: 300px;height:400px;" id="searchParam"></textarea>
+ </div>--%>
<!-- <div id="popup_box">
<div id="equ_list" class="listview">
</div>
@@ -364,9 +366,12 @@
<script>
//���������������
(function ($) {
+ var hostAndPort = document.location.host;
+ var hostAddress = hostAndPort.substr(0, hostAndPort.length - 4);
var moralMap = window.moralMap;
var params = $.parseJSON($("#mapParams").html());
moralMap['params'] = params;
+ var orgId = params["orgId"];
var regionCode = params["regionCode"];
var provinceCode = regionCode.toString().substring(0, 2) + "0000";
var mapType = getUrlParam("mapType");
@@ -422,7 +427,10 @@
function loadOverlays(url, callback) {
//������������
var oldMarkerList = moralMap.getHorizonMarkers();
+ var oldWindMarkerList = moralMap.getHorizonWindMarkers();
+
moralMap.addOverlays(oldMarkerList);
+ moralMap.addOverlays(oldWindMarkerList);
//������������
//������������������������,������������������
if (moralMap.isOverBounds() || moralMap.getOverlays().length == 0) {
@@ -480,7 +488,9 @@
}
}
var moralMask = new moralMap.Equipment(obj);
+ var moralDeviceWind = new moralMap.Device(obj);
moralMap.addOverlay(moralMask);
+ moralMap.addOverlay(moralDeviceWind);
}
}
}
@@ -629,7 +639,31 @@
}
}
);
- //������������
+
+ var ws;
+ if (typeof (WebSocket) === "undefined") {
+ alert("������������������������WebSocket");
+ } else {
+ ws = new WebSocket('ws://' + hostAddress + '8080/screen/webSocket/' + orgId + '&' + regionCode);
+ ws.onopen = function () {
+ };
+
+ //������������������
+ ws.onmessage = function (msg) {
+ // $("#searchParam").val(JSON.parse(msg.data));
+ moralMap.refreshWindDir(JSON.parse(JSON.parse(msg.data)));
+ if (moralMap.showSensors && typeof (moralMap.showSensors) == "function") {
+ moralMap.showSensors(JSON.parse(JSON.parse(msg.data)));
+ }
+ };
+
+ //������������
+ ws.onclose = function () {
+ };
+ //���������������������
+ ws.onerror = function () {
+ };
+ }
})(jQuery);
var _intervalNum = -1;
@@ -745,7 +779,7 @@
var states = jsonData.states;
moralMap.refreshState(states);
} else if ("DeliverSensors" == methodName) {
- moralMap.showSensors(jsonData);
+ // moralMap.showSensors(jsonData);
}
}
</script>
--
Gitblit v1.8.0