From 5b5c54680381fd08fa5e50ac5c8fb841243a7c99 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 15 Mar 2018 14:58:04 +0800
Subject: [PATCH] 地图相关资源
---
src/main/webapp/js/moralmap.js | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/src/main/webapp/js/moralmap.js b/src/main/webapp/js/moralmap.js
index 7c6de2c..83dadce 100644
--- a/src/main/webapp/js/moralmap.js
+++ b/src/main/webapp/js/moralmap.js
@@ -253,7 +253,7 @@
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���������������������������������������");
@@ -265,16 +265,26 @@
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;
@@ -350,7 +360,7 @@
break;
case 4:
state = 'state04';
- stateName = '������';
+ stateName = '������';
break;
}
return {
@@ -406,7 +416,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>";
--
Gitblit v1.8.0