From 8ea24dd5fb6e1b24d3a7ef62a0060ef516f8f759 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Thu, 24 May 2018 08:58:16 +0800
Subject: [PATCH] 更新 监测点 数据

---
 src/main/webapp/js/moralmap.js |   72 +++++++++++++++++++++++++----------
 1 files changed, 51 insertions(+), 21 deletions(-)

diff --git a/src/main/webapp/js/moralmap.js b/src/main/webapp/js/moralmap.js
index e603e0a..4bcc87a 100644
--- a/src/main/webapp/js/moralmap.js
+++ b/src/main/webapp/js/moralmap.js
@@ -224,7 +224,6 @@
             moralMap["_closeInfoWinTimer"] = null;
         },1200);
         moralMap["_closeInfoWinTimer"] = timer;
-
 	}
 	moralMap.clearOverlays = function() {
 		baiduMap.clearOverlays();
@@ -274,6 +273,7 @@
             return;
         }
 		var equ = {
+            methodName : 'chart'== select ?'showChart':'showDeviceMonitor',
 			name: row['name'],
 			mac: (row['mac']).toLowerCase(),
 			longitude: row['longitude'],
@@ -283,23 +283,21 @@
 		};
 		!!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;
@@ -528,7 +526,7 @@
 			//���������������
 			var winOpts = {
 				width: 110, // ������������������
-				height: 50, // ������������������
+				height: 80, // ������������������
 				title: getTitleOutHtml(), // ������������������
 				offset: new BMap.Size(-2, -21) //���������������������
 			}
@@ -552,12 +550,14 @@
 					address = address.slice(0, 18) + "...";
 				}
 				var adressOutHtml = "";
-				adressOutHtml += "<div onmouseover='moralMap.clearCloseInfoWindow()'"
-                adressOutHtml +=	"onmouseout='moralMap.closeInfoWindow()'"
+				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'>���������&nbsp;</td><td style='line-height:16px'>";
 				adressOutHtml += address + "&nbsp;";
-				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);
@@ -832,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