chenshilong 6 năm trước cách đây
mục cha
commit
370c403013

+ 4 - 4
web/building_saas/main/html/main.html

@@ -112,9 +112,9 @@
                           <li class="nav-item">
                               <a class="nav-link px-3" href="javascript:void(0)" id="stdRationTab" relaPanel="#de">定额库</a>
                           </li>
-<!--                          <li class="nav-item">
+                          <li class="nav-item">
                               <a class="nav-link px-3" href="javascript:void(0)" id="blockLibTab" relaPanel="#kmbk">块模板库</a>
-                          </li>-->
+                          </li>
                       </ul>
                   </div>
               </div>
@@ -484,12 +484,12 @@
                                           <button id="btn_block_newSubFolder" class="btn btn-warning btn-sm" type="button">新建子类</button>
                                       </div>
                                   </div>
-                                  <div class="top-content" style="background-color:#ff7e0e;overflow: hidden">
+                                  <div class="top-content" style="overflow: hidden">
                                       <div class="main-data-side-d" id="div_block_tree">
                                       </div>
                                   </div>
                                   <div class="resize" id="kmbkResize" style="background: #F1F1F1"></div>
-                                  <div class="bottom-content" style="background-color:#50df89;">
+                                  <div class="bottom-content">
                                       <div class="main-data-bottom" id="div_block_detail">
 
                                       </div>

+ 9 - 4
web/building_saas/main/js/views/block_lib.js

@@ -281,13 +281,18 @@ var blockLibObj = {
                 TREE_SHEET_HELPER._toolTipElement = null;
             };
             TREE_SHEET_HELPER.tipDivCheck();//延时检查:当tips正在show的时候,就调用了hide方法,会导致tips一直存在,所以设置一个超时处理
-        }
+        };
         return new TreeCell();
     }
 };
 
 $(document).ready(function(){
-    // if (!blockLibObj.mainSpread){
-    //     blockLibObj.buildSheet();
-    // }
+    // tab 也有click事件
+    $('#blockLibTab').on('click', function (){
+        if ($("#kmbk").is(":visible")){
+            if (!blockLibObj.mainSpread){
+                blockLibObj.buildSheet();
+            };
+        }
+    });
 });

+ 1 - 0
web/building_saas/main/js/views/project_view.js

@@ -2809,6 +2809,7 @@ function disableTools(){
     $('#stdBillsGuidanceTab').addClass('disabled');
     $('#stdBillsTab').addClass('disabled');
     $('#stdRationTab').addClass('disabled');
+    $('#blockLibTab').addClass('disabled');
     //人材机汇总,选择其他、另存使用
     $('a[data-target="#change-unitFile"]').remove();
     $('a[data-target="#unitFile-save-as"]').remove();

+ 16 - 0
web/building_saas/main/js/views/side_tools.js

@@ -67,6 +67,18 @@ slideResize(billsLibResizeEles, {min: 147, max: 680}, 'height', function() {
     billsLibObj.refreshBillsRelaSpread();
 });
 
+let blockLibResizeEles = {};
+blockLibResizeEles.id = '#kmbk';
+blockLibResizeEles.resize = $('#kmbkResize');
+blockLibResizeEles.nearElement = $('#kmbk').find('.top-content');
+blockLibResizeEles.nearSpread = $('#div_block_tree');
+blockLibResizeEles.farElement = $('#kmbk').find('.bottom-content');
+blockLibResizeEles.farSpread = $('#div_block_detail');
+blockLibResizeEles.nav = null;
+slideResize(blockLibResizeEles, {min: 147, max: 680}, 'height', function() {
+    billsGuidance.refreshWorkBook();
+});
+
 
 var sideToolsObj = {
     showSideTools: function (tabPanel, show, id) {
@@ -92,6 +104,10 @@ var sideToolsObj = {
                     loadSize(rationLibResizeEles, 'height', function(){
                     });
                 }
+                else if(id === 'blockLibTab'){//定额库
+                    loadSize(blockLibResizeEles, 'height', function(){
+                    });
+                }
                 else{//清单库
                     loadSize(billsLibResizeEles, 'height', function(){
                     });