From b47c0f6e0fae8777f96cc33dea041fd886a5677c Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期四, 29 十一月 2018 17:24:52 +0800
Subject: [PATCH] 添加最大，最小和平均实际续航时间
---
gx_tieta/WebRoot/batt-life-manage.jsp | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-life-manage.jsp b/gx_tieta/WebRoot/batt-life-manage.jsp
index b39def7..6a87c1a 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)', '鏄惁鎺夌珯'];
+ 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"/>'];
@@ -493,9 +493,9 @@
datatype:'json',
data:"json="+json,
success:function(data){
- //console.info(data);
var data = JSON.parse(data.result);
layer.close(load);
+ //console.info(data);
if(data.code==1&&data.data.length>0){
data=data.data;
var index = 0;
@@ -506,7 +506,9 @@
arrTd[index++]=data[i].real_cap;
arrTd[index++]=data[i].moncapstd;
arrTd[index++]=data[i].real_curr;
+ arrTd[index++]=data[i].endurance_actual_timelong_min;
arrTd[index++]=data[i].endurance_actual_timelong;
+ arrTd[index++]=data[i].endurance_actual_timelong_max;
arrTd[index++]=data[i].endurance_theory_timelong;
if(data[i].is_out_stand==0){ //鏈帀绔�(缁胯壊)
arrTd[index++]='<div class="status effect" ></div>';
--
Gitblit v1.9.1