From 80795c9b8a687d51cddf7e0ac9f857f2edd5fe1e Mon Sep 17 00:00:00 2001
From: leijun <leijun@intranet.com>
Date: Tue, 25 Sep 2018 16:41:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A8=AA=E5=90=91=E6=BB=9A?=
 =?UTF-8?q?=E5=8A=A8=E6=9D=A1=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/report/list.jsp   |  9 ++++++++-
 src/main/webapp/static/global/scripts/common.js | 11 +++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/report/list.jsp b/src/main/webapp/WEB-INF/views/report/list.jsp
index 1405d057a..222384039 100644
--- a/src/main/webapp/WEB-INF/views/report/list.jsp
+++ b/src/main/webapp/WEB-INF/views/report/list.jsp
@@ -306,7 +306,14 @@ function customColumnClick(){
 		$('#total').html(trtotal);
  	  } 
 }	  
-
+ window.onload=function (){
+		setTimeout(function (){
+			var height=document.documentElement.clientHeight;
+			if($('.table-responsive')){
+				$('.table-responsive').css({'height':height-166+'px'});
+			} 	
+		},510);
+	}
  window.onresize=function (){
 		var height=document.documentElement.clientHeight;
 		if($('.table-responsive')){
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index 15a372bde..2ead8a6e1 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -530,7 +530,6 @@ $(function(){
 	   }
 	   
    });
-   
 });
 window.onload=function(){
 	$("span[id^=open]").click(function(){
@@ -1812,7 +1811,7 @@ var initCommIpVal=function(){
 	}
 }
 
-window.onresize=function (){
+function heightDiv(){
 	var hei=document.documentElement.clientHeight;
 	hei=hei-71;
 	var rowheigth=0;
@@ -1824,3 +1823,11 @@ window.onresize=function (){
 		$('.table-responsive').css({'height':hei+'px'});
 	}
 }
+
+window.onload=function (){
+	setTimeout(function (){
+		heightDiv(); 	
+	},500);
+}
+window.onresize=heightDiv;
+