From fda5a7a696628c9d430c765920ffd976c9532ec5 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 04 May 2018 16:28:27 +0800
Subject: [PATCH] 运维app
---
src/main/webapp/js/moralmap.js | 38 ++++++++++++++++++++++++++------------
1 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/src/main/webapp/js/moralmap.js b/src/main/webapp/js/moralmap.js
index 05e0221..57a3d85 100644
--- a/src/main/webapp/js/moralmap.js
+++ b/src/main/webapp/js/moralmap.js
@@ -245,15 +245,17 @@
}
//������������
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���������������������������������������");
@@ -265,16 +267,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;
@@ -406,7 +418,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