From a4f1d4cd325f9ae6a2879dd5e53ac189fe6d1677 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期六, 29 九月 2018 17:44:29 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/batt-life-manage.jsp | 103 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 80 insertions(+), 23 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-life-manage.jsp b/gx_tieta/WebRoot/batt-life-manage.jsp
index 5ea65d0..4dde31e 100644
--- a/gx_tieta/WebRoot/batt-life-manage.jsp
+++ b/gx_tieta/WebRoot/batt-life-manage.jsp
@@ -15,7 +15,7 @@
<link href="css/basic.css" rel="stylesheet">
<link rel="stylesheet" href="css/BrdwMaint.css">
<link rel="stylesheet" type="text/css" href="css/loading.css">
-
+ <link rel="stylesheet" type="text/css" href="css/dischargeplan_layout.css">
<meta http-equiv="pragma" content="no-cache">
<meta http-equiv="cache-control" content="no-cache">
<meta http-equiv="expires" content="0">
@@ -66,8 +66,8 @@
<td>鐪�</td> <!-- 鐪� -->
<td>甯�</td> <!-- 甯� -->
<td><s:text name="Computer_name"/></td> <!-- 鏈烘埧鍚嶇О -->
- <td>缁埅绫诲瀷</td> <!--缁埅绫诲瀷 -->
- <td>缁埅鏃堕棿</td>
+ <td>鎺夌珯</td>
+ <td>瀹為檯缁埅鏃堕棿</td>
</tr>
<tr>
<td>
@@ -86,18 +86,18 @@
</select>
</td>
<td>
- <select id="endurance_state">
- <option value=0>鍏ㄩ儴</option>
- <option value=1>瀹炴椂缁埅</option>
- <option value=2>娼滃湪缁埅</option>
+ <select id="is_stand">
+ <option value=100>鍏ㄩ儴</option>
+ <option value=1>鏄�</option>
+ <option value=0>鍚�</option>
</select>
</td>
<td>
- <select id="endurance_timelong">
+ <select id="actual_timelong">
<option value =0>鍏ㄩ儴</option>
- <option value=60>缁埅鏃堕棿灏忎簬1灏忔椂</option>
- <option value=120>缁埅鏃堕棿灏忎簬2灏忔椂</option>
- <option value=180>缁埅鏃堕棿灏忎簬3灏忔椂</option>
+ <option value=60>瀹為檯缁埅鏃堕棿灏忎簬1灏忔椂</option>
+ <option value=120>瀹為檯缁埅鏃堕棿灏忎簬2灏忔椂</option>
+ <option value=180>瀹為檯缁埅鏃堕棿灏忎簬3灏忔椂</option>
</select>
</td>
@@ -161,7 +161,7 @@
var tblStatus = new Array(); // 琛ㄦ牸鐘舵�佹暟缁�
var tblOptsHd = new Array(); // 琛ㄦ牸閫夐」澶撮儴
var tblOptsBd = new Array(); // 琛ㄦ牸閫夐」鏁扮粍
- arrTh = ['璁惧ID', '鏈烘埧鍚嶇О', '缁埅鐘舵�� ','瀹為檯瀹归噺', '鏍囩О瀹归噺','瀹為檯鐢垫祦','缁埅鏃堕棿(min)'];
+ arrTh = ['璁惧ID', '鏈烘埧鍚嶇О', '瀹為檯瀹归噺', '鏍囩О瀹归噺','瀹為檯鐢垫祦','瀹為檯缁埅鏃堕棿(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"/>'];
@@ -378,7 +378,7 @@
var _attr = {
StationId: __data.StationId
};
- var tmp = getOptionsData(__data.StationName3, __data.StationName3, __data, _attr);
+ var tmp = getOptionsData(__data.StationName3, __data.StationName, __data, _attr);
optsList.push(tmp);
}
@@ -393,20 +393,66 @@
//鏋勯�犳煡璇㈡潯浠�
function createSearchParam(){
//alert($('#endu_type').val());
- var temp = {
- num:3, //鐢垫睜鐘舵��
- BattGroupId:$("#endu_type").val(), //鏌ヨ鏁版嵁
- StationName:$('#station_name').val(), //鏈烘埧鍚�
- StationName2:$('#city').val(), //甯�
- StationName1:$('#station_name1').val(), //缁存姢鍖�
- BattProductDate:$('#starttime').val()+" 00:00:00",
- BattProductDate1:$('#endtime').val()+" 23:59:59", //鐢熶骇鏃ユ湡娈�
+ //Page.pageCurr = $('#number').val();
+ var temp = {
+ page:{
+ pageSize:$('#number').val(),
+ pageCurr:Page.pageCurr,
+ },
+ stationName:$('#station_name').val(), //鏈烘埧鍚�
+ stationName2:$('#city').val(), //甯�
+ stationName1:$('#station_name1').val(), //鐪�
+ is_out_stand:$('#is_stand').val(), //鏄惁鎺夌珯
+ endurance_actual_timelong:$('#actual_timelong').val(), //瀹為檯
};
//console.info(temp);
return temp;
}
-
+ function searchBattLife(){
+ var temp = createSearchParam();
+ var json = JSON.stringify(temp);
+ var arr = new Array();
+ $.ajax({
+ type:"post",
+ url:"Batt_enduranceAction!serchByCondition",
+ async:true,
+ datatype:'json',
+ data:"json="+json,
+ success:function(data){
+ //console.info(data);
+ var data = JSON.parse(data.result);
+ //console.info(data);
+ if(data.code==1&&data.data.length>0){
+ data=data.data;
+ var index = 0;
+ var ArryTb= new Array();
+ for(i=0;i<data.length;i++){
+ arrTd[index++]=data[i].deviceId;
+ arrTd[index++]=data[i].stationName;
+ arrTd[index++]=data[i].real_cap;
+ arrTd[index++]=data[i].moncapstd;
+ arrTd[index++]=data[i].real_curr;
+ arrTd[index++]=data[i].endurance_actual_timelong;
+ arrTd[index++]=data[i].endurance_theory_timelong;
+ if(data[i].is_out_stand==0){ //鏈帀绔�(缁胯壊)
+ arrTd[index++]='<div class="status effect" ></div>';
+ }
+ else if(data[i].is_out_stand==1){
+ arrTd[index++]='<div class="status no-effect"></div>';
+ }
+ //arrTd[index++]=data[i].is_out_stand;
+ }
+ Page.pageAll = data[data.length-1].page.pageAll;
+ var pageNum=Math.ceil(Page.pageAll/Page.pageSize);
+ $('#total').text(Page.pageAll);
+ $('#current').text(Page.pageCurr+"/"+pageNum);
+ createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);
+ }
+
+ }
+ })
+ }
//棣栭〉
$('#home').click(function(){
if(Page!=undefined){
@@ -507,6 +553,7 @@
function exprotTable(eleTh,eleTd,eleform,eleTh_Text,eleTd_Text){
//alert("瀵煎嚭");
var ArrTh=new Array();
+ var a=0;
for(var i=0;i<eleTh.length;i++)
{
ArrTh[i]=eleTh.eq(i).text();
@@ -514,7 +561,17 @@
var ArrTd="";
for(var i=0;i<eleTd.length;i++)
{
- ArrTd+=eleTd.eq(i).text()+"&";
+ if((i+1)%eleTh.length==0){
+ //console.info(eleTd.eq(i).text());
+ if(eleTd.eq(i).find('div class').is('status no-effect')){
+ ArrTd+="宸叉帀绔�";
+ }else{
+ ArrTd+="鏈帀绔�";
+ }
+ ArrTd+=eleTd.eq(i).text()+"&";
+ }else{
+ ArrTd+=eleTd.eq(i).text()+"&";
+ }
}
eleTh_Text.attr('value',ArrTh);
eleTd_Text.attr('value',ArrTd);
--
Gitblit v1.9.1