From 86ad93ea04241928a06b06ab3fbe1c92faef9106 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Mon, 29 Jun 2020 16:39:14 +0800
Subject: [PATCH] update
---
src/main/webapp/view/newmap.jsp | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/main/webapp/view/newmap.jsp b/src/main/webapp/view/newmap.jsp
index 98f7c9a..7c0c892 100644
--- a/src/main/webapp/view/newmap.jsp
+++ b/src/main/webapp/view/newmap.jsp
@@ -347,10 +347,10 @@
<div class="charts_btn">
</div>
</div>
- <%-- <div class="search_box">
- <button id="searchBtn" type="button">������</button>
- <textarea style="width: 300px;height:400px;" id="searchParam"></textarea>
- </div>--%>
+ <%-- <div class="search_box">
+ <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>
@@ -366,11 +366,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 = {};
@@ -486,9 +488,11 @@
}
}
var moralMask = new moralMap.Equipment(obj);
- var moralDeviceWind = new moralMap.Device(obj);
moralMap.addOverlay(moralMask);
- moralMap.addOverlay(moralDeviceWind);
+ if (obj['hasWindInfo'] && obj['state'] != 4) {
+ var moralDeviceWind = new moralMap.Device(obj);
+ moralMap.addOverlay(moralDeviceWind);
+ }
}
}
}
@@ -642,7 +646,7 @@
if (typeof (WebSocket) === "undefined") {
alert("������������������������WebSocket");
} else {
- ws = new WebSocket('ws://47.96.15.25:8080/screen/webSocket/' + orgId + '&' + regionCode);
+ ws = new WebSocket('ws://' + hostAndPort + '/screen/webSocket/' + orgId + '&' + accountId);
ws.onopen = function () {
};
--
Gitblit v1.8.0