gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Browse Source
This commit is contained in:
duandongmei
2018-09-13 20:36:56 +08:00
parent f41d4f05b7 ae568c1fcb
commit bf7842cdfb
4 changed files with 48 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/webapp/WEB-INF/views/home.jsp
View File

@@ -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'});
}
}
</script>
<style type="text/css">
.bodyhi{
overflow: hidden;
}
.overhi{
overflow-y: auto;
overflow-x: hidden;
}
</style>
</head>
<body class="page-header-fixed page-sidebar-closed-hide-logo page-content-white ">
<body class="page-header-fixed page-sidebar-closed-hide-logo page-content-white bodyhi">
<!-- BEGIN HEADER -->
<div class="page-header navbar navbar-fixed-top">
@@ -329,7 +343,7 @@ window.onresize=function(){
<!-- BEGIN SIDEBAR -->
<div class="page-sidebar-wrapper">
<!-- BEGIN SIDEBAR -->
<div class="page-sidebar navbar-collapse collapse">
<div class="page-sidebar navbar-collapse overhi" >
<ul
class="page-sidebar-menu page-header-fixed page-sidebar-menu-light"
@@ -405,7 +419,7 @@ window.onresize=function(){
<!-- BEGIN FOOTER -->
<div class="page-footer">
<div class="page-footer" style="position: fixed;right: 0;left: 0;z-index: 1030;">
<div class="page-footer-inner">
CEIEC All Rights Reserved，CEIEC &copy;
</div>
@@ -414,11 +428,6 @@ window.onresize=function(){
</div>
</div>
<!-- END FOOTER -->
</body>

18
src/main/webapp/WEB-INF/views/report/list.jsp
View File

@@ -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'});
}
}
</script>
</head>
<body>
@@ -426,7 +440,7 @@ function customColumnClick(){
</form:form>
</div>
<div class="table-responsive">
<div>
<sys:message content="${message}"/>
<br>
<ul class="nav nav-tabs nav-justified">
@@ -461,7 +475,7 @@ function customColumnClick(){
</c:if>
><a data-bussiness="isp_report" data-toggle="tab" href="#entranceId"><spring:message code="isp_report"/></a></li>
</ul>
<div class="tab-content">
<div class="tab-content table-responsive">
<div id="label" class="tab-pane fade
<c:if test="${bean.reportBusinessType eq 'label_report' or bean.reportBusinessType ==null}">
in active

2
src/main/webapp/static/global/css/components.css
View File

@@ -22351,8 +22351,6 @@ Color library demo
background-color: #fff;
border-bottom: 1px solid #ddd;
text-align: center;
margin-top: -1px;

13
src/main/webapp/static/global/plugins/bootstrap/css/bootstrap.css vendored
View File

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