Browse Source

养护工料机界面结构修改

Chente 6 years ago
parent
commit
807b459347
3 changed files with 25 additions and 17 deletions
  1. 3 0
      css/main.css
  2. 21 17
      gongliaoji2.html
  3. 1 0
      js/global.js

+ 3 - 0
css/main.css

@@ -194,6 +194,9 @@ a{
   overflow: hidden;
   width:100%
 }
+.main-data-top-side{
+  overflow: hidden
+}
 .main-content.col-lg-8{
   width:66.666667%
 }

+ 21 - 17
gongliaoji2.html

@@ -110,25 +110,29 @@
             </div>
             <div class="container-fluid">
                 <div class="row">
-                    <div class="gl-side">
-                      <ul class="nav flex-column nav-pills mt-2 mb-2">
-                        <li class="nav-item px-2"><a href="#" class="nav-link">所有</a>
-                        <li class="nav-item px-2"><a href="#" class="nav-link">人工</a></li>
-                        <li class="nav-item px-2"><a href="#" class="nav-link">材料</a></li>
-                        <li class="nav-item px-2"><a href="#" class="nav-link active">机械</a></li>
-                      </ul>
-                    </div>
                     <div class="main-content col p-0">
                       <!--上部内容-->
-                      <div class="top-content">
-                        <div class="main-data-top">
-                          <table class="table table-sm table-bordered m-0">
-                            <thead>
-                              <tr>
-                                <th>编码</th><th>名称</th><th>规格型号</th><th>单位</th><th>定额价</th><th>市场价</th><th>总消耗量</th><th>三材系数</th><th>三材量</th><th>三材类别</th>
-                              </tr>
-                            </thead>
-                          </table>
+                      <div class="top-content row m-0">
+                        <div class="col-auto p-0">
+                          <div class="gl-side h-100">
+                            <ul class="nav flex-column nav-pills pt-2">
+                              <li class="nav-item px-2"><a href="#" class="nav-link active">所有</a>
+                              <li class="nav-item px-2"><a href="#" class="nav-link">人工</a></li>
+                              <li class="nav-item px-2"><a href="#" class="nav-link">材料</a></li>
+                              <li class="nav-item px-2"><a href="#" class="nav-link">机械</a></li>
+                            </ul>
+                          </div>
+                        </div>
+                        <div class="col p-0">
+                          <div class="main-data-top-side">
+                            <table class="table table-sm table-bordered m-0">
+                              <thead>
+                                <tr>
+                                  <th>编码</th><th>名称</th><th>规格型号</th><th>单位</th><th>定额价</th><th>市场价</th><th>总消耗量</th><th>三材系数</th><th>三材量</th><th>三材类别</th>
+                                </tr>
+                              </thead>
+                            </table>
+                          </div>
                         </div>
                       </div>
                       <!--下部内容-->

+ 1 - 0
js/global.js

@@ -15,6 +15,7 @@ function autoFlashHeight(){
     $(".main-data-side-z").height($(window).height()-headerHeight-toolsbarHeight-toolsBarHeightZ-2);
     $(".main-data-side-x").height($(window).height()-headerHeight-toolsbarHeight-toolsBarHeightY-2);
     $(".main-data-top").height($(window).height()-headerHeight-toolsbarHeight-bottomContentHeight-1);
+    $(".main-data-top-side").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);