ZhuDongming
2020-06-28 df80448fbd1bccdba131d797c0c7e93274ed6ba1
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,7 @@
<script>
    //页面初始化
    (function ($) {
        var hostAndPort = document.location.host;
        var moralMap = window.moralMap;
        var params = $.parseJSON($("#mapParams").html());
        moralMap['params'] = params;
@@ -486,9 +487,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 +645,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 + '&' + regionCode);
            ws.onopen = function () {
            };