From 6f027ced715654072cb57d4c40daafaf8da7b1ce Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期六, 13 十月 2018 14:26:54 +0800
Subject: [PATCH] 提交内容
---
gx_tieta/WebRoot/index.jsp | 2 +-
gx_tieta/WebRoot/pages/js/common.js | 6 +++++-
gx_tieta/WebRoot/batt-state-manage.jsp | 36 +++++++++++++-----------------------
3 files changed, 19 insertions(+), 25 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-state-manage.jsp b/gx_tieta/WebRoot/batt-state-manage.jsp
index 467c311..4bf6a3d 100644
--- a/gx_tieta/WebRoot/batt-state-manage.jsp
+++ b/gx_tieta/WebRoot/batt-state-manage.jsp
@@ -462,36 +462,36 @@
// 鍋滅數
if(_data.station_stat_poff) {
- arrTd[index++]= create_ali_font('icon-tingdian-', 'red');
+ arrTd[index++]= create_ali_font('icon-tingdian-', 'red', {msg:'鍋滅數寮傚父'});
}else {
- arrTd[index++]= create_ali_font('icon-tingdian-', 'green');
+ arrTd[index++]= create_ali_font('icon-tingdian-', 'green', {msg: '姝ｅ父'});
}
arrTd[index++]=_data.station_poff_start_time //鍋滅數寮�濮嬫椂闂�
// 鍙戠數
if(_data.station_stat_fadian) {
- arrTd[index++]= create_ali_font('icon-dynamotor', 'red'); //鍙戠數
+ arrTd[index++]= create_ali_font('icon-dynamotor', 'red', {msg: '鍙戠數寮傚父'}); //鍙戠數
}else {
- arrTd[index++]= create_ali_font('icon-dynamotor', 'green'); //鍙戠數
+ arrTd[index++]= create_ali_font('icon-dynamotor', 'green', {msg: '姝ｅ父'}); //鍙戠數
}
arrTd[index++]=_data.station_fadian_start_time;//鍙戠數寮�濮嬫椂闂�
// 鎺夌珯
if(_data.station_stat_diaozhan) {
- arrTd[index++]= create_ali_font('icon-dianchi', 'red');
+ arrTd[index++]= create_ali_font('icon-dianchi', 'red', {msg: '宸叉帀绔�'});
}else {
- arrTd[index++]= create_ali_font('icon-dianchi4', 'green');
+ arrTd[index++]= create_ali_font('icon-dianchi4', 'green', {msg: '姝ｅ父'});
}
arrTd[index++]=_data.station_diaozhan_start_time;//鎺夌珯寮�濮嬫椂闂�
// 寮�闂ㄥ叧闂ㄥ紓甯�
if(_data.station_stat_dooropen) {
- arrTd[index++] = create_ali_font('icon-quankaimen', 'red');
+ arrTd[index++] = create_ali_font('icon-quankaimen', 'red', {msg: '寮�闂�'});
}else {
- arrTd[index++] = create_ali_font('icon-quankaimen', 'green');
+ arrTd[index++] = create_ali_font('icon-quankaimen', 'green', {msg: '鍏抽棬'});
}
arrTd[index++]=_data.station_dooropen_start_time;//寮�闂ㄥ叧闂ㄥ紓甯告椂闂�
@@ -617,21 +617,11 @@
}
var ArrTd="";
for(var i=0;i<eleTd.length;i++)
- {
- if((i+1)%eleTh.length==4){ //鍋滅數
- //console.info(eleTd.eq(i).find('i class').find('style));
- //if(eleTd.eq(i).find('style').is('color: rgb(0, 128, 0)'){
- // console.info("鍋滅數");
- //ArrTd+=""
- //}
- //console.info(eleTd.eq(i).outerHTML);
- ArrTd+="鍋滅數"+"&";
- }else if((i+1)%eleTh.length==6){//鍙戠數
- ArrTd+=eleTd.eq(i).text()+"&";
- }else if((i+1)%eleTh.length==8){//鎺夌珯
- ArrTd+=eleTd.eq(i).text()+"&";
- }else if((i+1)%eleTh.length==10){//寮�闂ㄣ�佸叧闂�
- ArrTd+=eleTd.eq(i).text()+"&";
+ {
+ var _index = (i+1)%eleTh.length;
+ // 4--鍋滅數 6-
+ if(_index==4 || _index==6 || _index==8 || _index==10){ //鍋滅數
+ ArrTd+=eleTd.eq(i).find('.icon').data('msg')+"&";
}else{
ArrTd+=eleTd.eq(i).text()+"&";
}
diff --git a/gx_tieta/WebRoot/index.jsp b/gx_tieta/WebRoot/index.jsp
index 1adb3bf..479baa5 100644
--- a/gx_tieta/WebRoot/index.jsp
+++ b/gx_tieta/WebRoot/index.jsp
@@ -1583,7 +1583,7 @@
// 閬嶅巻鏌ヨ鍐呭鐢熸垚瀵瑰簲鐨勫浘鏍�
for(var i = 0; i < dotList.length; i++) {
- var dotIcon = new BMap.Icon(getMapStateImg(mapImages, dotList[0].msg), new BMap.Size(36, 30)); // 璁剧疆鍥剧墖
+ var dotIcon = new BMap.Icon(getMapStateImg(mapImages, dotList[i].msg), new BMap.Size(36, 30)); // 璁剧疆鍥剧墖
var pt = new BMap.Point(dotList[i].lng, dotList[i].lat);
var mk = new BMap.Marker(pt, {icon: dotIcon}); // 瀹氫箟marker鐐�
diff --git a/gx_tieta/WebRoot/pages/js/common.js b/gx_tieta/WebRoot/pages/js/common.js
index 74042e7..47b449f 100644
--- a/gx_tieta/WebRoot/pages/js/common.js
+++ b/gx_tieta/WebRoot/pages/js/common.js
@@ -426,12 +426,16 @@
})(jQuery, window, document, GLOBAL);
// 鐢熸垚闃块噷鍥炬爣鐨勫厓绱�
-function create_ali_font(cla, color) {
+function create_ali_font(cla, color, data) {
var i = $('<i class="icon iconfont"></i>');
i.addClass(cla);
i.css({
'color': color
});
+ Object.keys(data).forEach(function(key) {
+ var attr = 'data-'+key
+ i.attr(attr, data[key]);
+ });
// 鑾峰彇瀛楃涓�
var outerHTML = i[0].outerHTML;
return outerHTML;
--
Gitblit v1.9.1