From 59efc00b3c872c76f50317513ddd4a1574844960 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 15 Mar 2018 14:52:28 +0800
Subject: [PATCH] 地图相关资源
---
src/main/webapp/view/map.jsp | 37 ++++++++++++++++++++++++++-----------
1 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/src/main/webapp/view/map.jsp b/src/main/webapp/view/map.jsp
index 55f7a75..e212553 100644
--- a/src/main/webapp/view/map.jsp
+++ b/src/main/webapp/view/map.jsp
@@ -113,26 +113,31 @@
clear: both;
zoom: 1
}
-
+.list-chart-span {
+ cursor: pointer;
+ background-color: #4c9bf1
+}
.list li {
padding: 10px 0;
border-bottom: 1px dotted #eee;
line-height: 40px;
height: 40px;
font-size: 20px;
- cursor: pointer;
+ /*cursor: pointer;*/
}
.list span{
float: right;
position: relative;
- right: 18px;
+ right: 5px;
border-radius:4px;
- width: 70px;
+ width: 40px;
text-align: center;
height: 24px;
line-height: 24px;
- font-size: 16px;
+ font-size: 14px;
+ font-weight: bolder;
+ color: white;
margin: 10px 0;
padding:2px 0;
margin-right: 8px;
@@ -156,9 +161,9 @@
}
.list .state04 {
-
- background-color: #eee;
- color: #777
+ /*background-color: #eee;*/
+ /*color: #777 ;*/
+ background-color: #738d99 ;
}
/*
* ������������������---������������
@@ -314,14 +319,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 +425,7 @@
}
setTimeout(function(){
refreshAllState();
- },2000);
+ },5000);
}
function stopRefreshPage(){
window.clearInterval(_intervalNum);
--
Gitblit v1.8.0