From 2bcbf240bd4419d01232967915295df61a8e1d84 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 19 Oct 2020 13:20:34 +0800
Subject: [PATCH] 删除测试websocket
---
src/main/webapp/view/map.jsp | 39 ++++++++++++++++++---------------------
1 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/src/main/webapp/view/map.jsp b/src/main/webapp/view/map.jsp
index 8eeac9e..e3bdcb0 100644
--- a/src/main/webapp/view/map.jsp
+++ b/src/main/webapp/view/map.jsp
@@ -81,7 +81,7 @@
display: none;
}
- .listview {
+ /*.listview {
overflow-x: hidden;
overflow-y: auto;
margin: 0;
@@ -90,7 +90,7 @@
height: 390px;
width: 92%;
position: absolute;
- }
+ }*/
.search_box {
@@ -139,11 +139,10 @@
}
.list li {
- padding: 10px 0;
border-bottom: 1px dotted #eee;
- line-height: 40px;
- height: 40px;
- font-size: 20px;
+ line-height: 25px;
+ height: 25px;
+ font-size: 12px;
/*cursor: pointer;*/
}
@@ -154,14 +153,13 @@
border-radius: 4px;
width: 40px;
text-align: center;
- height: 24px;
- line-height: 24px;
- font-size: 14px;
+ height: 20px;
+ line-height: 20px;
+ font-size: 12px;
font-weight: bolder;
- color: white;
- margin: 10px 0;
- padding: 2px 0;
+ color: lightgrey;
margin-right: 8px;
+ margin-top: 2.5px;
}
.list .state00 {
@@ -170,11 +168,9 @@
.list .state01 {
background-color: #FF9;
- color: #ff7f00;
}
.list .state02 {
-
background-color: #F93;
}
@@ -183,9 +179,7 @@
}
.list .state04 {
- /*background-color: #eee;*/
- /*color: #777 ;*/
- background-color: #738d99;
+ background-color: #488FD2;
}
/*
@@ -351,10 +345,10 @@
<div class="charts_btn">
</div>
</div>
- <!-- <div class="search_box">
- <button id="searchBtn" type="button">������</button>
- <textarea style="width: 200px;height:200px;" id="searchParam"></textarea>
- </div>-->
+ <%-- <div class="search_box">
+ <button id="searchBtn" type="button">������</button>
+ <textarea style="width: 200px;height:200px;" id="searchParam"></textarea>
+ </div>--%>
<!-- <div id="popup_box">
<div id="equ_list" class="listview">
</div>
@@ -373,6 +367,8 @@
var moralMap = window.moralMap;
var params = $.parseJSON($("#mapParams").html());
moralMap['params'] = params;
+ var regionCode = params["regionCode"];
+ var provinceCode = regionCode.toString().substring(0, 2) + "0000";
var mapType = getUrlParam("mapType");
var mapOption = {};
if (!!mapType && !!eval(mapType)) {
@@ -751,6 +747,7 @@
function callJS(jsonData) {
var jsonData = JSON.parse(jsonData);
var methodName = jsonData.methodName;
+ // $("#searchParam").val(JSON.stringify(jsonData));
if ("JumpBaiduMap" == methodName) {
moralMap.callJS(jsonData);
} else if ("RefreshState" == methodName) {
--
Gitblit v1.8.0