From d7cda5163148df80cb4b8bcc71df677109c65351 Mon Sep 17 00:00:00 2001
From: ZHAOTONGHUA <2066753415@qq.com>
Date: Tue, 26 Nov 2019 11:17:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E8=A1=A8=E5=A4=B4=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=EF=BC=8C=E5=AF=BC=E5=85=A5=E6=A1=86=E6=9E=B6=E5=9C=A8?=
 =?UTF-8?q?table=E9=87=8C=E9=9D=A2=E5=A1=AB=E5=85=A5=E6=95=B0=E5=80=BC?=
 =?UTF-8?q?=EF=BC=8C=E7=84=B6=E5=90=8E=E5=9C=A8js=E9=87=8C=E9=9D=A2?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=80=E5=AE=9A=E7=9A=84=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/views/menu/index.php        | 18 ++----------------
 frontend/views/permissions/index.php |  8 +++++++-
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/frontend/views/menu/index.php b/frontend/views/menu/index.php
index 5d1430c..30c1bc3 100644
--- a/frontend/views/menu/index.php
+++ b/frontend/views/menu/index.php
@@ -102,24 +102,10 @@ use \common\libs\MyLib;
         });
     }
 
-    //使得table有一定的高度，出现滚动条
-        function table(){
-             //获取body高度
-             var a=$(".gray-bg").height();
-             //获取条件选择高度
-             var b=$('#searchFrm').height();
-             //获取标题高度
-             var c=$('.ibox-title').height();
-             //获取table高度
-             var e=$("#listTable").height();
-             var f=$(".ibox-content").height();
-             var d=a-c-100;
-             console.log(e);
-             console.log(f);
-             //$('.fixed-table-body').css({'height':d});
-        }
     $(function() {
         search();
+
+        //table设置一定的高度
         var tab=$("#listTable").attr('data-height');
         $('.fixed-table-body').css({'height':tab-40});
     });
diff --git a/frontend/views/permissions/index.php b/frontend/views/permissions/index.php
index 6e05908..010099a 100644
--- a/frontend/views/permissions/index.php
+++ b/frontend/views/permissions/index.php
@@ -2,6 +2,7 @@
 use \common\libs\MyLib;
 ?>
 <?php $this->beginBlock('header_css'); ?>
+<link href="/assets/css/bootstrap.min.css" rel="stylesheet">
 <link href="/assets/css/plugins/bootstrap-table/bootstrap-table.min.css" rel="stylesheet">
 <?php $this->endBlock(); ?>
 
@@ -21,7 +22,7 @@ use \common\libs\MyLib;
         <div class="ibox-content">
             <div class="row">
                 <div class="col-md-12">
-                    <table id="listTable">
+                    <table id="listTable" class="table table-bordered" id="table" data-toggle="table" data-height="689">
                         <thead class="bg-warning">
                         <tr>
                             <th data-field="id">ID</th>
@@ -38,6 +39,7 @@ use \common\libs\MyLib;
 
 
 <?php $this->beginBlock('footer_js'); ?>
+<script src="https://code.jquery.com/jquery-3.3.1.min.js"></script>
 <script src="/assets/js/plugins/bootstrap-table/bootstrap-table.min.js"></script>
 <script src="/assets/js/plugins/bootstrap-table/bootstrap-table-mobile.min.js"></script>
 <script src="/assets/js/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.min.js"></script>
@@ -98,6 +100,10 @@ use \common\libs\MyLib;
     }
     $(function() {
         search();
+
+        //table设置一定的高度
+        var tab=$("#listTable").attr('data-height');
+        $('.fixed-table-body').css({'height':tab-40});
     });
 </script>
 <?php $this->endBlock(); ?>