bug fixed

web/building_saas/main/js/main.js

@@ -3,21 +3,6 @@
  */
 
 $(function () {
-/*
-    // 读取本地存储的高度（必须放在载入spread之前）
-    let mainResizeEles = {};
-    mainResizeEles.id = '#main';
-    mainResizeEles.resize = $('#main').find('.resize');
-    mainResizeEles.nearElement = $('#main').find('.top-content');
-    mainResizeEles.nearSpread = mainResizeEles.nearElement.children(".main-data-top");
-    mainResizeEles.farElement = $('#main').find('.bottom-content');
-    mainResizeEles.farSpread = mainResizeEles.farElement.children().find(".main-data-bottom");
-    mainResizeEles.nav = mainResizeEles.farElement.children('ul.nav');
-    loadSize(mainResizeEles, 'height', function() {
-        refreshSubSpread();
-        zmhs_obj.refresh();
-    });
-*/
     loadMainSize();
     $("#header-menu").removeAttr('style');
     projectInfoObj.showProjectInfo();
@@ -222,16 +207,18 @@ function setSizeWithPercent(tag,eles,nearSize,farSize,type) {
 }
 
 function setDefaultSize(tag,eles,type) {
-    let o_nearSize = eles.nearSpread[type]();
-    let o_farSize = eles.farSpread[type]();
-    if(tag == "#main"){
-        eles.nearSpread[type](o_nearSize);  //工料机汇总和main页面处理方式不同
-        eles.farSpread[type](o_farSize);
-    }else if(tag == "#project-glj-main"){
-        o_nearSize = parseFloat(o_nearSize);
-        o_farSize = parseFloat(o_farSize);
-        eles.nearSpread[type](o_nearSize - o_farSize + 30);
-        eles.farSpread[type](o_farSize);
+    let o_nearSize = 5;
+    let o_farSize = 2;
+    if(type == 'height'){
+        let headerHeight = $(".header").height();
+        let toolsbarHeight = $(".toolsbar").height();
+        let exand = tag == "#main" ? 1:50;
+        let totalHeight = $(window).height() - headerHeight - toolsbarHeight-exand;
+        const navSize = eles.nav ? eles.nav[type]() + 4 : 0;
+        totalHeight = totalHeight - navSize;
+        let nearSize = (o_nearSize/(o_nearSize + o_farSize))* totalHeight;
+        eles.nearSpread[type](nearSize);
+        eles.farSpread[type](totalHeight - nearSize);
     }
 }
 

web/building_saas/main/js/views/tender_price_view.js

@@ -64,17 +64,19 @@ let tender_obj={
         me.tenderController.showTreeData();
 
         function createTenderNode(mainNode,parent,next) {
-            let newNode = me.tenderTree.addNode(parent, next, mainNode.data.ID);
-            newNode.data = mainNode.data;
-            newNode.source =  mainNode.source;
-            newNode.sourceType = mainNode.sourceType;
-            newNode.mainNode = mainNode;
-            if(mainNode.children.length > 0){
-                for(let c of mainNode.children){
-                    createTenderNode(c,newNode,null);
+            if(mainNode.sourceType != ModuleNames.ration_glj){//主材、设备的工料机不用显示
+                let newNode = me.tenderTree.addNode(parent, next, mainNode.data.ID);
+                newNode.data = mainNode.data;
+                newNode.source =  mainNode.source;
+                newNode.sourceType = mainNode.sourceType;
+                newNode.mainNode = mainNode;
+                if(mainNode.children.length > 0){
+                    for(let c of mainNode.children){
+                        createTenderNode(c,newNode,null);
+                    }
                 }
+                return newNode;
             }
-            return newNode;
         }
     }