清单规则 和 定额库 窗体高度优化

css/main.css

@@ -90,6 +90,19 @@ body {
 }
 .main-data-top{
   overflow: hidden;
+  width:100%
+}
+.main-content.col-lg-8{
+  width:66.666667%
+}
+.main-content.col-lg-12{
+  width:100%
+}
+.main-side.col-lg-4{
+  width: 33.333333%;
+}
+.main-side.col-lg-0{
+  width:0%;
 }
 .sidebar-bottom,.sidebar-bottom .col-lg-6,.sidebar-bottom .col-lg-12 {
   height:200px
@@ -97,6 +110,7 @@ body {
 .top-content, .fluid-content {
     overflow: auto;
     border-bottom: 1px solid #ccc;
+    width: 100%
 }
 .bottom-content .nav {
     background: #f7f7f9;

js/global.js

@@ -3,9 +3,10 @@ function autoFlashHeight(){
     var headerHeight = $(".header").height();
     var toolsbarHeight = $(".toolsbar").height();
     var bottomContentHeight = $(".bottom-content").height();
-    var sidebarToolsBarHeight = $(".sidebar-tools-bar").height();
-    $(".main-data-side-f").height($(window).height()-headerHeight-toolsbarHeight-sidebarToolsBarHeight-202);
-    $(".main-data-side-s").height($(window).height()-headerHeight-toolsbarHeight-sidebarToolsBarHeight-202);
+    var toolsBarHeightQ = $(".tools-bar-height-q").height();
+    var toolsBarHeightD = $(".tools-bar-height-d").height();
+    $(".main-data-side-q").height($(window).height()-headerHeight-toolsbarHeight-toolsBarHeightQ-202);
+    $(".main-data-side-d").height($(window).height()-headerHeight-toolsbarHeight-toolsBarHeightD-202);
     $(".main-data-top").height($(window).height()-headerHeight-toolsbarHeight-bottomContentHeight-1);
     $(".main-data-full").height($(window).height()-headerHeight-toolsbarHeight-1);
     $(".main-data-side-search").height($(window).height()-headerHeight-toolsbarHeight-64);
@@ -36,8 +37,8 @@ $("body").click(function(event){
     });
 /*侧滑*/
 /*工具提示*/
-$('*[data-toggle=tooltip]').mouseover(function() {
- $(this).tooltip('show');
-  });
+$(function () {
+  $('[data-toggle="tooltip"]').tooltip()
+});
 /*工具提示*/
 });

zaojiashu.html

@@ -2285,7 +2285,7 @@
                         <div class="tab-content">
                             <!--清单规则-->
                             <div class="tab-pane active" id="qd" role="tabpanel">
-                                <div class="sidebar-tools-bar container-fluid">
+                                <div class="sidebar-tools-bar container-fluid tools-bar-height-q">
                                   <div class="p-1 row">
                                     <select class="form-control form-control-sm col-6" id="exampleSelect1">
                                       <option>重庆市房屋建筑与装饰工程工程量计算规则(2013)</option>
@@ -2301,14 +2301,14 @@
                                       </span>
                                     </div>
                                     <!--搜索结果窗体-->
-                                    <div class="side-search-box col-12 p-2">
+                                    <!-- <div class="side-search-box col-12 p-2">
                                       <div class="d-flex justify-content-between">
                                         <span>搜索结果：5</span><a class="btn btn-secondary btn-sm" href="#">查找下一条</a><a title="关闭搜索" class="btn btn-link btn-sm" href="#"><i class="fa fa-remove" aria-hidden="true"></i></a>
                                       </div>
-                                    </div>
+                                    </div> -->
                                   </div>
                                 </div>
-                                <div class="main-data-side-s">
+                                <div class="main-data-side-q">
                                   12
                                 </div>
                                 <div class="sidebar-bottom container-fluid">
@@ -2326,7 +2326,7 @@
                             </div>
                             <!--定额库-->
                             <div class="tab-pane" id="de" role="tabpanel">
-                              <div class="sidebar-tools-bar container-fluid">
+                              <div class="sidebar-tools-bar container-fluid tools-bar-height-d">
                                 <div class="p-1 row">
                                   <select class="form-control form-control-sm col-6" id="exampleSelect1">
                                     <option>重庆市建筑工程计价定额（2008）</option>
@@ -2342,9 +2342,9 @@
                                     </span>
                                   </div>
                                   <!--搜索结果窗体-->
-                                  <div class="side-search-box col-12 p-0">
-                                    <div class="d-flex justify-content-between p-2">
-                                      <span>搜索结果：5</span><div><a class="btn btn-secondary btn-sm" href="#">添加定额</a>&nbsp;<a class="btn btn-secondary btn-sm" href="#">替换定额</a></div><a title="关闭搜索" class="btn btn-link btn-sm" href="#"><i class="fa fa-remove" aria-hidden="true"></i></a>
+                                  <!-- <div class="side-search-box col-12 p-0">
+                                    <div class="d-flex justify-content-between">
+                                      <span>搜索结果：5</span><a title="关闭搜索" class="btn btn-link btn-sm" href="#"><i class="fa fa-remove" aria-hidden="true"></i></a>
                                     </div>
                                     <div class="w-100 main-data-side-search">
                                       <table class="table">
@@ -2355,10 +2355,10 @@
                                         </tbody>
                                       </table>
                                     </div>
-                                  </div>
+                                  </div> -->
                                 </div>
                               </div>
-                              <div class="main-data-side-s">
+                              <div class="main-data-side-d">
                                 12
                               </div>
                               <div class="sidebar-bottom container-fluid">