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 | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/view/map.jsp b/src/main/webapp/view/map.jsp
index 55f7a75..0b02bf5 100644
--- a/src/main/webapp/view/map.jsp
+++ b/src/main/webapp/view/map.jsp
@@ -321,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){
@@ -333,6 +333,12 @@
alert(equStr);
}
}
+ obj['mouseover'] = function (type) {
+ if(type.target.getData()==null){
+ //��������������������������������������������������� ������������������
+ refreshAllState();
+ }
+ }
var moralMask = new moralMap.Equipment(obj);
moralMap.addOverlay(moralMask);
}
@@ -410,7 +416,7 @@
}
setTimeout(function(){
refreshAllState();
- },2000);
+ },5000);
}
function stopRefreshPage(){
window.clearInterval(_intervalNum);
--
Gitblit v1.8.0