From b8b791df46b97c724e5f2dd0319bb6f527aecd62 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.23>
Date: 星期五, 30 十一月 2018 10:34:28 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

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

diff --git a/gx_tieta/WebRoot/batt-life-manage.jsp b/gx_tieta/WebRoot/batt-life-manage.jsp
index efff5c5..9ee83f5 100644
--- a/gx_tieta/WebRoot/batt-life-manage.jsp
+++ b/gx_tieta/WebRoot/batt-life-manage.jsp
@@ -515,7 +515,7 @@
 							arrTd[index++]=data[i].endurance_actual_timelong;
 							arrTd[index++]=data[i].endurance_actual_timelong_max;
 							arrTd[index++]=data[i].endurance_theory_timelong;
-							console.info(data[i].deviceId+"===="+data[i].is_out_stand);
+							//console.info(data[i].deviceId+"===="+data[i].is_out_stand);
 							if(data[i].is_out_stand==0){  //鏈帀绔�(缁胯壊)
 								arrTd[index++]='<div class="status effect" ></div>';
 							}

--
Gitblit v1.9.1