解决多余滚动条问题

master
lixin 6 years ago
parent 8f7c11a2bb
commit 0d75747344

@ -19,19 +19,8 @@
var path = "${path}";
</script>
<style type="text/css">
body {
margin-right: -15px;
margin-bottom: -15px;
}
.left{
float:left;
}
.right{
float:right;
}
.mainDiv{
background-color: #fff;
height:100%;
}
/**搜索区*/
.searchDiv{

@ -19,16 +19,8 @@
var path = "${path}";
</script>
<style type="text/css">
body {
margin-right: -15px;
margin-bottom: -15px;
}
.left{
float:left;
}
.mainDiv{
background-color: #fff;
height:100%;
}
/**搜索区*/
.searchDiv{
@ -41,7 +33,6 @@
}
.tableDiv{
width: 100%;
height: 90%;
background-color: #fff;
margin-left: 1%;
padding-top:5px;

@ -18,18 +18,8 @@
var path = "${path}";
</script>
<style type="text/css">
body {
margin-right: -15px;
margin-bottom: -15px;
}
.left {
float: left;
}
.mainDiv {
background-color: #fff;
height: 100%;
}
/**搜索区*/
@ -45,7 +35,6 @@
.tableDiv {
width: 100%;
height: 100%;
background-color: #fff;
margin-left: 1%;
}

@ -20,20 +20,9 @@
var path = "${path}";
</script>
<style type="text/css">
body {
margin-right: -15px;
margin-bottom: -15px;
}
.left{
float:left;
}
.right{
float:right;
}
/**搜索区*/
.mainDiv{
background-color: #fff;
height:100%;
}
.searchDiv{
padding-top:5px;

@ -21,18 +21,15 @@
</script>
<style type="text/css">
.leftDiv{
width:25%;
border-right: 10px solid #c1d7e3;
background-color:#fff
}
.rightDiv{
width:74%;
margin-left:1%;
background-color:#fff
}
/**搜索框去div*/
.searcDiv{
padding-left: 2%;
padding-top:2%;
margin: 10px 20px;
}
.form-control{
margin: 0 auto;
@ -56,8 +53,7 @@
}
/**表格div*/
.tableDiv{
margin-top:1%;
margin-left: 1%;
margin: 10px 20px;
}
/*模态框头*/
.modal-header{
@ -67,6 +63,13 @@
.col-sm-2,col-sm-5{
padding:0!important;
}
.zTreeDemo {
height: calc(100% - 70px) !important;
min-height: 394px !important;
}
.main-content {
height: calc(100vh - 43px);
}
</style>
</head>
<body style="background-color:#c1d7e3">
@ -80,8 +83,9 @@
</span>
</div>
</div>
<div class="row main-content">
<!--左侧树-->
<div class="leftDiv left">
<div class="col-md-3 leftDiv">
<div class="searcDiv">
<input type="text" id="key" value="" class="form-control input-sm"
placeholder="角色名" maxlength="16"/><br/>
@ -91,7 +95,7 @@
</div>
</div>
<!--搜索区-->
<div class="rightDiv left">
<div class="col-md-9 rightDiv">
<div class="row searcDiv">
<div class="col-sm-5">
<div class="form-group">
@ -134,7 +138,8 @@
<table id="mytab" class="table text-nowrap table-bordered">
</table>
</div>
<iframe style="width:100%;height:100%" frameborder="no" border="0" name="iframe" id="iframe"></iframe>
<iframe style="width:100%;height:calc(100% - 395px)" frameborder="no" border="0" name="iframe" id="iframe"></iframe>
</div>
</div>
<!-- 模态框1Modal添加、编辑 -->
<div class="modal fade" id="myModal1" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">

@ -21,18 +21,15 @@
</script>
<style type="text/css">
.leftDiv{
width:25%;
border-right: 10px solid #c1d7e3;
background-color:#fff
}
.rightDiv{
width:74%;
margin-left:1%;
background-color:#fff
}
/**搜索框去div*/
.searcDiv{
padding-left: 2%;
padding-top:2%;
margin: 10px 20px;
}
.form-control{
margin: 0 auto;
@ -56,8 +53,7 @@
}
/**表格div*/
.tableDiv{
margin-top:1%;
margin-left: 1%;
margin: 10px 20px;
}
/*模态框头*/
.modal-header{
@ -67,6 +63,13 @@
.col-sm-2,col-sm-5{
padding:0!important;
}
.zTreeDemo {
height: calc(100% - 70px) !important;
min-height: 394px !important;
}
.main-content {
height: calc(100vh - 43px);
}
</style>
</head>
<body style="background-color:#c1d7e3">
@ -81,8 +84,9 @@
</span>
</div>
</div>
<div class="row main-content">
<!--左侧树-->
<div class="leftDiv left">
<div class="col-md-3 leftDiv">
<div class="searcDiv">
<input type="text" id="key" value="" class="form-control input-sm"
placeholder="工号/用户名" maxlength="16"/><br/>
@ -92,7 +96,7 @@
</div>
</div>
<!--搜索区-->
<div class="rightDiv left">
<div class="col-md-9 rightDiv">
<div class="row searcDiv">
<div class="col-sm-5">
<div class="form-group">
@ -135,7 +139,8 @@
<table id="mytab" class="table text-nowrap table-bordered">
</table>
</div>
<iframe style="width:100%;height:100%" frameborder="no" border="0" name="iframe" id="iframe"></iframe>
<iframe style="width:100%;height:calc(100% - 395px)" frameborder="no" border="0" name="iframe" id="iframe"></iframe>
</div>
</div>
<!-- 模态框1Modal添加、编辑 -->
<div class="modal fade" id="myModal1" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">

@ -19,10 +19,6 @@
var path = "${path}";
</script>
<style type="text/css">
body {
margin-right: -15px;
margin-bottom: -15px;
}
.mainDiv{
background-color: #fff;
}

@ -19,10 +19,6 @@
var path = "${path}";
</script>
<style type="text/css">
body {
margin-right: -15px;
margin-bottom: -15px;
}
.mainDiv{
background-color: #fff;
}

@ -19,19 +19,13 @@
var path = "${path}";
</script>
<style type="text/css">
body {
margin-right: -15px;
margin-bottom: -15px;
}
.leftDiv{
width:25%;
height: 100%;
border-right: 10px solid #c1d7e3;
background-color:#fff
}
.rightDiv{
width:74%;
height:90%;
margin-left:1%;
height: 100%;
background-color:#fff
}
.searchDiv{
@ -81,6 +75,7 @@
/**页头**/
.headDiv{
height:30px;
width: 100%;
font-weight: bold;
font-size: 18px;
}
@ -119,6 +114,13 @@
border-radius: 20px;
filter: progid:DXImageTransform.Microsoft.Alpha(opacity=70);
}
.col-md-3,.col-md-9 {
padding: 0;
}
.zTreeDemo {
height: calc(100vh - 200px) !important;
min-height: 394px !important;
}
</style>
</head>
<body style="background-color: #c1d7e3">
@ -128,9 +130,9 @@
<input type="hidden" id="treeTypeName">
<input type="hidden" id="treeCode">
<input type="hidden" id="treeName">
<div class="main">
<div class="row main">
<!--树-->
<div class="leftDiv left">
<div class="col-md-3 leftDiv">
<div class="headDiv">
<div class="headSpanDiv">
</div>
@ -160,7 +162,7 @@
</div>
</div>
<!--内容-->
<div class="rightDiv left">
<div class="rightDiv col-md-9">
<div class="headDiv">
<div class="headSpanDiv">
<span>字典信息</span>

@ -19,10 +19,6 @@
var path = "${path}";
</script>
<style type="text/css">
body {
margin-right: -15px;
margin-bottom: -15px;
}
.mainDiv{
background-color: #fff;
}

@ -19,10 +19,6 @@
var path = "${path}";
</script>
<style type="text/css">
body {
margin-right: -15px;
margin-bottom: -15px;
}
.mainDiv{
background-color: #fff;
}

@ -21,10 +21,6 @@
var path = "${path}";
</script>
<style type="text/css">
body {
margin-right: -15px;
margin-bottom: -15px;
}
.labelDiv{
text-align: right;
padding-top:5px;

@ -19,10 +19,6 @@
var path = "${path}";
</script>
<style type="text/css">
body {
margin-right: -15px;
margin-bottom: -15px;
}
.mainDiv{
background-color: #fff;
}

@ -31,11 +31,6 @@
var path = "${path}";
</script>
<style type="text/css">
body {
margin-right: -15px;
margin-bottom: -15px;
}
/* .collapse{
overflow-y:scroll;
}*/

@ -6,7 +6,7 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta charset="utf-8"/>
<title>打印用途管理</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
<meta http-equiv="X-UA-Compatible" content="IE=edge">
@ -20,62 +20,75 @@
var path = "${path}";
</script>
<style type="text/css">
.leftDiv{
width:25%;
height: 100%;
background-color:#fff
.leftDiv {
border-right: 10px solid #c1d7e3;
background-color: #fff
}
.rightDiv{
width:74%;
height:100%;
margin-left:1%;
background-color:#fff
.rightDiv {
background-color: #fff
}
.addbtn{
width:100%;
.addbtn {
width: 100%;
text-align: center;
}
.insertbtn{
width:60%;
.insertbtn {
width: 60%;
}
.searcDiv{
height: 36px;
margin-left: 2%;
margin-top:2%;
.searcDiv {
margin: 10px 20px;
}
.form-control{
.form-control {
margin: 0 auto;
width:80%;
width: 80%;
}
.input{
width:90%;
.input {
width: 90%;
}
.control-label{
padding-left:12%!important;
padding-top:1%;
.control-label {
padding-left: 12% !important;
padding-top: 1%;
}
.btn{
margin-left:8%;
.btn {
margin-left: 8%;
}
.btns{
height:2%!important;
.btns {
height: 2% !important;
}
th td{
text-align: center!important;
th td {
text-align: center !important;
}
table{
table {
margin-left: 1%;
}
/*模态框头*/
.modal-header{
.modal-header {
background-color: #199ED8;
text-align: center;
}
.zTreeDemo {
height: calc(100% - 80px) !important;
min-height: 394px !important;
}
.main-content {
height: calc(100vh - 43px);
}
</style>
</head>
<body style="background-color:#c1d7e3">
<input type="hidden" id="currentId">
<div class="main">
<div class="main">
<div class="headDiv">
<div class="headSpanDiv">
<span class="headspan">
@ -83,20 +96,30 @@
</span>
</div>
</div>
<div class="leftDiv left">
<div class="row main-content">
<!--树-->
<div class="col-md-3 leftDiv">
<div class="searcDiv">
<input type="text" id="key" value="" class="form-control input-sm"
placeholder="类别名称" maxlength="25"/><br/>
placeholder="类别名称" maxlength="25"/>
</div>
<shiro:hasPermission name="/printing/addEmrType">
<div class="row addbtn">
<button type="button" class="btn btn-sm btn-info insertbtn" id="addModle" onclick="addEmrType()">添加</button>
<button type="button" class="btn btn-sm btn-info insertbtn" id="addModle" onclick="addEmrType()">
添加
</button>
</div>
</shiro:hasPermission>
<div class="zTreeDemo">
<ul id="ztree" class="ztree"></ul>
</div>
</div>
<!--明细选项-->
<div class="col-md-9 rightDiv">
<iframe style="width:100%;height:100%" frameborder="no" border="0" name="iframe" id="iframe" scrolling="yes"
src="${path}/printing/printManageIframe?id=${emrType.id}"></iframe>
</div>
</div>
<!-- 模态框1Modal添加 -->
<div class="modal fade" id="myModal1" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
@ -116,7 +139,8 @@
<div class="form-group">
<label class="col-sm-4 control-label">类别标志:</label>
<div class="col-sm-7">
<input type="text" class="form-control input-sm input" name="typeFlag" id="typeFlag" maxlength="25">
<input type="text" class="form-control input-sm input" name="typeFlag" id="typeFlag"
maxlength="25">
</div>
<div class="col-sm-1"></div>
</div>
@ -125,7 +149,8 @@
<div class="form-group">
<label class="col-sm-4 control-label">类别名称:</label>
<div class="col-sm-7">
<input type="text" class="form-control input-sm input" name="typeName" id="typeName2" maxlength="25">
<input type="text" class="form-control input-sm input" name="typeName"
id="typeName2" maxlength="25">
</div>
<div class="col-sm-1"></div>
</div>
@ -134,7 +159,8 @@
<div class="form-group">
<label class="col-sm-4 control-label">排序:</label>
<div class="col-sm-7">
<input type="number" class="form-control input-sm input" name="typeSort" oninput="if(value.length>4)value=value.slice(0,4)">
<input type="number" class="form-control input-sm input" name="typeSort"
oninput="if(value.length>4)value=value.slice(0,4)">
</div>
<div class="col-sm-1"></div>
</div>
@ -171,17 +197,12 @@
</div>
</div>
</div>
</div>
<!--明细选项-->
<div class="rightDiv left">
<iframe style="width:100%;height:100%" frameborder="no" border="0" name="iframe" id="iframe" scrolling="yes" src="${path}/printing/printManageIframe?id=${emrType.id}"></iframe>
</div>
</div>
<script>
</div>
<script>
$(function () {
$(".modal-dialog").draggable();//为模态对话框添加拖拽
})
</script>
<script type="text/javascript" src="${path}/static/js/recordManage/printing/printManage.js"></script>
</script>
<script type="text/javascript" src="${path}/static/js/recordManage/printing/printManage.js"></script>
</body>
</html>

@ -28,12 +28,8 @@
</c:forEach>
</script>
<style type="text/css">
body {
margin-right: -15px;
margin-bottom: -15px;
}
.collapse{
overflow-y:scroll;
overflow-y:auto;
}
.divClass{
padding-top:0.5%;
@ -45,7 +41,6 @@
text-align: right;
}
.blockDiv{
margin-top:1%;
background-color: #fff
}
.hrDiv{
@ -116,10 +111,11 @@
.tableDiv{
/*margin-top: 1%;*/
width:100%;
height: 100%;
height: auto;
min-height: 400px;
background-color: #fff;
padding-top: 1px;
overflow: scroll;
overflow: auto;
}
.fixed-table-body{
overflow: scroll;
@ -139,7 +135,7 @@
</style>
</head>
<body style="background-color:#c1d7e3;">
<div class="panel-group" id="accordion">
<div class="panel-group" id="accordion" style="margin-bottom: 10px">
<div class="panel">
<div class="panel-heading" style="padding:0px 14px!important;">
<h5>
@ -169,7 +165,7 @@
</div>
</div>
<div class="bottomDiv">
<div class="blockDiv" id="blockDiv">
<div class="blockDiv" id="blockDiv" style="display: none">
<form id="block">
</form>

@ -19,13 +19,13 @@
var path = "${path}";
</script>
<style>
body {
margin-right: -15px;
margin-bottom: -15px;
}
.main-content{
height:calc(100% - 43px);
background-color:#fff;
}
.iframeDiv{
height:calc(100% - 32px);
}
.selectDiv{
width:250px;
}
@ -35,7 +35,7 @@
}
.selectSpan{
height:100%;
margin:7px 15px;
padding:7px 15px;
}
</style>
</head>

@ -20,19 +20,11 @@
var path = "${path}";
</script>
<style type="text/css">
body {
margin-right: -15px;
margin-bottom: -15px;
}
.leftDiv{
width:25%;
height: 100%;
border-right: 10px solid #c1d7e3;
background-color:#fff
}
.rightDiv{
width:74%;
height:100%;
margin-left:1%;
background-color:#fff
}
.addbtn{
@ -44,15 +36,12 @@
margin-left:-2%!important;
}
.searcDiv{
margin-top:2%;
margin: 10px 20px;
}
.form-control{
margin: 0 auto;
width:80%;
}
.input{
width:90%;
}
.control-label{
padding-left:12%!important;
padding-top:1%;
@ -71,6 +60,13 @@
background-color: #199ED8;
text-align: center;
}
.main-content {
height: calc(100vh - 43px);
}
.zTreeDemo {
height: calc(100vh - 131px) !important;
min-height: 394px !important;
}
</style>
</head>
<body style="background-color: #c1d7e3">
@ -80,11 +76,12 @@
<span class="headspan">自定义模板选择</span>
</div>
</div>
<div class="row main-content">
<!--树-->
<div class="leftDiv left">
<div class="col-md-3 leftDiv">
<div class="searcDiv">
<input type="text" id="key" value="" class="form-control input-sm"
placeholder="名称" maxlength="25"/><br/>
placeholder="名称" maxlength="25"/>
</div>
<div class="row addbtn">
<shiro:hasPermission name="/template/addTemplateSelect">
@ -95,6 +92,13 @@
<ul id="ztree" class="ztree"></ul>
</div>
</div>
<!--明细选项-->
<div class="col-md-9 rightDiv">
<div class="rightContent">
<iframe style="width:100%;height:100%" id="iframe" name="iframe" frameborder="no" border="0" scrolling="yes" src="${path}/template/templateSelectIframe?id=${emrModle.id}"></iframe>
</div>
</div>
</div>
<!-- 模态框1Modal -->
<div class="modal fade" id="myModal1" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<input type="hidden" id="currentTypeId">
@ -191,12 +195,6 @@
</div>
</div>
</div>
<!--明细选项-->
<div class="rightDiv left">
<div class="rightContent">
<iframe style="width:100%;height:100%" id="iframe" name="iframe" frameborder="no" border="0" scrolling="yes" src="${path}/template/templateSelectIframe?id=${emrModle.id}"></iframe>
</div>
</div>
</div>
<script>
$(function () {

@ -10,7 +10,7 @@ $('#mytab').bootstrapTable({
pageNumber: 1, //初始化加载第一页,默认第一页
pageSize: 10, //每页的记录行数(*
pageList: [5,10,15,20,50,1000],//可供选择的每页的行数(*
height: 1100, //行高如果没有设置height属性表格自动根据记录条数觉得表格高度
_height: 1100, //行高如果没有设置height属性表格自动根据记录条数觉得表格高度
columns:[
{
title:'全选',

@ -33,7 +33,7 @@ $('#mytab').bootstrapTable({
pageNumber: 1, //初始化加载第一页,默认第一页
pageSize: 10, //每页的记录行数(*
pageList: [5,10,15,20,50,1000],//可供选择的每页的行数(*
height: 1100, //行高如果没有设置height属性表格自动根据记录条数觉得表格高度
_height: 1100, //行高如果没有设置height属性表格自动根据记录条数觉得表格高度
columns:[
{
title:'全选',

@ -15,7 +15,7 @@ $('#mytab').bootstrapTable({
pageNumber: 1, //初始化加载第一页,默认第一页
pageSize: 10, //每页的记录行数(*
pageList: [5,10,15,20,50,1000],//可供选择的每页的行数(*
height: 1100, //行高如果没有设置height属性表格自动根据记录条数觉得表格高度
_height: 1100, //行高如果没有设置height属性表格自动根据记录条数觉得表格高度
columns:[
{
title:'全选',

@ -460,6 +460,9 @@ function dynamicCheck(checked,idVal,val,name,options,inputs){
$("#div"+idVal).prev("div").children("div:last-child").remove();
}
$("#div"+idVal).remove();
if(!$("#block").html().trim().length){
$("#blockDiv").hide();
}
}else{
//拼接
var html = '<div id="div'+idVal+'" style="clear:both;" class="divClass">'
@ -476,6 +479,7 @@ function dynamicCheck(checked,idVal,val,name,options,inputs){
var whereHtml = '<div class="whereDiv"><select class="select3"><option value="and">并且</option><option value="or">或</option></select></div>'
$("div[class=divClass]:last").append(whereHtml);
$("#block").append(html);
$("#blockDiv").show();
//加载时间控件
initDateInput(idVal)
}

Loading…
Cancel
Save