From 7a0aeaea540803c0768c10c63ac5e78849f01c7a Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 07 Feb 2018 15:25:09 +0800
Subject: [PATCH] 地图相关 bug修复
---
src/main/webapp/view/map.jsp | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/view/map.jsp b/src/main/webapp/view/map.jsp
index 55f7a75..425eb41 100644
--- a/src/main/webapp/view/map.jsp
+++ b/src/main/webapp/view/map.jsp
@@ -314,14 +314,24 @@
for(var i in objs) {
var obj = objs[i];
if(moralMap.getEquipment(obj["mac"])==null){
+ obj['mouseover'] = function (type) {
+ if(type.target.getData()==null){
+ //��������������������������������������������������� ������������������
+ refreshAllState();
+ }
+ }
obj['click'] = function(){
- var _obj = this.getOption();
+ var _obj = this.getOption();
+ if(_obj['mac']==null){
+ alert("mac���������������������������������������");
+ return;
+ }
var equ = {
name: _obj['name'],
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){
@@ -410,7 +420,7 @@
}
setTimeout(function(){
refreshAllState();
- },2000);
+ },5000);
}
function stopRefreshPage(){
window.clearInterval(_intervalNum);
--
Gitblit v1.8.0