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 | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-life-manage.jsp b/gx_tieta/WebRoot/batt-life-manage.jsp
index 6a87c1a..9ee83f5 100644
--- a/gx_tieta/WebRoot/batt-life-manage.jsp
+++ b/gx_tieta/WebRoot/batt-life-manage.jsp
@@ -160,7 +160,7 @@
var tblStatus = new Array(); // 琛ㄦ牸鐘舵�佹暟缁�
var tblOptsHd = new Array(); // 琛ㄦ牸閫夐」澶撮儴
var tblOptsBd = new Array(); // 琛ㄦ牸閫夐」鏁扮粍
- arrTh = ['璁惧ID', '鏈烘埧鍚嶇О', '瀹為檯瀹归噺', '鏍囩О瀹归噺','瀹為檯鐢垫祦', '鏈�灏忓疄闄呯画鑸椂闂�(min)','骞冲潎瀹為檯缁埅鏃堕棿(min)', '鏈�澶у疄闄呯画鑸椂闂�(min)', '鐞嗚缁埅鏃堕棿(min)', '鏄惁鎺夌珯'];
+ arrTh = ['璁惧ID', '鏈烘埧鍚嶇О', '瀹為檯瀹归噺', '鏍囩О瀹归噺','璐熻浇鐢垫祦', '鏈�灏忓疄闄呯画鑸椂闂�(min)','骞冲潎瀹為檯缁埅鏃堕棿(min)', '鏈�澶у疄闄呯画鑸椂闂�(min)', '鐞嗚缁埅鏃堕棿(min)', '鏄惁鎺夌珯'];
//arrTh = ['<s:text name="Maintenance_area"/>', '<s:text name="Computer_name"/>', '<s:text name="Nominal_capacity"/>(AH)', '<s:text name="Actual_capacity"/>(AH)','<s:text name="Residual_capacity"/>(AH)', '<s:text name="real_time"/><s:text name="Current"/>(A)', '<s:text name="Power_cut"/><s:text name="Endurance"/><s:text name="Time"/>'];
//tblOptsHd = ['缂栧彿', '閫夐」', '鏄惁閫夋嫨'];
tblOptsHd = ['<s:text name="Number"/>', '<s:text name="Options"/>', '<s:text name="IsChecked"/>'];
@@ -283,6 +283,11 @@
// 鐪�-甯�-鏈烘埧-鐢垫睜缁�
var filterLoad;
$(document).ready(function(){
+ var pre_is_stand = getQueryString('is_stand');
+ if(pre_is_stand){
+ $('#is_stand').val(pre_is_stand);
+ }
+
filterLoad = layer.load();
var pre_province = getQueryString('province');
@@ -510,6 +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);
if(data[i].is_out_stand==0){ //鏈帀绔�(缁胯壊)
arrTd[index++]='<div class="status effect" ></div>';
}
--
Gitblit v1.9.1