From 25a897c4e2bfd1722b1ea53d0aba5df81fcacbfc Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 07 Mar 2018 10:55:27 +0800
Subject: [PATCH] 地图相关资源
---
src/main/webapp/img/ico_coo04.png | 0
src/main/webapp/js/moralmap.js | 15 +++++++++------
src/main/webapp/view/map.jsp | 6 +++---
src/main/webapp/img/ico04.png | 0
4 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/main/webapp/img/ico04.png b/src/main/webapp/img/ico04.png
index 9c64a6a..ed5b95b 100644
--- a/src/main/webapp/img/ico04.png
+++ b/src/main/webapp/img/ico04.png
Binary files differ
diff --git a/src/main/webapp/img/ico_coo04.png b/src/main/webapp/img/ico_coo04.png
index 2885216..7a3966d 100644
--- a/src/main/webapp/img/ico_coo04.png
+++ b/src/main/webapp/img/ico_coo04.png
Binary files differ
diff --git a/src/main/webapp/js/moralmap.js b/src/main/webapp/js/moralmap.js
index 7dde6fd..7c6de2c 100644
--- a/src/main/webapp/js/moralmap.js
+++ b/src/main/webapp/js/moralmap.js
@@ -350,7 +350,7 @@
break;
case 4:
state = 'state04';
- stateName = '������';
+ stateName = '������';
break;
}
return {
@@ -470,9 +470,12 @@
}
return $.extend(this, {
refreshState: function(state) {
- _option['state'] = state;
- var iconObj = _getMapIcon(state);
- this.setIcon(iconObj);
+ //��������������������������������� ������
+ if(_option['state'] != state){
+ _option['state'] = state;
+ var iconObj = _getMapIcon(state);
+ this.setIcon(iconObj);
+ }
},
getOption: function() {
return _option;
@@ -483,7 +486,7 @@
})
}
//new BMap.Marker()������������IE7���������������������
- moralMap.MoralMarker.prototype = BMap.Marker.prototype;
+ moralMap.MoralMarker.prototype = new BMap.Marker();
//��������������� ������Mark������
moralMap.Monitorpoint = function(option) {
var icon = {};
@@ -609,7 +612,7 @@
var dataHandle = {
_getDataOutHtml: function(data) {
if(data==null||data["state"]==4){
- return "<br/><h3>������������������������,������������������!</h3>";
+ return "<br/><h3>������������������������,������������������!</h3>";
}
var mac = data['mac'];
var itme_mac_key = "item-" + mac + "-" + key;
diff --git a/src/main/webapp/view/map.jsp b/src/main/webapp/view/map.jsp
index 425eb41..973baea 100644
--- a/src/main/webapp/view/map.jsp
+++ b/src/main/webapp/view/map.jsp
@@ -156,9 +156,9 @@
}
.list .state04 {
-
- background-color: #eee;
- color: #777
+ /*background-color: #eee;*/
+ /*color: #777 ;*/
+ background-color: #738d99 ;
}
/*
* ������������������---������������
--
Gitblit v1.8.0