bugs

web/building_saas/main/js/views/project_glj_view.js

@@ -385,10 +385,12 @@ let projectGljObject={
           me.projectGljSheet.setStyle(newSel.row, -1, style);
           let orow = oldSel.row==''||oldSel.row==-1?0:oldSel.row;
           if(me.projectGljSheetData[orow]){
-            let tstyle = gljOprObj.getSelStyle(false,{},me.projectGljSheetData[orow].bgColour);
-            me.projectGljSheet.setStyle(orow, -1, tstyle);
-            me.projectGljRowChang();
+            style = gljOprObj.getSelStyle(false,{},me.projectGljSheetData[orow].bgColour);
+          }else{
+            style.backColor = "White";
           }
+          me.projectGljSheet.setStyle(orow, -1, style);
+          me.projectGljRowChang();
         }else{
           me.projectGljSheet.repaint();
         }
@@ -596,9 +598,8 @@ let projectGljObject={
             projectGljSheetData.push(this.getSheetDataByGLJ(glj));
         }
         this.projectGljSheetData = projectGljSheetData;
-        this.projectGljSheet.setRowCount(this.projectGljSheetData.length);
         sheetCommonObj.showData(this.projectGljSheet, this.projectGljSetting,this.projectGljSheetData);
-        //this.projectGljSheet.setRowCount(this.projectGljSheetData.length);
+        this.projectGljSheet.setRowCount(this.projectGljSheetData.length);
         sel.row = oldData?_.findIndex(this.projectGljSheetData,{'id':oldData.id}):'';
         this.projectGljSheet.setSelection(sel.row==-1?0:sel.row,sel.col,sel.rowCount,sel.colCount);
     },
@@ -641,6 +642,14 @@ let projectGljObject={
             $('#adjustType').hide();
             $('#config_material').hide();
             $('#project-glj-main').show();
+            if(me.displayType == filterType.JGCL || me.displayType == filterType.SCHZ){
+              $("#projectGljResize").hide();
+              $("#projectGljBottom").hide();
+            }else{
+              $("#projectGljResize").show();
+              $("#projectGljBottom").show();
+            }
+
         }
     },
     refreshViewsData:function(){
@@ -1244,10 +1253,18 @@ function loadProjectGljSize() {
     if($('#project-glj-main').is(':visible')){
         let me = projectGljObject;
         let pojGljResizeEles = getProjectResizeEles();
-        SlideResize.loadVerticalHeight(pojGljResizeEles.eleObj.module, pojGljResizeEles.eleObj, pojGljResizeEles.limit, function () {
+        if(!$("#projectGljBottom").is(':visible')){
+          let total = $(window).height()-$('.header').height()-$('#projectGljToolsBar').height()+3;
+          $("#projectGljTop").height(total);
+          $("#project_glj_sheet").height(total);
+          me.projectGljSpread?me.projectGljSpread.refresh():'';
+        }else{
+          SlideResize.loadVerticalHeight(pojGljResizeEles.eleObj.module, pojGljResizeEles.eleObj, pojGljResizeEles.limit, function () {
             me.projectGljSpread?me.projectGljSpread.refresh():'';
             me.mixRatioSpread?me.mixRatioSpread.refresh():'';
-        });
+          });
+        }
+       
     }else if($('#material_adjust').is(':visible')){
         $('#material_adjust_sheet').height($(window).height()-$('.header').height()-$('#projectGljToolsBar').height()+3);
         if(materialAdjustObj.spread)materialAdjustObj.spread.refresh();