From a122a8fd04497cd65849eaca362fd82976ef6a88 Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期三, 24 十月 2018 10:05:43 +0800
Subject: [PATCH] gai

---
 gx_tieta/WebRoot/batt-state-manage.jsp |   35 +++++++++++++++++++++++++++--------
 1 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/gx_tieta/WebRoot/batt-state-manage.jsp b/gx_tieta/WebRoot/batt-state-manage.jsp
index f25de4d..fb758f9 100644
--- a/gx_tieta/WebRoot/batt-state-manage.jsp
+++ b/gx_tieta/WebRoot/batt-state-manage.jsp
@@ -16,6 +16,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/basic-layout.css"/>
     <link rel="stylesheet" href="css/nocontent.css">
     <link rel="stylesheet" href="alifont/iconfont.css">	
 	<meta http-equiv="pragma" content="no-cache">
@@ -67,7 +68,10 @@
 	       background-color: #2f97ff;
 	       color: #FFFFFF;
 	   } 
-	  
+	   #eleInfor .checkCon table input {
+    width: auto; 
+    height: 20px;
+} 
 	</style>
     </head>
     <body>
@@ -80,7 +84,7 @@
         <div id="main">
             <div id="eleInfor">
                 <span class="summary">鍩虹珯鐘舵�佺鐞嗘煡璇�--&gt;<s:text name="Show/hide_the_query_conditions"/></span>
-                <div class="checkCon">
+                <div class="checkCon filter-container">
                 	<form action="" id="search_form">
                     <!-- 缁存姢鍖轰俊鎭� -->
                     <table>
@@ -110,6 +114,15 @@
                             
                         </tr>
                     </table>
+                    <table class="condi-opt">
+				<tr>
+					<td><input type="checkbox" id="" name=""  value="" class="" />鍋滅數</td>		<!-- 鍋滅數 -->
+					<td><input type="checkbox" id="" name=""  value="" class="" />鍙戠數</td>	<!-- 鍙戠數 -->
+					<td><input type="checkbox" id="" name=""  value="" class="">鎺夌珯</td>		<!-- 鎺夌珯 -->
+					<td><input type="checkbox" id=""	name="" value="" class="" >寮�闂ㄥ紓甯�</td><!-- 寮�闂紝寮�鍏崇數婧愬紓甯� -->
+					
+				</tr>
+			</table>
                     </form>
                 </div>
             </div>
@@ -447,10 +460,12 @@
 				StationId: stationid?stationid:0,
 				
 			};
-			console.info(temp);
+			//console.info(temp);
 			return temp;
 		}
 
+		var myTimeOut;
+		//鏌ヨ鏈烘埧鐘舵��
 		function searchstationstate(){
 			var temp = createSearchParam();
 			arrTd = new Array();
@@ -465,10 +480,10 @@
 					var index = 0;
 					var data = JSON.parse(data.result);
 					if(data.code==1&&data.data!=null){
-						console.info(data.data);
+						//console.info(data.data);
 						var data = data.data;
 						//console.info(data[0].dev_id);
-						for(i=0;i<data.length;i++){
+						for(var i=0;i<data.length;i++){
 							var _data = data[i];
 							arrTd[index++] = _data.stationName1;  //鐪�
 							arrTd[index++] = _data.stationName2;	//甯�
@@ -477,7 +492,7 @@
 							// 鍋滅數
 							if(_data.station_stat_poff) {
 								arrTd[index++] = create_ali_font('icon-tingdian-', 'red', {msg:'鍋滅數寮傚父'});
-								arrTd[index++] = _data.station_poff_start_time //鍋滅數寮�濮嬫椂闂�
+								arrTd[index++] = _data.station_poff_start_time; //鍋滅數寮�濮嬫椂闂�
 								arrTd[index++] = StringtoData(_data.station_poff_start_time);      //鍋滅數鏃堕暱
 							}else {
 								arrTd[index++] = create_ali_font('icon-tingdian-', 'green', {msg: '姝e父'});
@@ -531,15 +546,19 @@
 						
 							arrTd[index++] = _data.station_temp; //娓╁害
 							arrTd[index++] = _data.station_damp; //婀垮害
+							
+							Page.pageAll = _data.page.pageAll;
 						}
-						Page.pageAll = data.length;
 						var pageNum=Math.ceil(Page.pageAll/Page.pageSize);
 						$('#total').text(Page.pageAll);
 						$('#current').text(Page.pageCurr+"/"+pageNum);
 					}
 					createAllTbl(tblHd, tblBd, arrTh, arrTd, tblStatus);
+					
+					window.clearTimeout(myTimeOut);
+					myTimeOut = window.setTimeout(searchstationstate, 8000);
 				}
-			})	
+			});
 		}
 		function StringtoData(value){
 		var date1= value;  //寮�濮嬫椂闂�

--
Gitblit v1.9.1