toolsbar 高度问题

baobiao.html

@@ -100,7 +100,7 @@
                   </div>
                 </div>
                 <div class="col-lg-10 p-0">
-                  <div class="toolsbar">
+                  <div class="toolsbar-f">
                     <div class="print-toolsbar">
                       <div class="panel">
                         <div class="panel-body">

css/main.css

@@ -74,14 +74,14 @@ body {
     margin-left: 29px;
     background: #fff
 }
-.toolsbar {
+.toolsbar,.toolsbar-f {
   border-bottom: 1px solid #ccc
 }
 .tools-btn {
     height: 30px;
     line-height: 30px;
 }
-.toolsbar .tools-btn.btn:hover {
+.toolsbar .tools-btn.btn:hover,.toolsbar-f .tools-btn.btn:hover {
     background: #f7f7f9;
 }
 .main-side {

jisuanchengxu.html

@@ -92,7 +92,7 @@
             <div class="container-fluid">
                 <div class="row">
                   <div class="col-lg-3 p-0">
-                    <div class="main-data-full">
+                    <div class="main-data-not">
                        <table class="table table-sm table-bordered m-0">
                          <thead>
                            <tr><th>序号</th><th>专业名称</th></tr>
@@ -105,7 +105,7 @@
                      </div>
                    </div>
                   <div class="col-lg-9 p-0">
-                    <div class="main-data-full">
+                    <div class="main-data-not">
                         <table class="table table-sm table-bordered m-0">
                             <thead>
                                 <th>序号</th>

js/global.js

@@ -2,6 +2,7 @@
 function autoFlashHeight(){
     var headerHeight = $(".header").height();
     var toolsbarHeight = $(".toolsbar").height();
+    var ftoolsbarHeight = $(".toolsbar-f").height();
     var bottomContentHeight = $(".bottom-content").height();
     var toolsBarHeightQ = $(".tools-bar-height-q").height();
     var toolsBarHeightD = $(".tools-bar-height-d").height();
@@ -10,9 +11,10 @@ function autoFlashHeight(){
     $(".main-data-top").height($(window).height()-headerHeight-toolsbarHeight-bottomContentHeight-1);
     $(".main-data-full").height($(window).height()-headerHeight-toolsbarHeight-1);
     $(".main-data-full-fl").height($(window).height()-headerHeight-toolsbarHeight-37);
+    $(".main-data-not").height($(window).height()-headerHeight-1);
     $(".main-data-side-search").height($(window).height()-headerHeight-toolsbarHeight-64);
     $(".side-content").height($(window).height()-headerHeight );
-    $(".poj-list").height($(window).height()-headerHeight-toolsbarHeight);
+    $(".poj-list").height($(window).height()-headerHeight-ftoolsbarHeight);
     $(".form-list").height($(window).height()-headerHeight-50 );
 };
 $(window).resize(autoFlashHeight);

zaojiashu.html

@@ -2585,7 +2585,7 @@
         <div class="modal-dialog modal-lg" role="document">
             <div class="modal-content">
                 <div class="modal-header">
-                  <h5 class="modal-title"><i class="fa fa-history"></i> 列设置</h5>
+                  <h5 class="modal-title"><i class="fa fa-table"></i> 列设置</h5>
                   <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">&times;</span>
                   </button>