From 7014fd76c199e676159ac30da6f4dbb91e3a137e Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 06 Feb 2018 16:50:31 +0800
Subject: [PATCH] 地图相关
---
src/main/webapp/js/moralmap.js | 41 +++++++++++++++++------------------------
1 files changed, 17 insertions(+), 24 deletions(-)
diff --git a/src/main/webapp/js/moralmap.js b/src/main/webapp/js/moralmap.js
index e26429f..fd71c22 100644
--- a/src/main/webapp/js/moralmap.js
+++ b/src/main/webapp/js/moralmap.js
@@ -360,29 +360,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 +406,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>";
@@ -494,7 +483,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 +568,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 +632,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";
}
}
--
Gitblit v1.8.0