From 7be408b1ce28b70005cdf147f9c41065ddc43dea Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 08 May 2018 16:48:18 +0800
Subject: [PATCH] 设备信息修改
---
src/main/webapp/js/moralmap.js | 65 +++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 19 deletions(-)
diff --git a/src/main/webapp/js/moralmap.js b/src/main/webapp/js/moralmap.js
index 4efef27..57a3d85 100644
--- a/src/main/webapp/js/moralmap.js
+++ b/src/main/webapp/js/moralmap.js
@@ -245,32 +245,48 @@
}
//������������
moralMap.showPopupbox = function(id) {
- $(id).css('display', 'block');
+ setTimeout(function () {
+ $(id).css('display', 'block');
+ },1);
}
moralMap.closePopupbox = function(id) {
- $(id).css('display', 'none');
+ $(id).css('display', 'none');
}
moralMap.isPopupBoxShow = function(id) {
return $(id).css('display') == 'block';
}
- moralMap.onItermClick = function(index) {
+ moralMap.onItermClick = function(index,select) {
var row = moralMap.getPopupEqu(index);
+ if(row['mac']==null){
+ alert("mac���������������������������������������");
+ return;
+ }
var equ = {
name: row['name'],
mac: (row['mac']).toLowerCase(),
longitude: row['longitude'],
latitude: row['latitude'],
version:row['deviceVersion']['version']
- }
+ };
+ !!select?equ['monitorPointId'] = row["monitorPointId"]:null;
var equStr = JSON.stringify(equ);
- if(window["console"]!=undefined){
- console.log(equStr);
+ if(!!select&&select==='chart'){
+ if(window['external']&&window['external']['showChartInfo']){
+ window['external'].showChartInfo(equStr);
+ }else{
+ alert(equStr);
+ }
}
- if(window['external']&&window['external']['showMonitorInfo']){
- window['external'].showMonitorInfo(equStr);
- }else{
- alert(equStr);
- }
+ else{
+ if(window["console"]!=undefined){
+ console.log(equStr);
+ }
+ if(window['external']&&window['external']['showMonitorInfo']){
+ window['external'].showMonitorInfo(equStr);
+ }else{
+ alert(equStr);
+ }
+ }
}
moralMap.setPopupEqus = function(arr) {
moralMap["_equs"] = arr;
@@ -346,7 +362,7 @@
break;
case 4:
state = 'state04';
- stateName = '������';
+ stateName = '������';
break;
}
return {
@@ -402,7 +418,9 @@
}
name = name.substring(0, stop1) + "..." + name.substring(stop2, name.length);
}
- var li = "<li id='listview_item_" + e['mac'] + "' onclick=moralMap.onItermClick(" + i + ")><span id='listview_state_" + e['mac'] + "' class='" + state + "'>" + stateName + "</span>" + name + "</li>";
+ var li = "<li id='listview_item_" + e['mac'] + "'><span class='list-chart-span' onclick=moralMap.onItermClick(\"" + i + "\",'chart')><img src='/img/chart.png'></span>"
+ +"<span id='listview_state_" + e['mac'] + "'class='" + state + "'>" + stateName + "</span>" +
+ "<div style='cursor: pointer;' onclick=moralMap.onItermClick(\"" + i + "\")>" + name + "</div></li>";
outHtml += li;
}
outHtml += "</ul>";
@@ -452,7 +470,7 @@
enableMassClear: true
})
//������������
- var eventType = ['click', 'mouseover', 'mouseout'];
+ var eventType = ['click'];
for(var index in eventType) {
var eventName = eventType[index];
if(_option[eventName] != undefined && typeof _option[eventName] == "function") {
@@ -466,9 +484,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;
@@ -479,7 +500,7 @@
})
}
//new BMap.Marker()������������IE7���������������������
- moralMap.MoralMarker.prototype = BMap.Marker.prototype;
+ moralMap.MoralMarker.prototype = new BMap.Marker();
//��������������� ������Mark������
moralMap.Monitorpoint = function(option) {
var icon = {};
@@ -605,7 +626,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;
@@ -658,8 +679,14 @@
if(moralMask["infoWindow"] == undefined) {
moralMask["infoWindow"] = infoWindow;
}
+ var mouseOverHandle = option['mouseover'];
//���������������������
moralMask.addEventListener("mouseover", function() {
+ if(mouseOverHandle!=null&&mouseOverHandle instanceof Function){
+ //���arguments���������������
+ var args = Array.prototype.slice.call(arguments);
+ mouseOverHandle.apply(this, args);
+ }
moralMap.closeSearchBox();
baiduMap.openInfoWindow(infoWindow, this._point); //������������������
if(infoWindow.getContent() == "") {
--
Gitblit v1.8.0