diff --git a/src/main/webapp/WEB-INF/include/excel/importIp.jsp b/src/main/webapp/WEB-INF/include/excel/importIp.jsp index d3ced21e2..a1aba7155 100644 --- a/src/main/webapp/WEB-INF/include/excel/importIp.jsp +++ b/src/main/webapp/WEB-INF/include/excel/importIp.jsp @@ -30,7 +30,6 @@ $(function(){ -
- -
-
diff --git a/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp b/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp index a24ffd52f..84cf80c21 100644 --- a/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp @@ -101,7 +101,6 @@
-
@@ -250,9 +249,9 @@
${page}
-
+
diff --git a/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp b/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp index 6635d08cc..4122eb5ce 100644 --- a/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp @@ -126,7 +126,6 @@
-
@@ -334,6 +333,5 @@
- \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp index d54aa18b7..693c70320 100644 --- a/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp @@ -150,7 +150,6 @@
-
@@ -362,6 +361,5 @@
- \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp index d30c47343..e1ea1ced4 100644 --- a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp +++ b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp @@ -23,7 +23,6 @@
-
@@ -207,8 +206,6 @@
- - + + + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp index 61b1b1a52..0efe4c276 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp @@ -35,7 +35,6 @@ $(document).ready(function(){
-
@@ -286,6 +285,5 @@ $(document).ready(function(){
-
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp index d9796433b..f8f89a483 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp @@ -34,7 +34,6 @@ $(document).ready(function(){
-
@@ -263,6 +262,5 @@ $(document).ready(function(){
-
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp index a9f38e1d9..6adbb4b55 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp @@ -34,7 +34,6 @@
-
@@ -279,6 +278,5 @@
- diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp index e9cc6f011..0342afec1 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp @@ -34,7 +34,6 @@ $(document).ready(function(){
-
@@ -301,6 +300,5 @@ $(document).ready(function(){
-
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp index 846162e91..632e8e3af 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp @@ -35,7 +35,6 @@ $(document).ready(function(){
-
@@ -300,6 +299,5 @@ $(document).ready(function(){
-
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp index b5115a6f9..e950520f7 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp @@ -35,7 +35,6 @@ $(document).ready(function(){
-
@@ -307,6 +306,5 @@ $(document).ready(function(){
-
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp index 4d95725f7..106297791 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp @@ -35,7 +35,6 @@ $(document).ready(function(){
-
@@ -304,6 +303,5 @@ $(document).ready(function(){
-
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp index bdaa5e0f6..4199c8184 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp @@ -35,7 +35,6 @@ $(document).ready(function(){
-
@@ -300,6 +299,5 @@ $(document).ready(function(){
-
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp index fdcd2814b..8a5211c78 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp @@ -35,7 +35,6 @@ $(document).ready(function(){
-
@@ -297,6 +296,5 @@ $(document).ready(function(){
-
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp index 0dcaf4ea9..ff9ca4090 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp @@ -43,7 +43,6 @@
-
@@ -362,7 +361,6 @@
-
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp index d0981e401..7ec37b76e 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp @@ -35,7 +35,6 @@ $(document).ready(function(){
-
@@ -303,6 +302,5 @@ $(document).ready(function(){
-
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp index d16070da4..5f7a044dc 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp @@ -35,7 +35,6 @@ $(document).ready(function(){
-
@@ -299,7 +298,6 @@ $(document).ready(function(){
${page}
-
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp index f61c56fb7..e7c9f433c 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp @@ -33,9 +33,7 @@ $(document).ready(function(){

-
-
@@ -303,6 +301,5 @@ $(document).ready(function(){
-
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp index 043a2ded5..b67851a82 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp @@ -35,7 +35,6 @@ $(document).ready(function(){
-
@@ -303,6 +302,5 @@ $(document).ready(function(){
-
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp index 2ea300c98..be7a377fb 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp @@ -35,7 +35,6 @@ $(document).ready(function(){
-
@@ -305,6 +304,5 @@ $(document).ready(function(){
-
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp index 16d47c2fa..143344ae7 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp @@ -35,7 +35,6 @@ $(document).ready(function(){
-
@@ -305,6 +304,5 @@ $(document).ready(function(){
-
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp index 20956a85d..948fb23e0 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp @@ -35,7 +35,6 @@ $(document).ready(function(){
-
@@ -306,6 +305,5 @@ $(document).ready(function(){
-
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp index 38728fe3c..ce6872e3c 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp @@ -35,7 +35,6 @@ $(document).ready(function(){
-
@@ -303,6 +302,5 @@ $(document).ready(function(){
-
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp index 10b4499d6..158b254a0 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp @@ -35,7 +35,6 @@ $(document).ready(function(){
-
@@ -278,6 +277,5 @@ $(document).ready(function(){
-
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp index ed58918bb..b468a0ad3 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp @@ -34,7 +34,6 @@
-
@@ -271,7 +270,6 @@
- diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp index ee598c2fc..fa95657bf 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp @@ -35,7 +35,6 @@ $(document).ready(function(){
-
@@ -278,6 +277,5 @@ $(document).ready(function(){
-
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp index e60d6d98c..43edb72c3 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp @@ -35,7 +35,6 @@
-
@@ -278,7 +277,6 @@
- diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp index 3445185e0..a8837f5d1 100644 --- a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp @@ -139,7 +139,6 @@
-
@@ -388,6 +387,5 @@
- \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgList.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgList.jsp index f1b38102f..2653f1ff3 100644 --- a/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgList.jsp +++ b/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgList.jsp @@ -236,7 +236,6 @@
-
@@ -423,7 +422,6 @@
- diff --git a/src/main/webapp/WEB-INF/views/systemService/list.jsp b/src/main/webapp/WEB-INF/views/systemService/list.jsp index cdd0e902b..6f3cdb776 100644 --- a/src/main/webapp/WEB-INF/views/systemService/list.jsp +++ b/src/main/webapp/WEB-INF/views/systemService/list.jsp @@ -51,7 +51,6 @@ function checkNum(obj) {
-
@@ -153,9 +152,8 @@ function checkNum(obj) { -
${page}
+
${page}
-
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js index f0cb93996..e808b89bb 100644 --- a/src/main/webapp/static/global/scripts/common.js +++ b/src/main/webapp/static/global/scripts/common.js @@ -1,10 +1,4 @@ $(function(){ - var height=document.documentElement.clientHeight; - if($('.table-responsive')){ - $('.table-responsive').css({'height':height-105+'px'}); - } - - //扩展jquery，增加全局函数 $.ipcommon=function(){ return {}; } @@ -1805,8 +1799,14 @@ var initCommIpVal=function(){ } window.onresize=function (){ - var height=document.documentElement.clientHeight; - if($('.table-responsive')){ - $('.table-responsive').css({'height':height-105+'px'}); + var hei=document.documentElement.clientHeight; + hei=hei-71; + var rowheigth=0; + if($('.row')){ + rowheigth=$('.row').height(); + hei=hei-rowheigth; } -} \ No newline at end of file + if($('.table-responsive')){ + $('.table-responsive').css({'height':hei+'px'}); + } +} diff --git a/src/main/webapp/static/global/scripts/jeesite.js b/src/main/webapp/static/global/scripts/jeesite.js index 79016f42d..061e2cd8a 100644 --- a/src/main/webapp/static/global/scripts/jeesite.js +++ b/src/main/webapp/static/global/scripts/jeesite.js @@ -320,28 +320,34 @@ function filterActionInit() { $("#isFilterAction").val("true"); fiterPanleShow(); } - //调整滚动条div的高度 - var he=document.getElementsByClassName("filter-action-select-panle")[0].offsetHeight; - var height=document.documentElement.clientHeight; - if(he>0){ - he+=5; - } - if($('.table-responsive')){ - $('.table-responsive').css({'height':height-105-he+'px'}); - } }); } +function tzheight(){ + var hei=document.documentElement.clientHeight; + hei=hei-71; + var rowheigth=0; + if($('.row')){ + rowheigth=$('.row').height(); + hei=hei-rowheigth; + } + if($('.table-responsive')){ + $('.table-responsive').css({'height':hei+'px'}); + } +} + function fiterPanleShow() { $("#filter-btn").find("i").removeClass("fa-angle-double-down").addClass("fa-angle-double-up"); //$(".btn-search").addClass("hide"); $(".filter-action-select-panle").removeClass("hide"); + tzheight(); } function fiterPanleHide() { $("#filter-btn").find("i").removeClass("fa-angle-double-up").addClass("fa-angle-double-down"); //$(".btn-search").removeClass("hide"); $(".filter-action-select-panle").addClass("hide"); + tzheight(); }