From 024e698be593014fff2f16112f46ab144257a1f9 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 07 Feb 2018 09:42:21 +0800
Subject: [PATCH] 地图相关 mac 大小写保持一致性
---
src/main/webapp/js/moralmap.js | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/js/moralmap.js b/src/main/webapp/js/moralmap.js
index c28f4b8..107a9c1 100644
--- a/src/main/webapp/js/moralmap.js
+++ b/src/main/webapp/js/moralmap.js
@@ -370,7 +370,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("������������������������������");
@@ -569,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;
@@ -633,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";
}
}
@@ -740,6 +743,9 @@
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