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; +