Quellcode durchsuchen

定额界面 右侧 上下结构调整,只保留“定额”有下半部分;说明,计算规则,工作内容, 均取消下半部分

Chente vor 8 Jahren
Ursprung
Commit
89ceabcc83
3 geänderte Dateien mit 232 neuen und 223 gelöschten Zeilen
  1. 4 4
      css/main.css
  2. 227 217
      dinge.html
  3. 1 2
      js/global.js

+ 4 - 4
css/main.css

@@ -212,12 +212,12 @@ body {
         transform: translateX(10px);
     }
 }
-.bottom-content .tab-content {
-    height: 350px;
-    overflow: auto;
+.bottom-content {
+    height: 370px;
+    overflow: hidden;
 }
 .bottom-content .tab-content .main-data-bottom{
-    height: 350px;
+    height: 340px;
     overflow: auto;
 }
 .form-signin {

+ 227 - 217
dinge.html

@@ -50,232 +50,242 @@
                     </div>
                   </div>
                   <div class="main-content col-lg-9 p-0">
-                        <div class="top-content">
-                          <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>
-                              <li class="nav-item">
-                                  <a class="nav-link" data-toggle="tab" href="#tsm" role="tab">说明</a>
-                              </li>
-                              <li class="nav-item">
-                                  <a class="nav-link" data-toggle="tab" href="#tjs" role="tab">计算规则</a>
-                              </li>
-                              <li class="nav-item">
-                                  <a class="nav-link" data-toggle="tab" href="#tgz" role="tab">工作内容</a>
-                              </li>
-                          </ul>
-                          <!-- Tab panes -->
-                          <div class="tab-content">
-                              <div class="tab-pane active" id="tde" role="tabpanel">
-                                  <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>
-                                          <tr>
-                                            <td>1</td><td>AA0001</td><td>人工挖土方</td><td>100m3</td><td>840.84</td><td>人工挖土方</td><td>1</td>
-                                          </tr>
-                                          <tr>
-                                            <td>2</td><td></td><td></td><td></td><td></td><td></td><td></td>
-                                          </tr>
-                                          <tr>
-                                            <td>3</td><td></td><td></td><td></td><td></td><td></td><td></td>
-                                          </tr>
-                                          <tr>
-                                            <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="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 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="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 m-2">
-                                      <h5>计算规则</h5>
-                                      <p>土壤、岩石体积,均按挖掘前的天然密度体积以立方米计算。.....</p>
-                                    </div>
-                                  </div>
-                              </div>
-                              <div class="tab-pane" id="tgz" role="tabpanel">
-                                <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">
+                    <!-- 右标签 -->
+                    <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>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="tab" href="#tsm" role="tab">说明</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="tab" href="#tjs" role="tab">计算规则</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" data-toggle="tab" href="#tgz" role="tab">工作内容</a>
+                        </li>
+                    </ul>
+                    <!-- 右内容 -->
+                    <div class="tab-content">
+                        <!--定额-->
+                        <div class="tab-pane active" id="tde" role="tabpanel">
+                            <!--定额top-->
+                            <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>
                                     <tr>
-                                      <td>1.挖土、修理边底。2.挖淤泥、流沙、修理边底。</td>
+                                      <td>1</td><td>AA0001</td><td>人工挖土方</td><td>100m3</td><td>840.84</td><td>人工挖土方</td><td>1</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>
-                                        <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>
-                              </div>
-                          </div>
-                        </div>
-                        <div class="bottom-content">
-                            <ul class="nav nav-tabs" role="tablist">
-                                <li class="nav-item">
-                                    <a class="nav-link" data-toggle="tab" href="#bglj" role="tab">工料机</a>
-                                </li>
-                                <li class="nav-item">
-                                    <a class="nav-link" data-toggle="tab" href="#bfzd" role="tab">辅助定额调整</a>
-                                </li>
-                                <li class="nav-item">
-                                    <a class="nav-link active" data-toggle="tab" href="#bfzt" role="tab">附注条件调整</a>
-                                </li>
-                                <li class="nav-item">
-                                    <a class="nav-link" data-toggle="tab" href="#baz" role="tab">安装增加费</a>
-                                </li>
-                            </ul>
-                            <!-- Tab panes -->
-                            <div class="tab-content">
-                                <div class="tab-pane" id="bglj" role="tabpanel">
-                                    <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>
-                                            <tr>
-                                              <td>1</td><td>00010201</td><td>土石方综合工日</td><td>工日</td><td>22.00</td><td>38.220</td>
-                                              <td>人工</td>
-                                            </tr>
-                                            <tr>
-                                              <td>2</td><td></td><td></td><td></td><td></td><td></td><td></td>
-                                            </tr>
-                                            <tr>
-                                              <td>3</td><td></td><td></td><td></td><td></td><td></td><td></td>
-                                            </tr>
-                                            <tr>
-                                              <td>4</td><td></td><td></td><td></td><td></td><td></td><td></td>
-                                            </tr>
-                                          </tbody>
-                                        </table>
+                                    <tr>
+                                      <td>2</td><td></td><td></td><td></td><td></td><td></td><td></td>
+                                    </tr>
+                                    <tr>
+                                      <td>3</td><td></td><td></td><td></td><td></td><td></td><td></td>
+                                    </tr>
+                                    <tr>
+                                      <td>4</td><td></td><td></td><td></td><td></td><td></td><td></td>
+                                    </tr>
+                                  </tbody>
+                                </table>
+                            </div>
+                            <!--定额bottom-->
+                            <div class="bottom-content">
+                              <!-- 标签 -->
+                                <ul class="nav nav-tabs" role="tablist">
+                                    <li class="nav-item">
+                                        <a class="nav-link" data-toggle="tab" href="#bglj" role="tab">工料机</a>
+                                    </li>
+                                    <li class="nav-item">
+                                        <a class="nav-link" data-toggle="tab" href="#bfzd" role="tab">辅助定额调整</a>
+                                    </li>
+                                    <li class="nav-item">
+                                        <a class="nav-link active" data-toggle="tab" href="#bfzt" role="tab">附注条件调整</a>
+                                    </li>
+                                    <li class="nav-item">
+                                        <a class="nav-link" data-toggle="tab" href="#baz" role="tab">安装增加费</a>
+                                    </li>
+                                </ul>
+                                <!-- 内容 -->
+                                <div class="tab-content">
+                                    <!--工料机-->
+                                    <div class="tab-pane" id="bglj" role="tabpanel">
+                                        <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>
+                                                <tr>
+                                                  <td>1</td><td>00010201</td><td>土石方综合工日</td><td>工日</td><td>22.00</td><td>38.220</td>
+                                                  <td>人工</td>
+                                                </tr>
+                                                <tr>
+                                                  <td>2</td><td></td><td></td><td></td><td></td><td></td><td></td>
+                                                </tr>
+                                                <tr>
+                                                  <td>3</td><td></td><td></td><td></td><td></td><td></td><td></td>
+                                                </tr>
+                                                <tr>
+                                                  <td>4</td><td></td><td></td><td></td><td></td><td></td><td></td>
+                                                </tr>
+                                              </tbody>
+                                            </table>
+                                        </div>
                                     </div>
-                                </div>
-                                <div class="tab-pane" id="bfzd" role="tabpanel">
-                                    <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>
-                                            <tr>
-                                              <td>1</td><td>运距m</td><td>0</td><td></td><td>AA0012</td><td>运距m</td>
-                                              <td>20</td><td>20</td><td>0</td><td>四舍五入</td>
-                                            </tr>
-                                            <tr>
-                                              <td>2</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>
-                                            </tr>
-                                            <tr>
-                                              <td>3</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>
-                                            </tr>
-                                            <tr>
-                                              <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 class="tab-pane" id="bfzd" role="tabpanel">
+                                        <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>
+                                                <tr>
+                                                  <td>1</td><td>运距m</td><td>0</td><td></td><td>AA0012</td><td>运距m</td>
+                                                  <td>20</td><td>20</td><td>0</td><td>四舍五入</td>
+                                                </tr>
+                                                <tr>
+                                                  <td>2</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>
+                                                </tr>
+                                                <tr>
+                                                  <td>3</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>
+                                                </tr>
+                                                <tr>
+                                                  <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>
-                                <div class="tab-pane active" id="bfzt" role="tabpanel">
-                                    <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><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>2</td><td></td><td></td><td></td><td></td><td></td>
-                                            </tr>
-                                            <tr>
-                                              <td>3</td><td></td><td></td><td></td><td></td><td></td>
-                                            </tr>
-                                            <tr>
-                                              <td>4</td><td></td><td></td><td></td><td></td><td></td>
-                                            </tr>
-                                          </tbody>
-                                        </table>
+                                    <!--附注条件调整-->
+                                    <div class="tab-pane active" id="bfzt" role="tabpanel">
+                                        <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><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>2</td><td></td><td></td><td></td><td></td><td></td>
+                                                </tr>
+                                                <tr>
+                                                  <td>3</td><td></td><td></td><td></td><td></td><td></td>
+                                                </tr>
+                                                <tr>
+                                                  <td>4</td><td></td><td></td><td></td><td></td><td></td>
+                                                </tr>
+                                              </tbody>
+                                            </table>
+                                        </div>
                                     </div>
-                                </div>
-                                <div class="tab-pane" id="baz" role="tabpanel">
-                                    <div class="main-data-bottom">
-                                        安装增加费
+                                    <!--安装增加费-->
+                                    <div class="tab-pane" id="baz" role="tabpanel">
+                                        <div class="main-data-bottom">
+                                            安装增加费
+                                        </div>
                                     </div>
                                 </div>
                             </div>
                         </div>
+                        <!--说明-->
+                        <div class="tab-pane" id="tsm" role="tabpanel">
+                            <div class="main-data">
+                              <div class="m-2"><a href="javacript:void(0);" data-toggle="modal" data-target="#editTsm" title="编辑">编辑说明</a></div>
+                              <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="main-data">
+                              <div class="m-2"><a href="javacript:void(0);" data-toggle="modal" data-target="#editTjs" title="编辑">编辑计算规则</a></div>
+                              <div class="main-content m-2">
+                                <h5>计算规则</h5>
+                                <p>土壤、岩石体积,均按挖掘前的天然密度体积以立方米计算。.....</p>
+                              </div>
+                            </div>
+                        </div>
+                        <!--工作内容-->
+                        <div class="tab-pane" id="tgz" role="tabpanel">
+                          <div class="main-data">
+                            <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>
+                                  <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>
+                        </div>
+                    </div>
                   </div>
                 </div>
             </div>

+ 1 - 2
js/global.js

@@ -5,12 +5,11 @@ function autoFlashHeight(){
     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);
     $(".fluid-content").height($(window).height()-headerHeight-1);
     $(".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-top").height($(window).height()-headerHeight-toolsBar-bottomContentHeight-2);
     $(".main-data").height($(window).height()-headerHeight);
 };
 $(window).resize(autoFlashHeight);