From ea44efb1603e51a7655f217321a5d8b439aa5d6a Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 01 Jun 2018 11:35:57 +0800
Subject: [PATCH] 配置文件
---
src/main/webapp/js/moralmap.js | 169 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 121 insertions(+), 48 deletions(-)
diff --git a/src/main/webapp/js/moralmap.js b/src/main/webapp/js/moralmap.js
index 7c6de2c..c2b46ce 100644
--- a/src/main/webapp/js/moralmap.js
+++ b/src/main/webapp/js/moralmap.js
@@ -54,7 +54,7 @@
style: "normal" //������������������������������
}
map.setMapStyle(mapStyle);
- var showZoom = 12;
+ var showZoom = 13;
if(arguments.length == 2) {
map.centerAndZoom(new BMap.Point(arguments[0], arguments[1]), showZoom);
} else if(arguments.length == 1) {
@@ -139,43 +139,57 @@
}
}
})();
+ // ���������������
+ moralMap.Bounds = function (baiduBounds) {
+ if(!!baiduBounds){
+ this.northeastLng = baiduBounds.xl.lng;//���������������������������
+ this.northeastLat = baiduBounds.xl.lat;//���������������������������
+ this.southwestLng = baiduBounds.Ol.lng;//���������������������������������
+ this.southwestLat = baiduBounds.Ol.lat;//���������������������������������
+ }else{
+ this.northeastLng = null;//���������������������������
+ this.northeastLat = null;//���������������������������
+ this.southwestLng = null;//���������������������������������
+ this.southwestLat = null;//���������������������������������
+ }
+ }
moralMap.getBounds = function() {
- return baiduMap.getBounds(); //������bounds;
+ return new moralMap.Bounds(baiduMap.getBounds()); //������bounds;
}
moralMap.getMaxBounds = function() {
var key = "_" + moralMap.layer() + "_bounds";
return this[key];
}
- moralMap.setMaxBounds = function(bounds) {
+ moralMap.setMaxBounds = function(bs) {
var key = "_" + moralMap.layer() + "_bounds";
- var _bounds = this[key]; //������������
- if(_bounds == undefined) {
- _bounds = {};
- }
- if(bounds == undefined) {
- bounds = baiduMap.getBounds();
- }
+ var _bounds = !!this[key]?this[key]:new moralMap.Bounds(); //������������
//������������������
- _bounds["Fe"] = _bounds['Fe'] || bounds['Fe']; //���������������������������
- _bounds["Ge"] = _bounds['Ge'] || bounds['Ge']; //���������������������������
- _bounds["Ke"] = _bounds['Ke'] || bounds['Ke']; //���������������������������������
- _bounds["Le"] = _bounds['Le'] || bounds['Le']; //���������������������������������
- _bounds["Fe"] = bounds['Fe'] > _bounds["Fe"] ? bounds['Fe'] : _bounds["Fe"]; //���������������������������
- _bounds["Ge"] = bounds['Ge'] > _bounds["Ge"] ? bounds['Ge'] : _bounds["Ge"]; //���������������������������
- _bounds["Ke"] = bounds['Ke'] < _bounds["Ke"] ? bounds['Ke'] : _bounds["Ke"]; //���������������������������������
- _bounds["Le"] = bounds['Le'] < _bounds["Le"] ? bounds['Le'] : _bounds["Le"]; //���������������������������������
+ _bounds.northeastLng = _bounds.northeastLng || bs.northeastLng;
+ _bounds.northeastLat = _bounds.northeastLat || bs.northeastLat;
+ _bounds.southwestLng = _bounds.southwestLng || bs.southwestLng;
+ _bounds.southwestLat = _bounds.southwestLat || bs.southwestLat;
+ _bounds.northeastLng = bs.northeastLng > _bounds.northeastLng ? bs.northeastLng: _bounds.northeastLng;
+ _bounds.northeastLat = bs.northeastLat > _bounds.northeastLat ? bs.northeastLat: _bounds.northeastLat;
+ _bounds.southwestLng = bs.southwestLng < _bounds.southwestLng ? bs.southwestLng: _bounds.southwestLng;
+ _bounds.southwestLat = bs.southwestLat < _bounds.southwestLat ? bs.southwestLat: _bounds.southwestLat;
this[key] = _bounds;
}
moralMap.isOverBounds = function() {
var isOver = false;
var _bounds = moralMap.getMaxBounds(); //������������
- var bounds = baiduMap.getBounds(); //������������
- if(_bounds == null) {
+ var bs = moralMap.getBounds(); //������������
+ if(!_bounds) {
isOver = true;
- moralMap.setMaxBounds(bounds);
+ moralMap.setMaxBounds(bs);
} else {
- isOver = (bounds['Fe'] > _bounds["Fe"] || bounds['Ge'] > _bounds["Ge"] || bounds['Ke'] < _bounds["Ke"] || bounds['Le'] < _bounds["Le"]);
- moralMap.setMaxBounds(bounds);
+ debugger;
+ isOver = (bs.northeastLng > _bounds.northeastLng
+ || bs.northeastLat > _bounds.northeastLat
+ || bs.southwestLng < _bounds.southwestLng
+ || bs.southwestLat < _bounds.southwestLat);
+ if(isOver){
+ moralMap.setMaxBounds(bs);
+ }
}
return isOver;
@@ -208,11 +222,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,36 +270,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 = {
+ 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(window["console"]!=undefined){
- console.log(equStr);
- }
- if(window['external']&&window['external']['showMonitorInfo']){
- window['external'].showMonitorInfo(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);
+ }
+ }
+
}
moralMap.setPopupEqus = function(arr) {
moralMap["_equs"] = arr;
@@ -350,7 +387,7 @@
break;
case 4:
state = 'state04';
- stateName = '������';
+ stateName = '������';
break;
}
return {
@@ -406,7 +443,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>";
@@ -501,9 +540,9 @@
//���������������
var winOpts = {
width: 110, // ������������������
- height: 50, // ������������������
+ height: 80, // ������������������
title: getTitleOutHtml(), // ������������������
- offset: new BMap.Size(-2, -21) //���������������������
+ offset: new BMap.Size(-2,0) //���������������������
}
function getTitleOutHtml() {
@@ -525,24 +564,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============================
//���������������
@@ -592,7 +634,7 @@
width: option["online_width"], // ������������������
height:option["online_height"], // ������������������
title: getTitleOutHtml(), // ������������������
- offset: new BMap.Size(-2, -30) //���������������������
+ offset: new BMap.Size(-2, -10) //���������������������
}
function getTitleOutHtml() {
@@ -778,7 +820,7 @@
return 18;
}
moralMap.getHorizonMarkers = function(isShow) {
- var bounds = baiduMap.getBounds();
+ var bounds = moralMap.getBounds();
var oldMarkerList;
var isShow = (isShow) ? baiduMap : null;
if(moralMap.layer() == "equipments") {
@@ -795,7 +837,8 @@
if(typeof option == 'object') {
var longitude = option['longitude'];
var latitude = option['latitude'];
- if(longitude < bounds['Ge'] && longitude > bounds['Le'] && latitude < bounds['Fe'] && latitude > bounds['Ke']) {
+ // ������������������������������������
+ if(longitude < bounds.northeastLng && longitude > bounds.southwestLng && latitude < bounds.northeastLat && latitude > bounds.southwestLat) {
markers.push(oldmarker);
}
}
@@ -804,5 +847,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