From eec8a33340e2f3ae8bc09362e3912c88a8d59b27 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 31 十月 2018 10:59:18 +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 | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 51 insertions(+), 8 deletions(-)
diff --git a/gx_tieta/WebRoot/batt-life-manage.jsp b/gx_tieta/WebRoot/batt-life-manage.jsp
index 09f4171..d7e36e2 100644
--- a/gx_tieta/WebRoot/batt-life-manage.jsp
+++ b/gx_tieta/WebRoot/batt-life-manage.jsp
@@ -9,7 +9,7 @@
<head>
<base href="<%=basePath%>">
- <title>鍩虹珯缁埅鏃堕暱绠＄悊鍔熻兘</title> <!--鍩虹珯缁埅鏃堕暱绠＄悊鍔熻兘-->
+ <title><s:text name="Station_life_query"/></title> <!--鏈烘埧缁埅鑳藉姏鏌ヨ-->
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="css/basic.css" rel="stylesheet">
@@ -57,7 +57,7 @@
<!-- 涓讳綋鍐呭 -->
<div id="main">
<div id="eleInfor">
- <span class="summary"><s:text name="Batt_life_history_query"/>--><s:text name="Show/hide_the_query_conditions"/></span>
+ <span class="summary"><s:text name="Station_life_query"/>--><s:text name="Show/hide_the_query_conditions"/></span>
<div class="checkCon">
<!-- 缁存姢鍖轰俊鎭� -->
<form action="" id="search_form">
@@ -393,31 +393,63 @@
//鏋勯�犳煡璇㈡潯浠�
function createSearchParam(){
//alert($('#endu_type').val());
+ //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);
+ //console.info(temp);
return temp;
}
function searchBattLife(){
var temp = createSearchParam();
var json = JSON.stringify(temp);
+ var arrTd = new Array();
$.ajax({
type:"post",
url:"Batt_enduranceAction!serchByCondition",
async:true,
- datatype:'text',
+ datatype:'json',
data:"json="+json,
success:function(data){
- console.info(data);
- var data = JSON.parse(data.result);
+ //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);
+ }
- console.info(data);
}
})
}
@@ -521,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();
@@ -528,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