From ca72da809fdf68f2d6833ed77ad92c9aadc0663d Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 22 May 2018 09:30:20 +0800
Subject: [PATCH] 地图 增加 监控点入口
---
src/main/webapp/js/moralmap.js | 98 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 72 insertions(+), 26 deletions(-)
diff --git a/src/main/webapp/js/moralmap.js b/src/main/webapp/js/moralmap.js
index 83dadce..4bcc87a 100644
--- a/src/main/webapp/js/moralmap.js
+++ b/src/main/webapp/js/moralmap.js
@@ -208,11 +208,22 @@
}
return moralMarker;
}
+ moralMap.clearCloseInfoWindow = function () {
+ if(!!moralMap["_closeInfoWinTimer"]){
+ clearTimeout(moralMap["_closeInfoWinTimer"]);
+ moralMap["_closeInfoWinTimer"] = null;
+ }
+ }
moralMap.openInfoWindow = function() {
- baiduMap.openInfoWindow.apply(baiduMap, arguments);
+ moralMap.clearCloseInfoWindow();
+ baiduMap.openInfoWindow.apply(baiduMap, arguments);; //������������������
}
moralMap.closeInfoWindow = function() {
- baiduMap.closeInfoWindow.apply(baiduMap, arguments);
+ var timer = setTimeout(function () {
+ baiduMap.closeInfoWindow.apply(baiduMap, arguments);
+ moralMap["_closeInfoWinTimer"] = null;
+ },1200);
+ moralMap["_closeInfoWinTimer"] = timer;
}
moralMap.clearOverlays = function() {
baiduMap.clearOverlays();
@@ -245,10 +256,12 @@
}
//������������
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';
@@ -260,31 +273,31 @@
return;
}
var equ = {
+ methodName : 'chart'== select ?'showChart':'showDeviceMonitor',
name: row['name'],
mac: (row['mac']).toLowerCase(),
longitude: row['longitude'],
latitude: row['latitude'],
+ monitorPointId: row['monitorPointId'],
version:row['deviceVersion']['version']
};
!!select?equ['monitorPointId'] = row["monitorPointId"]:null;
var equStr = JSON.stringify(equ);
- if(!!select&&select==='chart'){
- if(window['external']&&window['external']['showChartInfo']){
- window['external'].showChartInfo(equStr);
- }else{
- alert(equStr);
- }
+ if(window["console"]!=undefined){
+ console.log(equStr);
+ }
+ if(!!window['external']&&window['external']['callWin']){
+ window['external'].callWin(equStr);
+ }else{
+ if(!!select&&select==='chart'&&!!window['external']&&window['external']['showChartInfo']){
+ window['external'].showChartInfo(equStr);
+ }else 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;
@@ -513,7 +526,7 @@
//���������������
var winOpts = {
width: 110, // ������������������
- height: 50, // ������������������
+ height: 80, // ������������������
title: getTitleOutHtml(), // ������������������
offset: new BMap.Size(-2, -21) //���������������������
}
@@ -537,24 +550,27 @@
address = address.slice(0, 18) + "...";
}
var adressOutHtml = "";
- adressOutHtml += "<div style='font:12px arial,sans-serif;margin-top:12px'><table cellspacing='0' style='overflow:hidden;table-layout:fixed;width:100%;font:12px arial,sans-serif'>";
+ adressOutHtml += "<div onmouseover='moralMap.clearCloseInfoWindow()'";
+ adressOutHtml += "onmouseout='moralMap.closeInfoWindow()'";
+ adressOutHtml +=" style='font:12px arial,sans-serif;margin-top:12px'><table cellspacing='0' style='overflow:hidden;table-layout:fixed;width:100%;font:12px arial,sans-serif'>";
adressOutHtml += "<tbody><tr><td style='vertical-align:top;width:38px;white-space:nowrap;word-break:keep-all'>��������� </td><td style='line-height:16px'>";
adressOutHtml += address + " ";
- adressOutHtml += "</td></tr></tbody></table></div>";
+ adressOutHtml += "</td></tr>";
+ adressOutHtml += "<tr><td style='width:98%;padding-top:10px;'colspan='2'><a href='javascript:void(0);' style='display:block;position: relative;float: right;' onclick='moralMap.showPointMonitor("+option.id+")'>������������>></a></td></tr>";
+ adressOutHtml += "</tbody></table></div>";
return adressOutHtml;
}
return new BMap.InfoWindow(getAdressOutHtml(), winOpts);
})();
-
if(moralMask["infoWindow"] == undefined) {
moralMask["infoWindow"] = infoWindow;
}
//���������������������
moralMask.addEventListener("mouseover", function() {
- baiduMap.openInfoWindow(infoWindow, this._point); //������������������
+ moralMap.openInfoWindow(infoWindow, this._point); //������������������
});
moralMask.addEventListener("mouseout", function() {
- baiduMap.closeInfoWindow();
+ moralMap.closeInfoWindow();
});
//==================infoWindow-end============================
//���������������
@@ -816,5 +832,35 @@
}
return markers;
}
+ moralMap.showPointMonitor = function (id) {
+ var mpointMarker = moralMap.getMpoint(id);
+ var mpoint = mpointMarker.getOption();
+ if(!!mpoint){
+ delete mpoint['organization'];
+ delete mpoint['icon'];
+ delete mpoint['click'];
+ if(window["console"]!=undefined){
+ console.log(mpoint);
+ }
+ $.get("getvers?mptid="+id,function (res) {
+ if(!!res&&res.code==1){
+ mpoint['versions'] = res.data;
+ mpoint['methodName'] = 'showPointMonitor';
+ var mpointStr = JSON.stringify(mpoint);
+ if(!!window['external']&&window['external']['callWin']){
+ window['external'].callWin(mpointStr);
+ }else{
+ alert(JSON.stringify(mpointStr));
+ }
+ }
+ })
+ }else{
+ if(window["console"]!=undefined){
+ console.log("option of mpointMarker is null");
+ console.log(mpointMarker);
+ }
+ }
+
+ }
window.moralMap = moralMap;
})(jQuery, BMap, window);
\ No newline at end of file
--
Gitblit v1.8.0