From d0e6f9233235ee68eb74b350f15717173918cc69 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Thu, 22 Nov 2018 15:20:58 +0800
Subject: [PATCH] update
---
src/main/webapp/js/moralmap.js | 126 +++++++++++++++++++++++++++++++++++-------
1 files changed, 105 insertions(+), 21 deletions(-)
diff --git a/src/main/webapp/js/moralmap.js b/src/main/webapp/js/moralmap.js
index 594e11a..bc42550 100644
--- a/src/main/webapp/js/moralmap.js
+++ b/src/main/webapp/js/moralmap.js
@@ -58,7 +58,9 @@
style: "normal" //������������������������������
}
map.setMapStyle(mapStyle);
- var showZoom = 12;
+ var showZoom = !!arguments[2]
+ && arguments[2] <=defaultParam.maxZoom
+ && arguments[2] >= defaultParam.minZoom?arguments[2]:12;
var address = arguments[0];
var regoinNames = address.split(" ");
var cityName = regoinNames.length>1?regoinNames[1]:regoinNames[0];
@@ -554,7 +556,7 @@
icon["width"] = 50;
icon["height"] = 50;
option["icon"] = icon;
- var moralMask = new moralMap.MoralMarker(option);
+ var moralMarker = new moralMap.MoralMarker(option);
// var mark =new BMap.Marker(pointObj,{icon:iconObj});
//==================infoWindow-start============================
var infoWindow = (function() {
@@ -591,26 +593,26 @@
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>";
- 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 += "<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;
+ if(moralMarker["infoWindow"] == undefined) {
+ moralMarker["infoWindow"] = infoWindow;
}
//���������������������
- moralMask.addEventListener("mouseover", function() {
+ moralMarker.addEventListener("mouseover", function() {
moralMap.openInfoWindow(infoWindow, this._point); //������������������
});
- moralMask.addEventListener("mouseout", function() {
+ moralMarker.addEventListener("mouseout", function() {
moralMap.closeInfoWindow();
});
//==================infoWindow-end============================
//���������������
- moralMap.putMpoint(option['id'], moralMask);
- return moralMask;
+ moralMap.putMpoint(option['id'], moralMarker);
+ return moralMarker;
}
//������MonitorPoint������
moralMap.putMpoint = function(key, obj) {
@@ -646,10 +648,52 @@
option["offline_height"] = 80;
option["online_width"] = 355;
option["online_height"] = 385;
- var moralMask = new moralMap.MoralMarker(option);
+ var moralMarker = new moralMap.MoralMarker(option);
// var mark =new BMap.Marker(pointObj,{icon:iconObj});
//==================infoWindow-start============================
+
var infoWindow = (function() {
+ //���������������
+ var winOpts = {
+ width: 110, // ������������������
+ height: 80, // ������������������
+ title: getTitleOutHtml(), // ������������������
+ offset: new BMap.Size(-8,-5) //���������������������
+ }
+
+ function getTitleOutHtml() {
+ //title���������������...
+ var title = (option["name"] == null) ? "" : option["name"];
+ if(title.length > 13) {
+ title = title.slice(0, 13) + "...";
+ }
+ var titleOutHtml = "";
+ titleOutHtml += "<p style='width:210px;font:bold 14px/16px arial,sans-serif;margin:0;color:#cc5522;white-space:nowrap;overflow:hidden'"
+ titleOutHtml += "title='" + option["name"] + "'>";
+ titleOutHtml += title + "</p>";
+ return titleOutHtml;
+ }
+
+ function getAdressOutHtml() {
+ var address = (option["address"] == null) ? "" : option["address"];
+ if(address.length > 18) {
+ address = address.slice(0, 18) + "...";
+ }
+ var adressOutHtml = "";
+ 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>";
+ adressOutHtml += "</tbody></table></div>";
+ //$("#searchParam").val(address);
+ return adressOutHtml;
+ }
+ return new BMap.InfoWindow(getAdressOutHtml(), winOpts);
+ })();
+
+ /*var infoWindow = (function() {
//���������������
var winOpts = {
width: option["online_width"], // ������������������
@@ -723,14 +767,14 @@
}
return grade+"00";
}
- };
+ };*/
- if(moralMask["infoWindow"] == undefined) {
- moralMask["infoWindow"] = infoWindow;
+ if(moralMarker["infoWindow"] == undefined) {
+ moralMarker["infoWindow"] = infoWindow;
}
var mouseOverHandle = option['mouseover'];
//���������������������
- moralMask.addEventListener("mouseover", function() {
+ /*moralMarker.addEventListener("mouseover", function() {
if(mouseOverHandle!=null&&mouseOverHandle instanceof Function){
//���arguments���������������
var args = Array.prototype.slice.call(arguments);
@@ -752,23 +796,32 @@
infoWindow.redraw();
}
});
- moralMask.addEventListener("mouseout", function() {
+ moralMarker.addEventListener("mouseout", function() {
baiduMap.closeInfoWindow();
infoWindow.setContent("");
moralMap.openSearchBox();
+ });*/
+
+ moralMarker.addEventListener("mouseover", function() {
+ moralMap.openInfoWindow(infoWindow, this._point); //������������������
});
+ moralMarker.addEventListener("mouseout", function() {
+ moralMap.closeInfoWindow();
+ });
+
//==================infoWindow-end============================
//���������������
- moralMap.putEquipment(option['mac'], moralMask);
- var _super_refreshState = moralMask.refreshState;
- return $.extend(moralMask, {
+ moralMap.putEquipment(option['mac'], moralMarker);
+ var _super_refreshState = moralMarker.refreshState;
+ //$("#searchParam").val(option['mac']);
+ return $.extend(moralMarker, {
refreshState: function(data) {
if(data != null && data!="") {
var state = this.getOption()["state"];
this.setData(data); //������������
_super_refreshState.call(this, data["state"]);
//������������������������������,������������������������
- if(infoWindow.isOpen()) {
+ /*if(infoWindow.isOpen()) {
if(data["state"]==4){
if(state!=4){
infoWindow.setHeight(option["offline_height"]);
@@ -797,7 +850,7 @@
$(itme_data_mac_key).text(dataValue);
}
}
- }
+ }*/
}
},
setData:function(data){
@@ -900,6 +953,37 @@
}
}
- }
+ }
+
+ moralMap.callJS = function(condition) {
+ //$("#searchParam").val(condition);
+ //var condition = JSON.parse(condition);
+ var new_point = new BMap.Point(condition.longitude, condition.latitude);
+ baiduMap.panTo(new_point);
+ baiduMap.setCenter(new_point);
+
+ if (condition.type == "mpoint") {
+ baiduMap.setZoom(17);
+ if(moralMap.getMpoint(condition.id)){
+ moralMap.openInfoWindow(moralMap.getMpoint(condition.id)["infoWindow"], new_point);
+ }else {
+ //$("#searchParam").val(condition.id);
+ }
+ } else if (condition.type == "device") {
+ //baiduMap.centerAndZoom(new_point, 18);
+ baiduMap.setZoom(18);
+ if(moralMap.getEquipment(condition.mac)){
+ moralMap.openInfoWindow(moralMap.getEquipment(condition.mac)["infoWindow"], new_point);
+ } else {
+ //var equipment = new moralMap.Equipment(condition);
+ //moralMap.openInfoWindow(showInfoWindow, new_point);
+ //moralMap.openInfoWindow(equipment["infoWindow"], new_point);
+ //moralMap.openInfoWindow(moralMap.getEquipment(condition.mac)["infoWindow"], new_point);
+ //moralMap.callJS(condition);
+ }
+ }
+ }
+
+
window.moralMap = moralMap;
})(jQuery, BMap, window);
\ No newline at end of file
--
Gitblit v1.8.0