From 71d49c588d62385a57a2ea5434f3c407a1d5c1ca Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Fri, 30 Mar 2018 15:59:27 +0800
Subject: [PATCH] 调整 计算平均值算法
---
src/main/webapp/js/moralmap.js | 121 ++++++++++++++++++++++++++--------------
1 files changed, 78 insertions(+), 43 deletions(-)
diff --git a/src/main/webapp/js/moralmap.js b/src/main/webapp/js/moralmap.js
index c28f4b8..57a3d85 100644
--- a/src/main/webapp/js/moralmap.js
+++ b/src/main/webapp/js/moralmap.js
@@ -26,20 +26,20 @@
/*
* ������mac������������version
*/
- moralMap.getVersion = function(mac){
- var version = null;
- $.ajax({
- type:"get",
- url:"getversion?mac="+mac,
- async:false,
- success:function(jsonData){
- if(jsonData!=null&&typeof jsonData=='object'){
- version = jsonData['version'];
- }
- }
- });
- return version;
- }
+ // moralMap.getVersion = function(mac){
+ // var version = null;
+ // $.ajax({
+ // type:"get",
+ // url:"getversion?mac="+mac,
+ // async:false,
+ // success:function(jsonData){
+ // if(jsonData!=null&&typeof jsonData=='object'){
+ // version = jsonData['version'];
+ // }
+ // }
+ // });
+ // return version;
+ // }
/*
* ���������������������
*/
@@ -245,32 +245,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 = {
name: row['name'],
mac: (row['mac']).toLowerCase(),
longitude: row['longitude'],
latitude: row['latitude'],
- version:moralMap.getVersion(row['mac'])
- }
+ 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;
@@ -346,7 +362,7 @@
break;
case 4:
state = 'state04';
- stateName = '������';
+ stateName = '������';
break;
}
return {
@@ -370,7 +386,6 @@
async: true,
success: function(res) {
if(res!=null&&res.total!=null) {
- debugger;
var rows = res.data;
if(rows==null||rows.length == 0) {
$(option['id']).html("������������������������������");
@@ -403,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>";
@@ -453,7 +470,7 @@
enableMassClear: true
})
//������������
- var eventType = ['click', 'mouseover', 'mouseout'];
+ var eventType = ['click'];
for(var index in eventType) {
var eventName = eventType[index];
if(_option[eventName] != undefined && typeof _option[eventName] == "function") {
@@ -467,9 +484,12 @@
}
return $.extend(this, {
refreshState: function(state) {
- _option['state'] = state;
- var iconObj = _getMapIcon(state);
- this.setIcon(iconObj);
+ //��������������������������������� ������
+ if(_option['state'] != state){
+ _option['state'] = state;
+ var iconObj = _getMapIcon(state);
+ this.setIcon(iconObj);
+ }
},
getOption: function() {
return _option;
@@ -480,7 +500,7 @@
})
}
//new BMap.Marker()������������IE7���������������������
- moralMap.MoralMarker.prototype = BMap.Marker.prototype;
+ moralMap.MoralMarker.prototype = new BMap.Marker();
//��������������� ������Mark������
moralMap.Monitorpoint = function(option) {
var icon = {};
@@ -569,7 +589,7 @@
//��������������� ������MoralMark������
moralMap.Equipment = function(option) {
var icon = {};
- icon["stateIcons"] = ["img/ico_coo00.png", "img/ico_coo01.png", "img/ico_coo02.png", "img/ico_coo03.png", "img/ico_coo04.png"];
+ icon["stateIcons"] = ["/img/ico_coo00.png", "/img/ico_coo01.png", "/img/ico_coo02.png", "/img/ico_coo03.png", "/img/ico_coo04.png"];
icon["width"] = 50;
icon["height"] = 60;
option["icon"] = icon;
@@ -606,7 +626,7 @@
var dataHandle = {
_getDataOutHtml: function(data) {
if(data==null||data["state"]==4){
- return "<br/><h3>������������������������,������������������!</h3>";
+ return "<br/><h3>������������������������,������������������!</h3>";
}
var mac = data['mac'];
var itme_mac_key = "item-" + mac + "-" + key;
@@ -633,18 +653,22 @@
},
_getSensorState: function(data, key) {
var grade="grade";
+ var levels;
if(data["level3"]!=null){
- if($.inArray(key,data["level3"])!=-1){
+ levels = data["level3"] instanceof Array ? data["level3"]:JSON.parse(data["level3"]);
+ if($.inArray(key,levels)!=-1){
return grade+"03";
}
}
if(data["level2"] !=null){
- if($.inArray(key,data["level2"])!=-1){
+ levels = data["level2"] instanceof Array ? data["level2"]:JSON.parse(data["level2"]);
+ if($.inArray(key,levels)!=-1){
return grade+"02";
}
}
if(data["level1"] !=null){
- if($.inArray(key,data["level1"])!=-1){
+ levels = data["level1"] instanceof Array ? data["level1"]:JSON.parse(data["level1"]);
+ if($.inArray(key,levels)!=-1){
return grade+"01";
}
}
@@ -655,8 +679,14 @@
if(moralMask["infoWindow"] == undefined) {
moralMask["infoWindow"] = infoWindow;
}
+ var mouseOverHandle = option['mouseover'];
//���������������������
moralMask.addEventListener("mouseover", function() {
+ if(mouseOverHandle!=null&&mouseOverHandle instanceof Function){
+ //���arguments���������������
+ var args = Array.prototype.slice.call(arguments);
+ mouseOverHandle.apply(this, args);
+ }
moralMap.closeSearchBox();
baiduMap.openInfoWindow(infoWindow, this._point); //������������������
if(infoWindow.getContent() == "") {
@@ -733,13 +763,18 @@
}
//������MonitorPoint������
moralMap.putEquipment = function(key, obj) {
- key = String.prototype.toLowerCase.call(key);
- if(moralMap['_equipments'] == undefined) {
- moralMap['_equipments'] = {};
+ if(key!=null&&key!=""){
+ key = String.prototype.toLowerCase.call(key);
+ if(moralMap['_equipments'] == undefined) {
+ moralMap['_equipments'] = {};
+ }
+ moralMap['_equipments'][key] = obj;
}
- moralMap['_equipments'][key] = obj;
}
moralMap.getEquipment = function(key) {
+ if(key == null){
+ return null;
+ }
key = String.prototype.toLowerCase.call(key);
if(typeof moralMap['_equipments'] === 'object') {
return moralMap['_equipments'][key];
--
Gitblit v1.8.0