滚动条问题处理

master
lixin 6 years ago
parent 12498ee258
commit b3b7d72fbc

@ -26,6 +26,9 @@
<!-- Bootstrap 3.3.7 --> <!-- Bootstrap 3.3.7 -->
<script type="text/javascript" src="${basePath}/static/bootstrap-3.3.7/bower_components/bootstrap/dist/js/bootstrap.min.js"></script> <script type="text/javascript" src="${basePath}/static/bootstrap-3.3.7/bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
<script type="text/javascript" src="${basePath}/static/bootstrap-3.3.7/bower_components/bootstrap-table/bootstrap-table.js" ></script> <script type="text/javascript" src="${basePath}/static/bootstrap-3.3.7/bower_components/bootstrap-table/bootstrap-table.js" ></script>
<link rel="stylesheet"
href="${basePath}/static/bootstrap-3.3.7/bower_components/bootstrap-table/bootstrap-table.min.css"
type="text/css">
<script type="text/javascript" src="${basePath}/static/bootstrap-3.3.7/bower_components/bootstrap-table/locale/bootstrap-table-zh-CN.min.js"></script> <script type="text/javascript" src="${basePath}/static/bootstrap-3.3.7/bower_components/bootstrap-table/locale/bootstrap-table-zh-CN.min.js"></script>
<!-- datepicker --> <!-- datepicker -->
<script type="text/javascript" src="${basePath}/static/bootstrap-3.3.7/bower_components/bootstrap-datepicker/dist/js/bootstrap-datepicker.min.js"></script> <script type="text/javascript" src="${basePath}/static/bootstrap-3.3.7/bower_components/bootstrap-datepicker/dist/js/bootstrap-datepicker.min.js"></script>

@ -97,6 +97,15 @@
</div> </div>
<!--搜索区--> <!--搜索区-->
<div class="col-md-9 rightDiv"> <div class="col-md-9 rightDiv">
<ul class="nav nav-tabs" role="tablist">
<li role="presentation" class="active"><a href="#home" aria-controls="home" role="tab" data-toggle="tab">用户调阅权限配置</a></li>
<li role="presentation"><a href="#profile" aria-controls="profile" role="tab" data-toggle="tab">权限管理</a></li>
</ul>
<div class="tab-content">
<div role="tabpanel" class="tab-pane fade in active" id="home">
<iframe style="width:100%;height:calc(100% - 43px)" frameborder="no" border="0" name="iframe" id="iframe"></iframe>
</div>
<div role="tabpanel" class="tab-pane fade" id="profile" style="height:calc(100% - 52px)">
<div class="row searcDiv"> <div class="row searcDiv">
<div class="col-sm-5"> <div class="col-sm-5">
<div class="form-group"> <div class="form-group">
@ -139,7 +148,8 @@
<table id="mytab" class="table text-nowrap table-bordered"> <table id="mytab" class="table text-nowrap table-bordered">
</table> </table>
</div> </div>
<iframe style="width:100%;height:calc(100% - 395px)" frameborder="no" border="0" name="iframe" id="iframe"></iframe> </div>
</div>
</div> </div>
</div> </div>
<!-- 模态框1Modal添加、编辑 --> <!-- 模态框1Modal添加、编辑 -->

@ -107,7 +107,7 @@
<input type="hidden" id="treeId"> <input type="hidden" id="treeId">
<input type="hidden" id="parentId1" value="0"> <input type="hidden" id="parentId1" value="0">
<input type="hidden" id="childNode"> <input type="hidden" id="childNode">
<div class="_content" id="contentDiv" _style="display: none"> <div class="_content" id="contentDiv" style="display: none">
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label">字段值:</label> <label class="col-sm-4 control-label">字段值:</label>
<div class="col-sm-8"> <div class="col-sm-8">

@ -20,20 +20,24 @@
</script> </script>
<style type="text/css"> <style type="text/css">
.saveBtn { .saveBtn {
height: 5%;
text-align: center; text-align: center;
margin-bottom: 10px;
} }
.right { .right {
float: right; float: right;
} }
th td { th td {
text-align: center !important; text-align: center !important;
} }
.control-label { .control-label {
margin-left: 20px; margin-left: 20px;
text-align: right; text-align: right;
width: 130px; width: 130px;
} }
.checkBoxClass { .checkBoxClass {
cursor: pointer; cursor: pointer;
} }
@ -88,10 +92,14 @@
<td id="operId"> <td id="operId">
<c:if test="${emrModle.isOper == 1}"> <c:if test="${emrModle.isOper == 1}">
<shiro:hasPermission name="/template/updateTemplateSelect"> <shiro:hasPermission name="/template/updateTemplateSelect">
<button type="button" class="btn btn-sm btn-info btns " data-toggle="modal" data-target="#myModal2">编辑</button> <button type="button" class="btn btn-sm btn-info btns " data-toggle="modal"
data-target="#myModal2">编辑
</button>
</shiro:hasPermission> </shiro:hasPermission>
<shiro:hasPermission name="/template/deleteTemplateSelect"> <shiro:hasPermission name="/template/deleteTemplateSelect">
<button type="button" class="btn btn-sm btn-danger btns" style="margin-left:2%" onclick="del()">删除</button> <button type="button" class="btn btn-sm btn-danger btns" style="margin-left:2%"
onclick="del()">删除
</button>
</shiro:hasPermission> </shiro:hasPermission>
</c:if> </c:if>
</td> </td>
@ -107,13 +115,18 @@
<a data-toggle="collapse" href="#tab${check.id}" style="font-size: 16px"> <a data-toggle="collapse" href="#tab${check.id}" style="font-size: 16px">
${check.columnName} ${check.columnName}
</a> </a>
<span class="right">全选</span><input type="checkbox" class="right" value="全选" id="checkAll${check.id}" onclick="checkAll(${check.id})"> <span class="right">全选</span><input type="checkbox" class="right" value="全选" id="checkAll${check.id}"
onclick="checkAll(${check.id})">
</div> </div>
<div id="tab${check.id}" class="panel-collapse collapse in"> <div id="tab${check.id}" class="panel-collapse collapse in">
<div class="panel-body"> <div class="panel-body">
<div class="row"> <div class="row">
<c:forEach items="${check.data}" var="data"> <c:forEach items="${check.data}" var="data">
<div class="col-xs-2"><input type='checkbox' name="check" id="${data.id}" class="check${data.parentId}" value="${data.id}" onclick="check(${data.parentId})" <c:if test="${data.checked == 'true'}">checked</c:if>/><label for="${data.id}" class="checkBoxClass">${data.columnName}</label></div> <div class="col-xs-2"><input type='checkbox' name="check" id="${data.id}"
class="check${data.parentId}" value="${data.id}"
onclick="check(${data.parentId})"
<c:if test="${data.checked == 'true'}">checked</c:if>/><label
for="${data.id}" class="checkBoxClass">${data.columnName}</label></div>
</c:forEach> </c:forEach>
</div> </div>
</div> </div>
@ -121,16 +134,15 @@
</div> </div>
</div> </div>
</c:forEach> </c:forEach>
<div class="row">
<div class="saveBtn">
<c:if test="${emrModle.isOper == 1}"> <c:if test="${emrModle.isOper == 1}">
<shiro:hasPermission name="/template/addModleRelated"> <shiro:hasPermission name="/template/addModleRelated">
<div class="row">
<div class="saveBtn">
<button type="button" class="btn btn-primary btn-info" style="width:24%;" onclick="update()">保存</button> <button type="button" class="btn btn-primary btn-info" style="width:24%;" onclick="update()">保存</button>
</shiro:hasPermission>
</c:if>
</div> </div>
</div> </div>
</shiro:hasPermission>
</c:if>
<!-- 模态框2Modal --> <!-- 模态框2Modal -->
<div class="modal fade" id="myModal2" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal fade" id="myModal2" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog">
@ -151,7 +163,8 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-5 control-label left">模板标志:</label> <label class="col-sm-5 control-label left">模板标志:</label>
<div class="col-sm-7 left"> <div class="col-sm-7 left">
<input type="text" class="form-control input-sm input" name="modleFlag" id="modleFlag1" value="${emrModle.modleFlag}" maxlength="25"> <input type="text" class="form-control input-sm input" name="modleFlag" id="modleFlag1"
value="${emrModle.modleFlag}" maxlength="25">
</div> </div>
</div> </div>
</div> </div>
@ -159,7 +172,8 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-5 control-label left">模板名称:</label> <label class="col-sm-5 control-label left">模板名称:</label>
<div class="col-sm-7 left"> <div class="col-sm-7 left">
<input type="text" class="form-control input-sm input" name="modleName" id="modleName1" value="${emrModle.modleName}" maxlength="25"> <input type="text" class="form-control input-sm input" name="modleName" id="modleName1"
value="${emrModle.modleName}" maxlength="25">
</div> </div>
</div> </div>
</div> </div>
@ -167,7 +181,8 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label left">有效时间:</label> <label class="col-sm-4 control-label left">有效时间:</label>
<div class="col-sm-6 input-group left" style="padding-left:15px;width: 31%;"> <div class="col-sm-6 input-group left" style="padding-left:15px;width: 31%;">
<input type="text" class="form-control input-sm dateInput datepicker" name="effeTime" id="effeTime1" value="${emrModle.effeTime}"> <input type="text" class="form-control input-sm dateInput datepicker" name="effeTime"
id="effeTime1" value="${emrModle.effeTime}">
<div class="input-group-addon"> <div class="input-group-addon">
<i class="fa fa-calendar"></i> <i class="fa fa-calendar"></i>
</div> </div>
@ -191,7 +206,9 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label left">排序:</label> <label class="col-sm-4 control-label left">排序:</label>
<div class="col-sm-7 left"> <div class="col-sm-7 left">
<input type="number" class="form-control input-sm input" name="modleSort" id="modleSort1" value="${emrModle.modleSort}" oninput="if(value.length>9)value=value.slice(0,9)"> <input type="number" class="form-control input-sm input" name="modleSort"
id="modleSort1" value="${emrModle.modleSort}"
oninput="if(value.length>9)value=value.slice(0,9)">
</div> </div>
<div class="col-sm-1"></div> <div class="col-sm-1"></div>
</div> </div>
@ -200,7 +217,8 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label left">备注:</label> <label class="col-sm-4 control-label left">备注:</label>
<div class="col-sm-7 left"> <div class="col-sm-7 left">
<textarea class="form-control input-sm input" name="remark" id="remark1" maxlength="25">${emrModle.remark}</textarea> <textarea class="form-control input-sm input" name="remark" id="remark1"
maxlength="25">${emrModle.remark}</textarea>
</div> </div>
<div class="col-sm-1"></div> <div class="col-sm-1"></div>
</div> </div>
@ -209,7 +227,8 @@
<div class="form-group" style="margin-left: 76px;"> <div class="form-group" style="margin-left: 76px;">
<div class="col-sm-4"></div> <div class="col-sm-4"></div>
<div class="col-sm-8"> <div class="col-sm-8">
<input type="radio" value="1" name="selectFlag" id="selectFlag1" <c:if test="${emrModle.selectFlag == 1}">checked</c:if>>选中模板为当前使用 <input type="radio" value="1" name="selectFlag" id="selectFlag1"
<c:if test="${emrModle.selectFlag == 1}">checked</c:if>>选中模板为当前使用
</div> </div>
</div> </div>
</div> </div>

@ -32,8 +32,7 @@
} }
.insertbtn{ .insertbtn{
width:60%; width:60%;
margin-top:-3%; margin: 0 auto;
margin-left:-2%!important;
} }
.searcDiv{ .searcDiv{
margin: 10px 20px; margin: 10px 20px;
@ -49,9 +48,6 @@
.input-group{ .input-group{
padding-left:5%!important; padding-left:5%!important;
} }
.btn{
margin-left:8%;
}
.rightContent{ .rightContent{
padding-left:1%; padding-left:1%;
} }
@ -64,7 +60,7 @@
height: calc(100vh - 43px); height: calc(100vh - 43px);
} }
.zTreeDemo { .zTreeDemo {
height: calc(100vh - 131px) !important; height: calc(100vh - 123px) !important;
min-height: 394px !important; min-height: 394px !important;
} }
</style> </style>

@ -10,6 +10,7 @@ $('#mytab').bootstrapTable({
pageNumber: 1, //初始化加载第一页,默认第一页 pageNumber: 1, //初始化加载第一页,默认第一页
pageSize: 5, //每页的记录行数(* pageSize: 5, //每页的记录行数(*
pageList: [5,10,15,20,30,50],//可供选择的每页的行数(* pageList: [5,10,15,20,30,50],//可供选择的每页的行数(*
height: 355,
columns:[ columns:[
{ {
field: 'no', field: 'no',

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

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

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

Loading…
Cancel
Save