调整spreadJS引入后的高度（滚动条）问题

css/main.css

@@ -63,7 +63,6 @@ body {
     color: #333
 }
 .content {
-    margin:0 5px;
     background: #fff
 }
 .tools-btn {
@@ -78,7 +77,7 @@ body {
     overflow-y: auto;
 }
 .top-content, .fluid-content {
-    overflow: auto;
+    overflow: hidden;
     border-bottom: 1px solid #ccc;
 }
 .warp-p2 {
@@ -209,6 +208,10 @@ body {
     height: 350px;
     overflow: auto;
 }
+.bottom-content .tab-content .main-data-bottom{
+    height: 350px;
+    overflow: auto;
+}
 .form-signin {
     max-width: 500px;
     margin: 150px auto;
@@ -258,4 +261,7 @@ body {
 .codeList{
     max-height: 200px;
     overflow:auto;
-}
+}
+.main-data-top,.main-data-bottom,.main-data{
+  overflow: auto;
+}

dinge.html

@@ -7,7 +7,6 @@
     <meta http-equiv="x-ua-compatible" content="ie=edge">
     <title>定额库编辑器</title>
     <link rel="stylesheet" href="css/bootstrap/bootstrap.min.css">
-    <link rel="stylesheet" href="css/bootstrap/themes.css">
     <link rel="stylesheet" href="css/main.css">
     <link rel="stylesheet" href="css/font-awesome/font-awesome.min.css">
     <!--zTree-->
@@ -48,7 +47,7 @@
                   </div>
                   <div class="main-content col-lg-9 p-0">
                         <div class="top-content">
-                          <ul class="nav nav-tabs" role="tablist">
+                          <ul class="nav nav-tabs tools-bar" role="tablist">
                               <li class="nav-item">
                                   <a class="nav-link active" data-toggle="tab" href="#tde" role="tab">定额</a>
                               </li>
@@ -65,7 +64,7 @@
                           <!-- Tab panes -->
                           <div class="tab-content">
                               <div class="tab-pane active" id="tde" role="tabpanel">
-                                  <div class="warp-p2">
+                                  <div class="main-data-top">
                                       <table class="table table-sm table-bordered m-0">
                                         <thead><tr><th width="30"></th><th width="120">编码</th><th>名称</th><th>单位</th><th>基价</th><th>显示名称（以%s表示参数）</th><th>默认取费专业</th></tr></thead>
                                         <tbody>
@@ -73,56 +72,113 @@
                                             <td>1</td><td>AA0001</td><td>人工挖土方</td><td>100m3</td><td>840.84</td><td>人工挖土方</td><td>1</td>
                                           </tr>
                                           <tr>
-                                            <td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>
+                                            <td>2</td><td></td><td></td><td></td><td></td><td></td><td></td>
                                           </tr>
                                           <tr>
-                                            <td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>
+                                            <td>3</td><td></td><td></td><td></td><td></td><td></td><td></td>
                                           </tr>
                                           <tr>
-                                            <td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>
+                                            <td>4</td><td></td><td></td><td></td><td></td><td></td><td></td>
                                           </tr>
                                         </tbody>
                                       </table>
                                   </div>
                               </div>
                               <div class="tab-pane" id="tsm" role="tabpanel">
-                                  <div class="warp-p2">
+                                  <div class="main-data-top">
                                     <div class="m-2"><a href="javacript:void(0);" data-toggle="modal" data-target="#editTsm" title="编辑">编辑说明</a></div>
-                                    <div class="main-content">
+                                    <div class="main-content m-2">
                                       <h5>说明</h5><p>一、一般说明</p><p>1.土壤及岩石分类，详见土壤及岩石分类表。</p><p>2.....</p>
                                     </div>
                                   </div>
                               </div>
                               <div class="tab-pane" id="tjs" role="tabpanel">
-                                  <div class="warp-p2">
+                                  <div class="main-data-top">
                                     <div class="m-2"><a href="javacript:void(0);" data-toggle="modal" data-target="#editTjs" title="编辑">编辑计算规则</a></div>
-                                    <div class="main-content">
+                                    <div class="main-content m-2">
                                       <h5>计算规则</h5>
                                       <p>土壤、岩石体积，均按挖掘前的天然密度体积以立方米计算。.....</p>
                                     </div>
                                   </div>
                               </div>
                               <div class="tab-pane" id="tgz" role="tabpanel">
-                                <div class="warp-p2">
-                                  <!-- <div class="form-check m-2"><label class="form-check-label"><input type="radio" class="form-check-input" name="optionsRadios" id="optionsRadios1" value="option1" checked=""> 适合本项所有定额</label></div> -->
-                                  <p class="m-2">适合本项所有定额</p>
-                                  <p class="m-2">1.挖土、修理边底。2.挖淤泥、流沙、修理边底。</p>
-                                  <p class="m-2">适合本项部分定额</p>
+                                <div class="main-data-top">
+                                  <div class="form-check m-2"><label class="form-check-label"><input type="radio" class="form-check-input" name="optionsRadios" id="optionsRadios1" value="option1" checked=""> 适合本项所有定额</label>&nbsp;&nbsp;<label class="form-check-label"><input type="radio" class="form-check-input" name="optionsRadios" id="optionsRadios1" value="option1"> 适合本项部分定额</label></div>
+                                  <!-- <p class="m-2">适合本项所有定额</p> -->
+                                  <table class="table table-sm table-bordered m-0">
+                                    <tr>
+                                      <td>1.挖土、修理边底。2.挖淤泥、流沙、修理边底。</td>
+                                    </tr>
+                                  </table>
+                                  <div class="form-check m-2"><label class="form-check-label"><input type="radio" class="form-check-input" name="optionsRadios2" id="optionsRadios2" value="option1"> 适合本项所有定额</label>&nbsp;&nbsp;<label class="form-check-label"><input type="radio" class="form-check-input" name="optionsRadios2" id="optionsRadios2" value="option1" checked=""> 适合本项部分定额</label></div>
                                   <table class="table table-sm table-bordered m-0">
                                     <thead>
                                       <tr>
+                                        <th></th>
                                         <th>编码</th>
                                         <th>工作内容</th>
                                       </tr>
                                     </thead>
                                     <tbody>
-                                      <tr rowspan="4">
-                                        <td data-toggle="modal" data-target="#editBianma"><p class="m-0">AA0017</p><p class="m-0">AA0018</p><p class="m-0">AA0019</p><p class="m-0">AA0020</p></td>
-                                        <td>1.挖土、修理边底。</td>
+                                      <tr>
+                                        <td>1</td>
+                                        <td><a href data-toggle="modal" data-target="#editBianmaQ" class="m-0">编辑编码</a><p class="m-0">AA0017</p><p class="m-0">AA0018</p><p class="m-0">AA0019</p><p class="m-0">AA0020</p><p class="m-0">AA0021</p><p class="m-0">AA0022</p></td>
+                                        <td><p class="m-0">1.松填土：5m内的就地取土，铺平。</p><p class="m-0">2.夯填土方（石渣）：5m内的就地取土（石渣）、铺平、夯实、洒水等。</p></div></td>
+                                      </tr>
+                                      <tr>
+                                        <td>2</td>
+                                        <td><a href data-toggle="modal" data-target="#editBianma" class="m-0">点击勾选编码</a></td>
+                                        <td></td>
+                                      </tr>
+                                      <tr>
+                                        <td>3</td>
+                                        <td></td>
+                                        <td></td>
+                                      </tr>
+                                      <tr>
+                                        <td>4</td>
+                                        <td></td>
+                                        <td></td>
+                                      </tr>
+                                    </tbody>
+                                  </table>
+                                  <div class="form-check m-2"><label class="form-check-label"><input type="radio" class="form-check-input" name="optionsRadios1" id="optionsRadios2" value="option1"> 适合本项所有定额</label>&nbsp;&nbsp;<label class="form-check-label"><input type="radio" class="form-check-input" name="optionsRadios1" id="optionsRadios2" value="option1" checked=""> 适合本项部分定额</label></div>
+                                  <table class="table table-sm table-bordered m-0">
+                                    <thead>
+                                      <tr>
+                                        <th></th>
+                                        <th>编码</th>
+                                        <th>工作内容</th>
+                                      </tr>
+                                    </thead>
+                                    <tbody>
+                                      <tr>
+                                        <td>1</td>
+                                        <td><a href data-toggle="modal" data-target="#editBianma" class="m-0">编辑编码</a><p class="m-0">AA0017</p><p class="m-0">AA0018</p><p class="m-0">AA0019</p></td>
+                                        <td><p class="m-0">1.松填土：5m内的就地取土，铺平。</p><p class="m-0">2.夯填土方（石渣）：5m内的就地取土（石渣）、铺平、夯实、洒水等。</p></td>
+                                      </tr>
+                                      <tr>
+                                        <td>2</td>
+                                        <td><a href data-toggle="modal" data-target="#editBianma" class="m-0">编辑编码</a><p class="m-0">AA0020</p><p class="m-0">AA0021</p><p class="m-0">AA0022</p></td>
+                                        <td><p class="m-0">1.松填土：5m内的就地取土，铺平。</p><p class="m-0">2.夯填土方（石渣）：5m内的就地取土（石渣）、铺平、夯实、洒水等。</p></td>
+                                      </tr>
+                                      <tr>
+                                        <td>3</td>
+                                        <td><a href data-toggle="modal" data-target="#editBianma" class="m-0">点击勾选编码</a></td>
+                                        <td></td>
+                                      </tr>
+                                      <tr>
+                                        <td>4</td>
+                                        <td></td>
+                                        <td></td>
+                                      </tr>
+                                      <tr>
+                                        <td>5</td>
+                                        <td></td>
+                                        <td></td>
                                       </tr>
                                     </tbody>
                                   </table>
-                                  <div class="m-2"><a href="javacript:void(0);" data-toggle="modal" data-target="#addNewgznr" class="btn btn-primary btn-sm">新增工作内容</a></div>
                                 </div>
                               </div>
                           </div>
@@ -145,7 +201,7 @@
                             <!-- Tab panes -->
                             <div class="tab-content">
                                 <div class="tab-pane" id="bglj" role="tabpanel">
-                                    <div class="warp-p2">
+                                    <div class="main-data-bottom">
                                         <table class="table table-sm table-bordered m-0">
                                           <thead><tr><th width="30"></th><th width="120">编码</th><th>名称</th><th>单位</th><th>基价单位</th><th>定额消耗</th><th>类型</th></tr></thead>
                                           <tbody>
@@ -154,20 +210,20 @@
                                               <td>人工</td>
                                             </tr>
                                             <tr>
-                                              <td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td></td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>
+                                              <td>2</td><td></td><td></td><td></td><td></td><td></td><td></td>
                                             </tr>
                                             <tr>
-                                              <td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td></td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>
+                                              <td>3</td><td></td><td></td><td></td><td></td><td></td><td></td>
                                             </tr>
                                             <tr>
-                                              <td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td></td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>
+                                              <td>4</td><td></td><td></td><td></td><td></td><td></td><td></td>
                                             </tr>
                                           </tbody>
                                         </table>
                                     </div>
                                 </div>
                                 <div class="tab-pane" id="bfzd" role="tabpanel">
-                                    <div class="warp-p2">
+                                    <div class="main-data-bottom">
                                       <table class="table table-sm table-bordered m-0">
                                           <thead><tr><th width="30"></th><th width="120">调整名称</th><th>序号</th><th>参数最大值</th><th>辅助定额号</th><th>参数名称</th><th>标准值</th><th>步距</th><th>精度</th><th>进位方式</th></tr></thead>
                                           <tbody>
@@ -176,41 +232,41 @@
                                               <td>20</td><td>20</td><td>0</td><td>四舍五入</td>
                                             </tr>
                                             <tr>
-                                              <td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>
+                                              <td>2</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>
                                             </tr>
                                             <tr>
-                                              <td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>
+                                              <td>3</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>
                                             </tr>
                                             <tr>
-                                              <td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>
+                                              <td>4</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>
                                             </tr>
                                           </tbody>
                                         </table>
                                     </div>
                                 </div>
                                 <div class="tab-pane active" id="bfzt" role="tabpanel">
-                                    <div class="warp-p2">
+                                    <div class="main-data-bottom">
                                         <table class="table table-sm table-bordered m-0">
                                           <thead><tr><th width="30"></th><th width="40">编号</th><th width="120">本分项全部适用</th><th>调整顺序</th><th>名称</th><th>内容</th></tr></thead>
                                           <tbody>
                                             <tr>
-                                              <td>1</td><td>1</td><td><i class="fa fa-check"></td><td>2</td><td>挖湿土时</td><td>人工x1.18</td>
+                                              <td>1</td><td>1</td><td><label class="form-check-label"><input type="checkbox" class="form-check-input" checked></label></td><td>2</td><td>挖湿土时</td><td>人工x1.18</td>
                                             </tr>
                                             <tr>
-                                              <td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>
+                                              <td>2</td><td></td><td></td><td></td><td></td><td></td>
                                             </tr>
                                             <tr>
-                                              <td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>
+                                              <td>3</td><td></td><td></td><td></td><td></td><td></td>
                                             </tr>
                                             <tr>
-                                              <td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>
+                                              <td>4</td><td></td><td></td><td></td><td></td><td></td>
                                             </tr>
                                           </tbody>
                                         </table>
                                     </div>
                                 </div>
                                 <div class="tab-pane" id="baz" role="tabpanel">
-                                    <div class="warp-p2">
+                                    <div class="main-data-bottom">
                                         安装增加费
                                     </div>
                                 </div>
@@ -234,20 +290,12 @@
                 <div class="modal-body">
                   <form>
                     <div class="form-group">
-                      <label>选择</label>
-                      <select class="form-control" id="exampleSelect1"><option>适合本项所有定额</option><option>适合本项部分定额</option></select>
-                    </div>
-                    <div class="form-group">
                       <label>内容</label>
                       <textarea class="form-control" id="" rows="5"></textarea>
                     </div>
                   </form>
                   <form>
                     <div class="form-group">
-                      <label>选择</label>
-                      <select class="form-control" id="exampleSelect1"><option>适合本项部分定额</option><option>适合本项所有定额</option></select>
-                    </div>
-                    <div class="form-group">
                       <label>编码</label>
                       <div class="form-control">
                         <div class="row code">
@@ -285,7 +333,7 @@
                         </div>
                       </div>
                     </div>
-                    
+
                     <div class="form-group">
                       <label>内容</label>
                       <textarea class="form-control" id="" rows="5"></textarea>
@@ -350,6 +398,65 @@
         </div>
     </div>
 
+    <div class="modal fade" id="editBianmaQ" data-backdrop="static" style="display: none;" aria-hidden="true">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                  <h5 class="modal-title">修改编码</h5>
+                  <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">×</span>
+                  </button>
+                </div>
+                <div class="modal-body">
+                  <form>
+                    <div class="form-group">
+                      <label>编码</label>
+                      <div class="form-control">
+                        <div class="row code">
+                          <div class="col">
+                            <label class="form-check-label">
+                              <input class="form-check-input" type="checkbox" id="inlineCheckbox1" value="option1" checked> AA0017
+                            </label>
+                          </div>
+                          <div class="col">
+                            <label class="form-check-label">
+                              <input class="form-check-input" type="checkbox" id="inlineCheckbox1" value="option1" checked> AA0018
+                            </label>
+                          </div>
+                          <div class="col">
+                            <label class="form-check-label">
+                              <input class="form-check-input" type="checkbox" id="inlineCheckbox1" value="option1" checked> AA0019
+                            </label>
+                          </div>
+                          <div class="w-100"></div>
+                          <div class="col">
+                            <label class="form-check-label">
+                              <input class="form-check-input" type="checkbox" id="inlineCheckbox1" value="option1" checked> AA0020
+                            </label>
+                          </div>
+                          <div class="col">
+                            <label class="form-check-label">
+                              <input class="form-check-input" type="checkbox" id="inlineCheckbox1" value="option1" checked> AA0021
+                            </label>
+                          </div>
+                          <div class="col">
+                            <label class="form-check-label">
+                              <input class="form-check-input" type="checkbox" id="inlineCheckbox1" value="option1" checked> AA0022
+                            </label>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </form>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+                    <a href="" class="btn btn-primary">确定</a>
+                </div>
+            </div>
+        </div>
+    </div>
+
     <div class="modal fade" id="editBianma" data-backdrop="static" style="display: none;" aria-hidden="true">
         <div class="modal-dialog" role="document">
             <div class="modal-content">
@@ -383,17 +490,17 @@
                           <div class="w-100"></div>
                           <div class="col">
                             <label class="form-check-label">
-                              <input class="form-check-input" type="checkbox" id="inlineCheckbox1" value="option1"> AA0020
+                              <input class="form-check-input" type="checkbox" id="inlineCheckbox1" value="option1" disabled> AA0020
                             </label>
                           </div>
                           <div class="col">
                             <label class="form-check-label">
-                              <input class="form-check-input" type="checkbox" id="inlineCheckbox1" value="option1"> AA0021
+                              <input class="form-check-input" type="checkbox" id="inlineCheckbox1" value="option1" disabled> AA0021
                             </label>
                           </div>
                           <div class="col">
                             <label class="form-check-label">
-                              <input class="form-check-input" type="checkbox" id="inlineCheckbox1" value="option1"> AA0022
+                              <input class="form-check-input" type="checkbox" id="inlineCheckbox1" value="option1" disabled> AA0022
                             </label>
                           </div>
                         </div>

fuzhu.html

@@ -7,7 +7,6 @@
     <meta http-equiv="x-ua-compatible" content="ie=edge">
     <title>定额库编辑器</title>
     <link rel="stylesheet" href="css/bootstrap/bootstrap.min.css">
-    <link rel="stylesheet" href="css/bootstrap/themes.css">
     <link rel="stylesheet" href="css/main.css">
     <link rel="stylesheet" href="css/font-awesome/font-awesome.min.css">
     <!--zTree-->
@@ -42,6 +41,7 @@
             <div class="container-fluid">
                 <div class="row">
                   <div class="main-side col-lg-7 p-0">
+                    <div class="main-data">
                     <table class="table table-sm table-bordered m-0">
                       <thead>
                         <tr>
@@ -77,29 +77,30 @@
                           <td>人工×26.72</td>
                         </tr>
                         <tr>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
+                          <td>5</td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
                         </tr>
                         <tr>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
+                          <td>6</td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
                         </tr>
                         <tr>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
+                          <td>7</td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
                         </tr>
                       </tbody>
                     </table>
+                    </div>
                   </div>
                   <div class="main-content col-lg-5 p-0">
                     <div class="m-2">
-                      <p><div class="form-check"><label class="form-check-label"><input type="radio" class="form-check-input" name="optionsRadios" id="optionsRadios1" value="option1" checked> 工料机整体调整</label></div></p>
+                      <p><div class="form-check"><label class="form-check-label"><input type="radio" class="form-check-input" name="optionsRadios" id="optionsRadios1" value="option1" checked> 工料机整体调整</label>&nbsp;&nbsp;<label class="form-check-label"><input type="radio" class="form-check-input" name="optionsRadios" id="optionsRadios1" value="option1"> 单个工料机调整</label></div></p>
                     </div>
                     <table class="table table-sm table-bordered m-0">
                       <thead>
@@ -128,7 +129,7 @@
                       </tbody>
                     </table>
                     <div class="m-2">
-                      <p><div class="form-check"><label class="form-check-label"><input type="radio" class="form-check-input" name="optionsRadios1" id="optionsRadios" value="option1" checked> 单个工料机调整</label></div></p>
+                      <p><div class="form-check"><label class="form-check-label"><input type="radio" class="form-check-input" name="optionsRadios1" id="optionsRadios" value="option1"> 工料机整体调整</label>&nbsp;&nbsp;<label class="form-check-label"><input type="radio" class="form-check-input" name="optionsRadios1" id="optionsRadios" value="option1" checked> 单个工料机调整</label></div></p>
                     </div>
                     <table class="table table-sm table-bordered m-0">
                       <thead>
@@ -149,25 +150,25 @@
                           <td>1.18</td>
                         </tr>
                         <tr>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
+                          <td>2</td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
                         </tr>
                         <tr>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
+                          <td>3</td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
                         </tr>
                         <tr>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
+                          <td>4</td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
                         </tr>
                       </tbody>
                     </table>

gongliao.html

@@ -7,7 +7,6 @@
     <meta http-equiv="x-ua-compatible" content="ie=edge">
     <title>定额库编辑器</title>
     <link rel="stylesheet" href="css/bootstrap/bootstrap.min.css">
-    <link rel="stylesheet" href="css/bootstrap/themes.css">
     <link rel="stylesheet" href="css/main.css">
     <link rel="stylesheet" href="css/font-awesome/font-awesome.min.css">
     <!--zTree-->
@@ -47,7 +46,8 @@
                     </div>
                   </div>
                   <div class="main-content col-lg-9 p-0">
-                    <table class="table table-sm table-bordered m-0">
+                    <div class="main-data">
+                      <table class="table table-sm table-bordered m-0">
                       <thead>
                         <tr>
                           <th></th>
@@ -88,34 +88,35 @@
                           <td>材料</td>
                         </tr>
                         <tr>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
+                          <td>4</td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
                         </tr>
                         <tr>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
+                          <td>5</td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
                         </tr>
                         <tr>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
+                          <td>6</td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
                         </tr>
                       </tbody>
                     </table>
+                    </div>
                   </div>
                 </div>
             </div>

js/global.js

@@ -2,6 +2,7 @@
 function autoFlashHeight(){
     var headerHeight = $(".header").height();
     var bottomContentHeight = $(".bottom-content").height();
+    var toolsBar = $(".tools-bar").height();
     $(".content").height($(window).height()-headerHeight);
     $(".main-side").height($(window).height()-headerHeight-2);
     $(".top-content").height($(window).height()-headerHeight-bottomContentHeight-1);
@@ -9,6 +10,8 @@ function autoFlashHeight(){
     $(".side-content").height($(window).height()-headerHeight );
     $(".poj-list").height($(window).height()-headerHeight);
     $(".form-list").height($(window).height()-headerHeight-50 );
+    $(".main-data-top").height($(window).height()-headerHeight-toolsBar-bottomContentHeight );
+    $(".main-data").height($(window).height()-headerHeight);
 };
 $(window).resize(autoFlashHeight);
 /*全局自适应高度结束*/

main.html

@@ -7,7 +7,6 @@
     <meta http-equiv="x-ua-compatible" content="ie=edge">
     <title>定额库编辑器</title>
     <link rel="stylesheet" href="css/bootstrap/bootstrap.min.css">
-    <link rel="stylesheet" href="css/bootstrap/themes.css">
     <link rel="stylesheet" href="css/main.css">
     <link rel="stylesheet" href="css/font-awesome/font-awesome.min.css">
     <!--zTree-->