From 3120cdd01c8e6a2a1edefb6ff251c026f44dee5c Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Thu, 08 Feb 2018 11:40:31 +0800
Subject: [PATCH] updated
---
src/main/webapp/js/moralmap.js | 96 ++++++++++++++++++++++++++----------------------
1 files changed, 52 insertions(+), 44 deletions(-)
diff --git a/src/main/webapp/js/moralmap.js b/src/main/webapp/js/moralmap.js
index e26429f..7dde6fd 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;
+ // }
/*
* ���������������������
*/
@@ -255,12 +255,16 @@
}
moralMap.onItermClick = function(index) {
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']
}
var equStr = JSON.stringify(equ);
if(window["console"]!=undefined){
@@ -360,29 +364,18 @@
var pageSize = option["pageSize"] || 20;
var pageNo = option["pageNo"] || 1;
var url = option['url'];
- url += "&page=" + pageNo;
- url += "&rows=" + pageSize;
+ url += "&pageNo=" + pageNo;
+ url += "&pageSize=" + pageSize;
+ console.log(url);
$.ajax({
type: "get",
cache: false,
url: url,
async: true,
- success: function(data) {
- if(data) {
- if(typeof data !== 'object' && typeof data === 'string') {
- try {
- data = $.parseJSON(data);
- } catch(e) {
- return;
- }
- }
- var rows = null;
- if(data['rows'] != undefined) {
- rows = data['rows'];
- } else {
- rows = data;
- }
- if(rows.length == 0) {
+ success: function(res) {
+ if(res!=null&&res.total!=null) {
+ var rows = res.data;
+ if(rows==null||rows.length == 0) {
$(option['id']).html("������������������������������");
return;
}
@@ -417,7 +410,7 @@
outHtml += li;
}
outHtml += "</ul>";
- var total = data['total'];
+ var total = res['total'];
var totalPage = Math.ceil(total / pageSize);
if(totalPage > 1) {
outHtml += "<div id='page' class='page_div'></div>";
@@ -463,7 +456,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") {
@@ -494,7 +487,7 @@
//��������������� ������Mark������
moralMap.Monitorpoint = function(option) {
var icon = {};
- icon["stateIcons"] = ["img/ico00.png", "img/ico01.png", "img/ico02.png", "img/ico03.png", "img/ico04.png"];
+ icon["stateIcons"] = ["/img/ico00.png", "/img/ico01.png", "/img/ico02.png", "/img/ico03.png", "/img/ico04.png"];
icon["width"] = 50;
icon["height"] = 50;
option["icon"] = icon;
@@ -579,7 +572,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;
@@ -643,18 +636,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";
}
}
@@ -665,8 +662,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() == "") {
@@ -743,13 +746,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