From 2fe250ece8de95b3f70172fe5b45793ab6a3084a Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 18 一月 2019 17:30:50 +0800
Subject: [PATCH] 未审批可更改

---
 gx_tieta/WebRoot/ele_statistics.jsp |   29 ++++++++++++++++++++++-------
 1 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/gx_tieta/WebRoot/ele_statistics.jsp b/gx_tieta/WebRoot/ele_statistics.jsp
index a3bfb88..ba40519 100644
--- a/gx_tieta/WebRoot/ele_statistics.jsp
+++ b/gx_tieta/WebRoot/ele_statistics.jsp
@@ -254,15 +254,20 @@
 	var battinfo_list = new Array();
 	var formjson;
 	$(document).ready(function(){
+		$(window).resize(function() {
+			setTblWidth($('#tbHead'), $('#maintence_infor'));
+		});
+	
 		$("#container a").eq(0).click(function(){
 			var jsontemp = $("#search_form").serialize();
 			if(jsontemp != formjson){
 				$('#pageCurr').val(1);
 				formjson = jsontemp;
 			}
-			loading.showLoading();
+			var load = layer.load(1);
 			//console.info($("#search_form").serialize());
 			var temp = createSearchForm();
+			console.info(temp);
 			var json = JSON.stringify(temp);
 			battinfo_list = new Array();
 			$.post("Batt_Maint_DealarmAction_serchByConditionNew","result="+json,function(data){
@@ -330,11 +335,13 @@
 					$('#tbHead').text('');
 					$('#maintence_infor').text('');
 					//alert(newArrTd);
-					//alert(ArrayTh);					
+					//alert(ArrayTh);
+					//createFullTbl($('#tbHead'));					
 					createTable('tbHead','tbFixed',ArrayTh.length,ArrayTh,newArrTd);
 					createTable('maintence_infor','eleTab',ArrayTh.length,ArrayTh,newArrTd);
 					setTblSize($('#tbHead'), $('#maintenced_infor'));
 					
+					setTblWidth($('#tbHead'), $('#maintence_infor'));
 					//榧犳爣鐐瑰嚮琛ㄦ牸瑙﹀彂浜嬩欢
 					$('#maintence_infor .eleTab tbody tr').mousedown(function(e){
 						$('#maintence_infor .eleTab tbody tr').css('background-color','');
@@ -377,10 +384,11 @@
 					$('#pageCurr').val(1);
 					$('#maintence_infor').text('');
 				}
-				loading.hideLoading();
+				
+				layer.close(load);
 			}).error(function(){
 				noContent.showNoContent("鏌ヨ澶辫触,璇锋鏌ョ綉缁滆繛鎺ワ紒");
-				loading.hideLoading();
+				layer.close(load);
 			});
 		});
 	});
@@ -522,7 +530,10 @@
 	function jumpPage(){
 		if(Page!=undefined){
 			var batt = battinfo_list[trIndex];
-			console.info(batt);
+			//console.info(batt);
+			var url = skipUrl("charge-test.jsp",batt.StationName1,batt.StationName2,batt.StationName5,batt.StationName,batt.BattGroupId);
+			//console.info(url);
+			window.open(url);
 			//this.setAttribute("href","charge-test.jsp?battgroupId="+battgroupId);
 			//$('#right-menu a').eq(0).attr("href","charge-test.jsp?battgroupId="+batt.BattGroupId+"&stationId="+batt.StationId);
 		}
@@ -534,7 +545,9 @@
 			var batt = battinfo_list[trIndex];
 			//console.info(batt);
 			//this.setAttribute("href","charge-test.jsp?battgroupId="+battgroupId);
-			$(dom).attr("href","eleAnalyse.jsp?battgroupId="+batt.BattGroupId+"&stationId="+batt.StationId);
+			var url = skipUrl("eleAnalyse.jsp",batt.StationName1,batt.StationName2,batt.StationName5,batt.StationName,batt.BattGroupId);
+			window.open(url);
+			//$(dom).attr("href","eleAnalyse.jsp?battgroupId="+batt.BattGroupId+"&stationId="+batt.StationId);
 		}
 	}
 	
@@ -544,7 +557,9 @@
 			var batt = battinfo_list[trIndex];
 			//console.info(batt);
 			//this.setAttribute("href","charge-test.jsp?battgroupId="+battgroupId);
-			$(dom).attr("href","eleMonomer.jsp?battgroupId="+batt.BattGroupId+"&stationId="+batt.StationId+"&battmon_num=0");
+			var url = skipUrl("eleMonomer.jsp",batt.StationName1,batt.StationName2,batt.StationName5,batt.StationName,batt.BattGroupId);
+			window.open(url);
+			//$(dom).attr("href","eleMonomer.jsp?battgroupId="+batt.BattGroupId+"&stationId="+batt.StationId+"&battmon_num=0");
 		}
 	}
 	

--
Gitblit v1.9.1