From 42acb64952c98e07a0b10bbc9bee4fefb8a72a79 Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.17>
Date: 星期一, 29 十月 2018 16:42:33 +0800
Subject: [PATCH] 发声对象添加

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

diff --git a/gx_tieta/WebRoot/batt-life-manage.jsp b/gx_tieta/WebRoot/batt-life-manage.jsp
index ce825fa..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"/>--&gt;<s:text name="Show/hide_the_query_conditions"/></span>
+                <span class="summary"><s:text name="Station_life_query"/>--&gt;<s:text name="Show/hide_the_query_conditions"/></span>
                 <div class="checkCon">
                     <!-- 缁存姢鍖轰俊鎭� -->
                     <form action="" id="search_form">
@@ -393,9 +393,10 @@
 		//鏋勯�犳煡璇㈡潯浠�
 		function createSearchParam(){
 			//alert($('#endu_type').val());
+			//Page.pageCurr = $('#number').val();
 			var temp = {							
-				Page:{
-					pageSize:Page.pageSize,
+				page:{
+					pageSize:$('#number').val(),
 					pageCurr:Page.pageCurr,
 				},
 				stationName:$('#station_name').val(),					//鏈烘埧鍚�
@@ -404,14 +405,14 @@
 				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 arr = new Array();
+		var arrTd = new Array();
 			$.ajax({
 				type:"post",
 				url:"Batt_enduranceAction!serchByCondition",
@@ -421,7 +422,7 @@
 				success:function(data){
 					//console.info(data);
 					var data = JSON.parse(data.result);					
-					console.info(data);
+					//console.info(data);
 					if(data.code==1&&data.data.length>0){
 						data=data.data;
 						var index = 0;
@@ -442,6 +443,10 @@
 							} 
 							//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);
 					}
 					

--
Gitblit v1.9.1