diff --git a/src/main/webapp/WEB-INF/views/home.jsp b/src/main/webapp/WEB-INF/views/home.jsp index ba5fe6af6..a15dc24fa 100644 --- a/src/main/webapp/WEB-INF/views/home.jsp +++ b/src/main/webapp/WEB-INF/views/home.jsp @@ -63,7 +63,6 @@ $(this).val(""); }); - }); //页面跳转函数 level:级别，1顶级，2有子级。name:菜单名称，有多级#间隔。url：访问路径。object：点击元素对象。 @@ -123,9 +122,6 @@ function page_turn(id, functionId,level, name, url,obj){ $("#mainFrame").load(function(){ App.stopPageLoading(); }); - - - } @@ -182,17 +178,35 @@ function changeFrameHeight() { iframe.contents().find(".page-content").addClass("page-content-body"); iframe.prop("height",clientHeight-headerHeight-barHeight-footerHeight-paddingHeight); - + menuHeight(); } window.onresize=function(){ changeFrameHeight(); + menuHeight(); } +function menuHeight(){ + var height=document.documentElement.clientHeight; + if($('.overhi')){ + $('.overhi').css({'height':height-82+'px'}); + $('.page-content-wrapper').css({'height':height-82+'px'}); + + } +} + - +
@@ -329,7 +343,7 @@ window.onresize=function(){
-
+
    -
    +
    CEIEC All Rights Reserved，CEIEC ©
    @@ -414,11 +428,6 @@ window.onresize=function(){
    - - - - - diff --git a/src/main/webapp/WEB-INF/views/report/list.jsp b/src/main/webapp/WEB-INF/views/report/list.jsp index 8030da5a1..1405d057a 100644 --- a/src/main/webapp/WEB-INF/views/report/list.jsp +++ b/src/main/webapp/WEB-INF/views/report/list.jsp @@ -82,6 +82,13 @@ $(document).ready(function() { $("caption").remove(); totaltb(pato,size); }); + + + var height=document.documentElement.clientHeight; + if($('.table-responsive')){ + $('.table-responsive').css({'height':height-166+'px'}); + //style.height=height-130+'px'; + } }); function getXlsxFileName() { var cfgName = $("[name=cfgName2]").val() + "_"; @@ -299,6 +306,13 @@ function customColumnClick(){ $('#total').html(trtotal); } } + + window.onresize=function (){ + var height=document.documentElement.clientHeight; + if($('.table-responsive')){ + $('.table-responsive').css({'height':height-166+'px'}); + } + } @@ -426,7 +440,7 @@ function customColumnClick(){
-
+

    @@ -461,7 +475,7 @@ function customColumnClick(){ >
-
+
in active diff --git a/src/main/webapp/static/global/css/components.css b/src/main/webapp/static/global/css/components.css index 0721860fb..7c707f2ab 100644 --- a/src/main/webapp/static/global/css/components.css +++ b/src/main/webapp/static/global/css/components.css @@ -22351,8 +22351,6 @@ Color library demo background-color: #fff; - border-bottom: 1px solid #ddd; - text-align: center; margin-top: -1px; diff --git a/src/main/webapp/static/global/plugins/bootstrap/css/bootstrap.css b/src/main/webapp/static/global/plugins/bootstrap/css/bootstrap.css index 20e38cfcd..ca06c9aed 100644 --- a/src/main/webapp/static/global/plugins/bootstrap/css/bootstrap.css +++ b/src/main/webapp/static/global/plugins/bootstrap/css/bootstrap.css @@ -2225,8 +2225,12 @@ table th[class*="col-"] { background-color: #f8cace; } .table-responsive { - /* overflow-x: auto; */ - min-height: 0.01%; } + overflow-x: auto; + min-height: 0.01%; + position: fixed; + right: 14px; + left: 14px; + z-index: 1030; } @media screen and (max-width: 767px) { .table-responsive { width: 100%; @@ -3285,7 +3289,10 @@ tbody.collapse.in { .navbar-right .dropdown-menu-left { left: 0; right: auto; } } - + +.btn-group{ + z-index: 9999; +} .btn-group, .btn-group-vertical { position: relative;