From 769d4ca92b39f55b6af50e12b851e58e93a3eba4 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@192.168.10.9>
Date: 星期五, 19 十月 2018 14:44:06 +0800
Subject: [PATCH] rf

---
 gx_tieta/WebRoot/batt-state-manage.jsp |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/gx_tieta/WebRoot/batt-state-manage.jsp b/gx_tieta/WebRoot/batt-state-manage.jsp
index 1c4e701..f25de4d 100644
--- a/gx_tieta/WebRoot/batt-state-manage.jsp
+++ b/gx_tieta/WebRoot/batt-state-manage.jsp
@@ -447,6 +447,7 @@
 				StationId: stationid?stationid:0,
 				
 			};
+			console.info(temp);
 			return temp;
 		}
 
@@ -464,7 +465,7 @@
 					var index = 0;
 					var data = JSON.parse(data.result);
 					if(data.code==1&&data.data!=null){
-						//console.info(data.data);
+						console.info(data.data);
 						var data = data.data;
 						//console.info(data[0].dev_id);
 						for(i=0;i<data.length;i++){
@@ -675,9 +676,12 @@
 			{
 				var _index = (i+1)%eleTh.length;
 				var _icon = eleTd.eq(i).find('.icon');
+				var _fa = eleTd.eq(i).find('.fa');
 				if(_icon.length) {
 					ArrTd+=eleTd.eq(i).find('.icon').data('msg')+"&";
-				}else {
+				}else if(_fa.length){
+					ArrTd+=eleTd.eq(i).find('.fa').data('msg')+"&";
+				}else{
 					ArrTd+=eleTd.eq(i).text()+"&";
 				}
 			}

--
Gitblit v1.9.1