From 60163c2fb5098fc522f8e80b131128d2c9a33e42 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 26 Jan 2018 14:44:05 +0800
Subject: [PATCH] 组织配置

---
 src/main/webapp/view/map.jsp |   27 ++++++++++++++++-----------
 1 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/main/webapp/view/map.jsp b/src/main/webapp/view/map.jsp
index 35be11e..77896b8 100644
--- a/src/main/webapp/view/map.jsp
+++ b/src/main/webapp/view/map.jsp
@@ -1,7 +1,12 @@
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <%@page isELIgnored="false" %>
-<% String version ="1.000003";%>
+<%
+	String version ="1.000003";
+	response.setHeader("Cache-Control","no-store");
+	response.setHeader("Pragrma","no-cache");
+	response.setDateHeader("Expires",0);
+%>
 <!DOCTYPE html>
 <head>
     <meta charset="utf-8" />
@@ -237,8 +242,8 @@
 			</div>
 	  </div>
 	  <div id="mapCanvas"></div>
-	  <div id="map_params" style="display: none;">
-	  	${requestScope.map_params}
+	  <div id="mapParams" style="display: none;">
+	  	${requestScope.mapParams}
 	  </div>
 </div>
 </body>
@@ -248,10 +253,10 @@
 //���������������
 (function($) {
 	var moralMap = window.moralMap;
-	var params = $.parseJSON($("#map_params").html());
+	var params = $.parseJSON($("#mapParams").html());
 	moralMap['params'] = params;
 	//������������������������������
-	moralMap.mapInit(params["area_name"]);
+	moralMap.mapInit(params["regionName"]);
 	//������������
      var listView  =moralMap.initListView({id: "#equ_list",pageSize:12});
      window["listView"] = listView;
@@ -277,10 +282,10 @@
 						data:paramMap,
 						async:false,
 						cache: false,
-						success:function(jsonData){
+						success:function(res){
 							if(callBack!=null){
-								if(jsonData!=null&&typeof jsonData["rows"] ==='object'&&lazyKeyer(key)){
-								 callBack(jsonData);
+								if(res.code==1&&lazyKeyer(key)){
+								    callBack(res.data);
 								}
 							}
 						}
@@ -334,9 +339,9 @@
 	    }
 		}
 	}
-  function addOverMpoints(jsonData){
+  function addOverMpoints(data){
   	    if(moralMap.layer()=="monitorpoints"){
-  	    var mpoints = jsonData["rows"]==null?[]:jsonData["rows"];
+  	    var mpoints = data = null?[]:data;
 		for(var i in mpoints) {
 				var mpParam = mpoints[i];
 				if(moralMap.getMpoint(mpParam["id"])==null){
@@ -357,7 +362,7 @@
 	        paramMap["Ge"]=  bounds['Ge'];//���������������������������
 	        paramMap["Ke"]=  bounds['Ke'];//���������������������������������
 	        paramMap["Le"]=  bounds['Le'];//���������������������������������
-            loadLazy("getmonitorpoints",paramMap,addOverMpoints);
+            loadLazy("getMonitorpointList",paramMap,addOverMpoints);
             startRefreshPage();
 	});
 	//��������������������� ���������������,���������

--
Gitblit v1.8.0