From ad89f4965a05d37aeea1481c4ab53e21ab85ca2f Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Wed, 12 Aug 2020 09:32:58 +0800
Subject: [PATCH] 风场图update
---
src/main/webapp/view/newmap.jsp | 96 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 90 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/view/newmap.jsp b/src/main/webapp/view/newmap.jsp
index 89b9c76..1ad7ba7 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') {
@@ -315,8 +317,8 @@
.tools_box {
position: absolute;
- height: 120px;
- width: 400px;
+ height: 90px;
+ width: 90px;
right: 1px;
top: 20px;
z-index: 1;
@@ -338,6 +340,29 @@
background: url(/img/charts_btn_bg_2.png) left top no-repeat;
background-size: 70%;
}
+
+ .wind_explain {
+ position: absolute;
+ height: 200px;
+ width: 110px;
+ right: 1px;
+ top: 110px;
+ z-index: 1;
+ }
+
+ .wind_explain li {
+ height: 25px;
+ }
+
+ .wind_explain li span {
+ display: inline-block;
+ height: 25px;
+ line-height: 25px;
+ }
+
+ .wind_explain li img {
+ vertical-align: top;
+ }
</style>
<body>
<div class="main_body">
@@ -345,10 +370,22 @@
<div class="charts_btn">
</div>
</div>
+ <div class="wind_explain">
+ <ul>
+ <li><img src="/img/icoWind01.png" width="25" height="25"><span>1������</span></li>
+ <li><img src="/img/icoWind02.png" width="25" height="25"><span>2������</span></li>
+ <li><img src="/img/icoWind03.png" width="25" height="25"><span>3������</span></li>
+ <li><img src="/img/icoWind04.png" width="25" height="25"><span>4������</span></li>
+ <li><img src="/img/icoWind05.png" width="25" height="25"><span>5������</span></li>
+ <li><img src="/img/icoWind06.png" width="25" height="25"><span>6������</span></li>
+ <li><img src="/img/icoWind07.png" width="25" height="25"><span>7������</span></li>
+ <li><img src="/img/icoWind08.png" width="25" height="25"><span>8���������������</span></li>
+ </ul>
+ </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,10 +401,13 @@
<script>
//���������������
(function ($) {
+ var hostAndPort = document.location.host;
var moralMap = window.moralMap;
var params = $.parseJSON($("#mapParams").html());
moralMap['params'] = params;
+ var orgId = params["orgId"];
var regionCode = params["regionCode"];
+ var accountId = params["accountId"];
var provinceCode = regionCode.toString().substring(0, 2) + "0000";
var mapType = getUrlParam("mapType");
var mapOption = {};
@@ -422,7 +462,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) {
@@ -479,8 +522,25 @@
alert(equStr);
}
}
+ 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"]){
+ 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"]){
+ 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);
+ }
var moralMask = new moralMap.Equipment(obj);
moralMap.addOverlay(moralMask);
+ if (obj['hasWindInfo'] && obj['state'] != 4) {
+ var moralDeviceWind = new moralMap.Device(obj);
+ moralMap.addOverlay(moralDeviceWind);
+ }
}
}
}
@@ -629,7 +689,31 @@
}
}
);
- //������������
+
+ var ws;
+ if (typeof (WebSocket) === "undefined") {
+ alert("������������������������WebSocket");
+ } else {
+ ws = new WebSocket('ws://' + hostAndPort + '/screen/webSocket/' + orgId + '&' + accountId + '_' + 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;
--
Gitblit v1.8.0