From a8532c88680e4ab213c269ec91da5b223f62332f Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 07 Feb 2018 14:12:26 +0800
Subject: [PATCH] 地图相关资源
---
src/main/webapp/view/map.jsp | 60 ++++++++++++++++++++++++++++++++----------------------------
1 files changed, 32 insertions(+), 28 deletions(-)
diff --git a/src/main/webapp/view/map.jsp b/src/main/webapp/view/map.jsp
index 35be11e..0b02bf5 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;
@@ -259,7 +264,7 @@
function showEqus(obj) {
var params = moralMap['params'];
var mpoint = obj.currentTarget.getOption();
- var url = 'equipment/findAllEqu?mpId=' + mpoint['id'] + "&orgId=" + params['orgId'];
+ var url = 'get-devices-by-mid-oid?mpId=' + mpoint['id'] + "&orgId=" + params['orgId'];
listView.load(url);
moralMap.showPopupbox("#popup_box");
}
@@ -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);
}
}
}
@@ -305,7 +310,7 @@
}
function addOverEquipments(jsonData){
if(moralMap.layer()=="equipments"){
- var objs = jsonData["rows"]==null?[]:jsonData["rows"];
+ var objs = jsonData = null?[]:jsonData;
for(var i in objs) {
var obj = objs[i];
if(moralMap.getEquipment(obj["mac"])==null){
@@ -316,7 +321,7 @@
mac: (_obj['mac']).toLowerCase(),
longitude: _obj['longitude'],
latitude: _obj['latitude'],
- version:moralMap.getVersion(_obj['mac'])
+ version:_obj['deviceVersion']['version']
}
var equStr = JSON.stringify(equ);
if(window["console"]!=undefined){
@@ -328,15 +333,21 @@
alert(equStr);
}
}
+ obj['mouseover'] = function (type) {
+ if(type.target.getData()==null){
+ //��������������������������������������������������� ������������������
+ refreshAllState();
+ }
+ }
var moralMask = new moralMap.Equipment(obj);
moralMap.addOverlay(moralMask);
}
}
}
}
- 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,18 +368,11 @@
paramMap["Ge"]= bounds['Ge'];//���������������������������
paramMap["Ke"]= bounds['Ke'];//���������������������������������
paramMap["Le"]= bounds['Le'];//���������������������������������
- loadLazy("getmonitorpoints",paramMap,addOverMpoints);
+ loadLazy("getMonitorpointList",paramMap,addOverMpoints);
startRefreshPage();
});
//��������������������� ���������������,���������
moralMap.addEventListener("tilesloaded", function(type, target) {
-// var endZoom = this.getZoom();
-// if(endZoom>=moralMap.getZooMConfine()){//������������������������
-// loadOverlays("getequipments",addOverEquipments);
-// }else{
-// loadOverlays("getmonitorpoints",addOverMpoints);
-// }
-// moralMap.closePopupbox("#popup_box");
});
//������������������������������������������
moralMap.addEventListener('zoomstart', function(type) {});
@@ -376,18 +380,18 @@
moralMap.addEventListener('zoomend', function(type) {
var endZoom = this.getZoom();
if(endZoom>=moralMap.getZooMConfine()){//������������������������
- loadOverlays("getequipments",addOverEquipments);
+ loadOverlays("get-devices",addOverEquipments);
}else{
- loadOverlays("getmonitorpoints",addOverMpoints);
+ loadOverlays("get-monitorpoints",addOverMpoints);
}
moralMap.closePopupbox("#popup_box");
});
moralMap.addEventListener('moveend', function(type) {
var endZoom = this.getZoom();
if(endZoom>=moralMap.getZooMConfine()){//������������������������
- loadOverlays("getequipments",addOverEquipments);
+ loadOverlays("get-devices",addOverEquipments);
}else{
- loadOverlays("getmonitorpoints",addOverMpoints);
+ loadOverlays("get-monitorpoints",addOverMpoints);
}
moralMap.closePopupbox("#popup_box");
});
@@ -396,7 +400,7 @@
function(e) {
var param = encodeURI($("#searchParam").val());
moralMap.showPopupbox("#popup_box");
- var url = 'equipment/findAllEqu?name=' + param + "&orgId=" + params['orgId'];
+ var url = 'get-devices-for-popup?name=' + param + "&orgId=" + params['orgId'];
listView.load(url);
}
)
@@ -412,7 +416,7 @@
}
setTimeout(function(){
refreshAllState();
- },2000);
+ },5000);
}
function stopRefreshPage(){
window.clearInterval(_intervalNum);
@@ -444,7 +448,7 @@
parma["orgId"] = moralMap['params']["orgId"];
$.ajax({
type: "post",
- url: "getstatesformap",
+ url: "get-real-state-data",
data:JSON.stringify(parma),
dataType:"json",
contentType:"application/json;charset=utf-8",
--
Gitblit v1.8.0