From b3b7d72fbc2c0750b89486a480f8f74ea2c198fc Mon Sep 17 00:00:00 2001
From: lixin <oaklee@126.com>
Date: Thu, 4 Jun 2020 11:11:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E6=9D=A1=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/jspf/common.jspf      |  3 +
 .../userDistributionManage.jsp                | 84 +++++++++++--------
 .../templateSearch/templateList1.jsp          |  2 +-
 .../templateSearch/templateSelectIframe.jsp   | 81 +++++++++++-------
 .../templateSearch/templateSelectList.jsp     |  8 +-
 .../distributionManage/distributionManage.js  |  1 +
 .../static/js/otherManage/backupDatabase.js   |  2 +-
 .../js/otherManage/downloadInfoCommomJs174.js |  2 +-
 .../webapp/static/js/otherManage/lockList.js  |  2 +-
 9 files changed, 107 insertions(+), 78 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jspf/common.jspf b/src/main/webapp/WEB-INF/jspf/common.jspf
index 37a6799..b7cb073 100644
--- a/src/main/webapp/WEB-INF/jspf/common.jspf
+++ b/src/main/webapp/WEB-INF/jspf/common.jspf
@@ -26,6 +26,9 @@
 <!-- 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-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>
 <!-- datepicker -->
 <script type="text/javascript" src="${basePath}/static/bootstrap-3.3.7/bower_components/bootstrap-datepicker/dist/js/bootstrap-datepicker.min.js"></script>
diff --git a/src/main/webapp/WEB-INF/views/distributionManage/userDistributionManage.jsp b/src/main/webapp/WEB-INF/views/distributionManage/userDistributionManage.jsp
index a81bcb7..794e785 100644
--- a/src/main/webapp/WEB-INF/views/distributionManage/userDistributionManage.jsp
+++ b/src/main/webapp/WEB-INF/views/distributionManage/userDistributionManage.jsp
@@ -97,49 +97,59 @@
             </div>
             <!--搜索区-->
             <div class="col-md-9 rightDiv">
-                <div class="row searcDiv">
-                    <div class="col-sm-5">
-                        <div class="form-group">
-                            <div class="col-sm-5 labelDiv">
-                                <label class="control-label">单名：</label>
-                            </div>
-                            <div class="col-sm-7 inputDiv">
-                                <select class="form-control input-sm" id="searchAssortName">
-                                    <option value="">请选择</option>
-                                    <c:forEach items="${assorts}" var="assort">
-                                        <option value="${assort.assortName}">${assort.assortName}</option>
-                                    </c:forEach>
-                                </select>
-                            </div>
-                        </div>
+                <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 class="col-sm-5">
-                        <div class="form-group">
-                            <div class="col-sm-5 labelDiv">
-                                <label class="control-label">是否有效：</label>
+                    <div role="tabpanel" class="tab-pane fade" id="profile" style="height:calc(100% - 52px)">
+                        <div class="row searcDiv">
+                            <div class="col-sm-5">
+                                <div class="form-group">
+                                    <div class="col-sm-5 labelDiv">
+                                        <label class="control-label">单名：</label>
+                                    </div>
+                                    <div class="col-sm-7 inputDiv">
+                                        <select class="form-control input-sm" id="searchAssortName">
+                                            <option value="">请选择</option>
+                                            <c:forEach items="${assorts}" var="assort">
+                                                <option value="${assort.assortName}">${assort.assortName}</option>
+                                            </c:forEach>
+                                        </select>
+                                    </div>
+                                </div>
                             </div>
-                            <div class="col-sm-7 inputDiv">
-                                <select class="form-control input-sm" id="searchPrintFlag">
-                                    <option value="">请选择</option>
-                                    <option value="0">是</option>
-                                    <option value="1">否</option>
-                                </select>
+                            <div class="col-sm-5">
+                                <div class="form-group">
+                                    <div class="col-sm-5 labelDiv">
+                                        <label class="control-label">是否有效：</label>
+                                    </div>
+                                    <div class="col-sm-7 inputDiv">
+                                        <select class="form-control input-sm" id="searchPrintFlag">
+                                            <option value="">请选择</option>
+                                            <option value="0">是</option>
+                                            <option value="1">否</option>
+                                        </select>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col-sm-2">
+                                <button type="button" class="btn btn-sm btn-primary" onclick="search()">查询</button>
+                                <shiro:hasPermission name="/distribution/saveDistribution">
+                                    <button type="button" class="btn btn-sm btn-warning" onclick="add()" data-toggle="modal" data-target="#myModal1">添加</button>
+                                </shiro:hasPermission>
                             </div>
                         </div>
+                        <!--数据表格-->
+                        <div id="tableDiv" class="tableDiv">
+                            <table id="mytab" class="table text-nowrap table-bordered">
+                            </table>
+                        </div>
                     </div>
-                    <div class="col-sm-2">
-                        <button type="button" class="btn btn-sm btn-primary" onclick="search()">查询</button>
-                        <shiro:hasPermission name="/distribution/saveDistribution">
-                            <button type="button" class="btn btn-sm btn-warning" onclick="add()" data-toggle="modal" data-target="#myModal1">添加</button>
-                        </shiro:hasPermission>
-                    </div>
-                </div>
-                <!--数据表格-->
-                <div id="tableDiv" class="tableDiv">
-                    <table id="mytab" class="table text-nowrap table-bordered">
-                    </table>
                 </div>
-                <iframe style="width:100%;height:calc(100% - 395px)" frameborder="no" border="0" name="iframe" id="iframe"></iframe>
             </div>
         </div>
         <!-- 模态框1（Modal）添加、编辑 -->
diff --git a/src/main/webapp/WEB-INF/views/recordManage/templateSearch/templateList1.jsp b/src/main/webapp/WEB-INF/views/recordManage/templateSearch/templateList1.jsp
index ec8c640..b9c82bb 100644
--- a/src/main/webapp/WEB-INF/views/recordManage/templateSearch/templateList1.jsp
+++ b/src/main/webapp/WEB-INF/views/recordManage/templateSearch/templateList1.jsp
@@ -107,7 +107,7 @@
                     <input type="hidden" id="treeId">
                     <input type="hidden" id="parentId1" value="0">
                     <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">
                             <label class="col-sm-4 control-label">字段值：</label>
                             <div class="col-sm-8">
diff --git a/src/main/webapp/WEB-INF/views/recordManage/templateSearch/templateSelectIframe.jsp b/src/main/webapp/WEB-INF/views/recordManage/templateSearch/templateSelectIframe.jsp
index f750c11..565544d 100644
--- a/src/main/webapp/WEB-INF/views/recordManage/templateSearch/templateSelectIframe.jsp
+++ b/src/main/webapp/WEB-INF/views/recordManage/templateSearch/templateSelectIframe.jsp
@@ -5,7 +5,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <meta charset="utf-8" />
+    <meta charset="utf-8"/>
     <title>自定义模板选择iframe页面</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">
@@ -19,22 +19,26 @@
         var path = "${path}";
     </script>
     <style type="text/css">
-        .saveBtn{
-            height: 5%;
+        .saveBtn {
             text-align: center;
+            margin-bottom: 10px;
         }
-        .right{
-            float:right;
+
+        .right {
+            float: right;
         }
-        th td{
-            text-align: center!important;
+
+        th td {
+            text-align: center !important;
         }
-        .control-label{
+
+        .control-label {
             margin-left: 20px;
             text-align: right;
-            width:130px;
+            width: 130px;
         }
-        .checkBoxClass{
+
+        .checkBoxClass {
             cursor: pointer;
         }
     </style>
@@ -88,10 +92,14 @@
                 <td id="operId">
                     <c:if test="${emrModle.isOper == 1}">
                         <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 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>
                     </c:if>
                 </td>
@@ -104,16 +112,21 @@
     <div class="panel-group" id="accordion">
         <div class="panel">
             <div class="panel-heading">
-                    <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}
-                    </a>
-                    <span class="right">全选</span><input type="checkbox" class="right" value="全选" id="checkAll${check.id}" onclick="checkAll(${check.id})">
+                </a>
+                <span class="right">全选</span><input type="checkbox" class="right" value="全选" id="checkAll${check.id}"
+                                                    onclick="checkAll(${check.id})">
             </div>
             <div id="tab${check.id}" class="panel-collapse collapse in">
                 <div class="panel-body">
                     <div class="row">
                         <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>
                     </div>
                 </div>
@@ -121,16 +134,15 @@
         </div>
     </div>
 </c:forEach>
-
-<div class="row">
-    <div class="saveBtn">
-        <c:if test="${emrModle.isOper == 1}">
-            <shiro:hasPermission name="/template/addModleRelated">
+<c:if test="${emrModle.isOper == 1}">
+    <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>
-            </shiro:hasPermission>
-        </c:if>
-    </div>
-</div>
+            </div>
+        </div>
+    </shiro:hasPermission>
+</c:if>
 <!-- 模态框2（Modal） -->
 <div class="modal fade" id="myModal2" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
     <div class="modal-dialog">
@@ -151,7 +163,8 @@
                         <div class="form-group">
                             <label class="col-sm-5 control-label left">模板标志：</label>
                             <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>
@@ -159,7 +172,8 @@
                         <div class="form-group">
                             <label class="col-sm-5 control-label  left">模板名称：</label>
                             <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>
@@ -167,7 +181,8 @@
                         <div class="form-group">
                             <label class="col-sm-4 control-label  left">有效时间：</label>
                             <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">
                                     <i class="fa fa-calendar"></i>
                                 </div>
@@ -191,7 +206,9 @@
                         <div class="form-group">
                             <label class="col-sm-4 control-label  left">排序：</label>
                             <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 class="col-sm-1"></div>
                         </div>
@@ -200,7 +217,8 @@
                         <div class="form-group">
                             <label class="col-sm-4 control-label  left">备注：</label>
                             <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 class="col-sm-1"></div>
                         </div>
@@ -209,7 +227,8 @@
                         <div class="form-group" style="margin-left: 76px;">
                             <div class="col-sm-4"></div>
                             <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>
diff --git a/src/main/webapp/WEB-INF/views/recordManage/templateSearch/templateSelectList.jsp b/src/main/webapp/WEB-INF/views/recordManage/templateSearch/templateSelectList.jsp
index b22b6c1..f1a6eb1 100644
--- a/src/main/webapp/WEB-INF/views/recordManage/templateSearch/templateSelectList.jsp
+++ b/src/main/webapp/WEB-INF/views/recordManage/templateSearch/templateSelectList.jsp
@@ -32,8 +32,7 @@
         }
         .insertbtn{
             width:60%;
-            margin-top:-3%;
-            margin-left:-2%!important;
+            margin: 0 auto;
         }
         .searcDiv{
             margin: 10px 20px;
@@ -49,9 +48,6 @@
         .input-group{
             padding-left:5%!important;
         }
-        .btn{
-            margin-left:8%;
-        }
         .rightContent{
             padding-left:1%;
         }
@@ -64,7 +60,7 @@
             height: calc(100vh - 43px);
         }
         .zTreeDemo {
-            height: calc(100vh - 131px) !important;
+            height: calc(100vh - 123px) !important;
             min-height: 394px !important;
         }
     </style>
diff --git a/src/main/webapp/static/js/distributionManage/distributionManage.js b/src/main/webapp/static/js/distributionManage/distributionManage.js
index a8e17bf..d529a3d 100644
--- a/src/main/webapp/static/js/distributionManage/distributionManage.js
+++ b/src/main/webapp/static/js/distributionManage/distributionManage.js
@@ -10,6 +10,7 @@ $('#mytab').bootstrapTable({
 	pageNumber: 1,                       //初始化加载第一页，默认第一页
 	pageSize: 5,                       //每页的记录行数（*）
 	pageList: [5,10,15,20,30,50],//可供选择的每页的行数（*）
+	height: 355,
 	columns:[
 		{
 			field: 'no',
diff --git a/src/main/webapp/static/js/otherManage/backupDatabase.js b/src/main/webapp/static/js/otherManage/backupDatabase.js
index bd93640..c610d7a 100644
--- a/src/main/webapp/static/js/otherManage/backupDatabase.js
+++ b/src/main/webapp/static/js/otherManage/backupDatabase.js
@@ -10,7 +10,7 @@ $('#mytab').bootstrapTable({
     pageNumber: 1,                       //初始化加载第一页，默认第一页
     pageSize: 10,                       //每页的记录行数（*）
     pageList: [5,10,15,20,50,1000],//可供选择的每页的行数（*）
-    _height: 1100,                        //行高，如果没有设置height属性，表格自动根据记录条数觉得表格高度
+    height: window.innerHeight - 140,                        //行高，如果没有设置height属性，表格自动根据记录条数觉得表格高度
     columns:[
         {
             title:'全选',
diff --git a/src/main/webapp/static/js/otherManage/downloadInfoCommomJs174.js b/src/main/webapp/static/js/otherManage/downloadInfoCommomJs174.js
index 4c586d7..f1c795b 100644
--- a/src/main/webapp/static/js/otherManage/downloadInfoCommomJs174.js
+++ b/src/main/webapp/static/js/otherManage/downloadInfoCommomJs174.js
@@ -33,7 +33,7 @@ $('#mytab').bootstrapTable({
     pageNumber: 1,                       //初始化加载第一页，默认第一页
     pageSize: 10,                       //每页的记录行数（*）
     pageList: [5,10,15,20,50,1000],//可供选择的每页的行数（*）
-    _height: 1100,                        //行高，如果没有设置height属性，表格自动根据记录条数觉得表格高度
+    height: window.innerHeight - 173,                        //行高，如果没有设置height属性，表格自动根据记录条数觉得表格高度
     columns:[
         {
             title:'全选',
diff --git a/src/main/webapp/static/js/otherManage/lockList.js b/src/main/webapp/static/js/otherManage/lockList.js
index b19b713..701d5d3 100644
--- a/src/main/webapp/static/js/otherManage/lockList.js
+++ b/src/main/webapp/static/js/otherManage/lockList.js
@@ -15,7 +15,7 @@ $('#mytab').bootstrapTable({
     pageNumber: 1,                       //初始化加载第一页，默认第一页
     pageSize: 10,                       //每页的记录行数（*）
     pageList: [5,10,15,20,50,1000],//可供选择的每页的行数（*）
-    _height: 1100,                        //行高，如果没有设置height属性，表格自动根据记录条数觉得表格高度
+    height: window.innerHeight - 138,                        //行高，如果没有设置height属性，表格自动根据记录条数觉得表格高度
     columns:[
         {
             title:'全选',