chenshilong 6 éve
szülő
commit
439cd6bca2

+ 9 - 19
web/building_saas/main/html/main.html

@@ -514,8 +514,7 @@
                                       </div>
                                   </div>
                                   <div class="top-content" style="overflow: hidden">
-                                      <div class="main-data-side-d" id="stdRationChapter">
-                                  </div>
+                                      <div class="main-data-side-d" id="stdRationChapter"></div>
                                   </div>
                                   <div class="resize" id="deResize" style="background: #F1F1F1"></div>
                                   <div class="bottom-content">
@@ -523,8 +522,8 @@
                                   </div>
                               </div>
                               <!--块模板库-->
-                              <div class="tab-pane" id="kmbk" role="tabpanel">
-                                  <div class="sidebar-tools-bar container-fluid tools-bar-height-z">
+                              <div class="tab-pane" id="kmbk">
+                                  <div class="tools-bar-height-d container-fluid">
                                       <div class="p-1 row">
                                           <select class="form-control form-control-sm col-6" id="exampleSelect1">
                                               <option>我的模板库</option>
@@ -569,22 +568,13 @@
                                           </div>
                                       </div>
                                   </div>
-                                  <div class="main-data-side-m">
-                                          <div id="div_block_tree" style="height:400px;"></div>
-                                  </div>
-                                  <div class="resize" id="kmbkResize" style="background: #F1F1F1"></div>
-                                  <div class="sidebar-middle container-fluid" id="div_block_bill" style="height:90px;">
-<!--                                      <table class="table table-sm table-bordered">
-                                          <tr><th>项目编码</th><th>项目名称</th><th>单位</th><th>综合单价</th><th>项目特征</th></tr>
-                                          <tr><td>010202002</td><td>咬合灌注桩</td><td>m2</td><td>18732.38</td><td></td></tr>
-                                      </table>-->
+                                  <div class="top-content" style="overflow: hidden">
+                                      <div class="main-data-side-d" id="div_block_tree"></div>
                                   </div>
-                                  <div class="sidebar-bottom container-fluid" id="div_block_ration" style="height:200px;">
-<!--                                      <table class="table table-sm table-bordered">
-                                          <tr><th>编码</th><th>名称</th><th>单位</th><th>含量</th><th>取费专业</th><th>综合单价</th><th>子目换算状态</th></tr>
-                                          <tr><td>AA0043</td><td>人工沟槽 软</td><td>1000</td><td>0.01</td><td>人工土石</td><td></td><td></td></tr>
-                                          <tr><td>AA0046</td><td>人工沟槽 硬</td><td>1000</td><td>0.21</td><td>人工土石</td><td></td><td></td></tr>
-                                      </table>-->
+                                  <div class="resize" id="kmbkResize" style="background-color:#dfdcdc;"></div>
+                                  <div class="bottom-content" style="background-color:#ff7e0e">
+                                      <div id="div_block_bill" style="height:90px"></div>
+                                      <div id="div_block_ration" style="height:100%"></div>
                                   </div>
                               </div>
                           </div>

+ 2 - 0
web/building_saas/main/js/views/block_lib.js

@@ -127,10 +127,12 @@ var blockLibObj = {
         me.billSpread = sheetCommonObj.buildSheet($('#div_block_bill')[0], me.billSetting, 1);
         me.billSheet = me.billSpread.getSheet(0);
         sheetCommonObj.spreadDefaultStyle(me.billSpread);
+        me.billSheet.setColumnWidth(0, 20, GC.Spread.Sheets.SheetArea.rowHeader);
 
         me.rationSpread = sheetCommonObj.buildSheet($('#div_block_ration')[0], me.rationSetting, 1);
         me.rationSheet = me.rationSpread.getSheet(0);
         sheetCommonObj.spreadDefaultStyle(me.rationSpread);
+        me.rationSheet.setColumnWidth(0, 20, GC.Spread.Sheets.SheetArea.rowHeader);
 
         $.bootstrapLoading.end();
     },