From 03ba2a35e418519dfee0f1cb63658bd34f1bd35c Mon Sep 17 00:00:00 2001 From: ZHAOTONGHUA <2066753415@qq.com> Date: Mon, 25 Nov 2019 16:52:47 +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=E7=9B=B4=E6=8E=A5=E5=9C=A8js=E9=87=8C?= =?UTF-8?q?=E9=9D=A2=E8=AE=BE=E7=BD=AE=E4=B8=80=E5=AE=9A=E7=9A=84=E9=AB=98?= =?UTF-8?q?=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/views/finance/ticheng-jisuan.php | 1 + frontend/views/permissions/index.php | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/frontend/views/finance/ticheng-jisuan.php b/frontend/views/finance/ticheng-jisuan.php index 2e6fea7..f404201 100644 --- a/frontend/views/finance/ticheng-jisuan.php +++ b/frontend/views/finance/ticheng-jisuan.php @@ -239,6 +239,7 @@ use \common\libs\MyLib; var a=$(".gray-bg").height(); //获取条件选择高度 var b=$('#searchFrm').height(); + console.log(b); //获取标题高度 var c=$('.ibox-title').height(); $('.fixed-table-body').css({'height': a-b-c-100}); diff --git a/frontend/views/permissions/index.php b/frontend/views/permissions/index.php index 140ff53..cd5e25d 100644 --- a/frontend/views/permissions/index.php +++ b/frontend/views/permissions/index.php @@ -103,7 +103,18 @@ use \common\libs\MyLib; var a=$(".gray-bg").height(); //获取标题高度 var c=$('.ibox-title').height(); - $('.fixed-table-body').css({'height': a-c-100}); + //获取条件选择高度 + var b=$('#searchFrm').height(); + console.log(b); + //获取table高度 + var e=$("row").height(); + var d= a-c-b-100; + if(e>d){ + $('.fixed-table-body').css({'height':d}); + }else{ + $('.fixed-table-body').css({'height':e}); + } + } $(function() { search();