Jelajahi Sumber

调整spreadJS引入后的高度(滚动条)问题;新增main-data、main-data-top、main-data-bottom

Chente 8 tahun lalu
induk
melakukan
d6e74f43fe
5 mengubah file dengan 29 tambahan dan 16 penghapusan
  1. 9 3
      css/main.css
  2. 12 12
      dinge.html
  3. 2 0
      fuzhu.html
  4. 3 1
      gongliao.html
  5. 3 0
      js/global.js

+ 9 - 3
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;
+}

+ 12 - 12
dinge.html

@@ -48,7 +48,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 +65,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>
@@ -86,24 +86,24 @@
                                   </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="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">
@@ -171,7 +171,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>
@@ -193,7 +193,7 @@
                                     </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>
@@ -215,7 +215,7 @@
                                     </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>
@@ -236,7 +236,7 @@
                                     </div>
                                 </div>
                                 <div class="tab-pane" id="baz" role="tabpanel">
-                                    <div class="warp-p2">
+                                    <div class="main-data-bottom">
                                         安装增加费
                                     </div>
                                 </div>
@@ -303,7 +303,7 @@
                         </div>
                       </div>
                     </div>
-                    
+
                     <div class="form-group">
                       <label>内容</label>
                       <textarea class="form-control" id="" rows="5"></textarea>

+ 2 - 0
fuzhu.html

@@ -42,6 +42,7 @@
             <div class="container-fluid">
                 <div class="row">
                   <div class="main-side col-lg-7 p-0">
+                    <div class="main-date">
                     <table class="table table-sm table-bordered m-0">
                       <thead>
                         <tr>
@@ -96,6 +97,7 @@
                         </tr>
                       </tbody>
                     </table>
+                    </div>
                   </div>
                   <div class="main-content col-lg-5 p-0">
                     <div class="m-2">

+ 3 - 1
gongliao.html

@@ -47,7 +47,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>
@@ -116,6 +117,7 @@
                         </tr>
                       </tbody>
                     </table>
+                    </div>
                   </div>
                 </div>
             </div>

+ 3 - 0
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);
 /*全局自适应高度结束*/