From eca101124f17c62607a007ee34bf1ccd72a3c566 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Wed, 24 Jun 2020 09:19:22 +0800
Subject: [PATCH] update
---
src/main/webapp/view/newmap.jsp | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/view/newmap.jsp b/src/main/webapp/view/newmap.jsp
index 9ff1067..01abedf 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,6 +366,8 @@
<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;
@@ -642,7 +644,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://' + hostAddress + '8080/screen/webSocket/' + orgId + '&' + regionCode);
ws.onopen = function () {
};
@@ -770,7 +772,7 @@
function callJS(jsonData) {
var jsonData = JSON.parse(jsonData);
var methodName = jsonData.methodName;
- $("#searchParam").val(JSON.stringify(jsonData));
+ // $("#searchParam").val(JSON.stringify(jsonData));
if ("JumpBaiduMap" == methodName) {
moralMap.callJS(jsonData);
} else if ("RefreshState" == methodName) {
--
Gitblit v1.8.0