Merge branch 'master' of http://192.168.1.41:3000/SmartCost/YangHuCost

web/building_saas/css/custom.css

@@ -48,8 +48,6 @@ legend.legend{
 }
 
 .filterType{
-    padding-left: 6px;
-    padding-right: 6px;
     width: 98px;
     float: left;
     height: 100%;
@@ -60,9 +58,7 @@ legend.legend{
 .full-h{
     height: 100%;
 }
-.filterType ul{
-    width: 86px;
-}
+
 .a_color{
     color: #007bff;
 }

web/building_saas/css/main.css

@@ -357,9 +357,19 @@ a{
         transform: translateX(10px);
     }
 }
+.gl-side.gl-side-lg{
+    width:200px;
+}
+.nav-side .nav-link{
+    padding:.5rem;
+}
+.nav-side .nav-link.active{
+    background:#ddd;
+    color:#333;
+}
 .gl-side{
     border-right:1px solid #ccc;
-    width:150px
+    width:120px
 }
 .bottom-content .tab-content .main-data-bottom{
     height: 300px;

web/building_saas/glj/html/project_glj.html

@@ -22,8 +22,8 @@
     <div class="row">
         <div class="main-content col p-0 " id="project-glj-main" style="overflow: hidden">
             <div class="top-content" id="projectGljTop" style="overflow: hidden;">
-                <div class="col-auto gl-side  filterType" id='filterType'>
-                    <ul class="nav flex-column nav-pills mt-2 mb-2">
+                <div class=" gl-side  filterType" id='filterType'>
+                    <ul class="nav flex-column nav-side mt-2 mb-2"  style="margin-top: 0px!important;">
                         <li class="nav-item"><a class="nav-link active" href="#" id="ALL">所有工料机</a></li>
 
                         <!--  <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="FBFX">分部分项人材机</a></li>

web/building_saas/main/js/views/material_calc_view.js

@@ -25,7 +25,7 @@ materialCalcObj = {
         ],
         view: {
             lockColumns: ["code","name","marketPrice",'offSiteTransportLoss','purchaseStorage'],
-            colHeaderHeight:45
+            colHeaderHeight:36
         }
     },
     freightSpread:null,
@@ -47,7 +47,7 @@ materialCalcObj = {
         ],
         view: {
             lockColumns: ["exp"],
-            colHeaderHeight:45
+            colHeaderHeight:36
         },
         getText:{
             forExp:function (item) {
@@ -68,7 +68,7 @@ materialCalcObj = {
         ],
         view: {
             lockColumns: [],
-            colHeaderHeight:45
+            colHeaderHeight:36
         }
     },
     initMaterialSpread:function () {

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

@@ -77,7 +77,7 @@ projectGljObject={
         this.projectGljSheet.bind(GC.Spread.Sheets.Events.EditStarting,this.onProjectGljEditStarting);
         this.projectGljSheet.bind(GC.Spread.Sheets.Events.CellDoubleClick, this.onProjectGljDoubleClick);
         this.projectGljSheet.name('projectGljSheet');
-        this.projectGljSheet.setRowHeight(0, 45, 1);
+        this.projectGljSheet.setRowHeight(0, 36, 1);
     },
     initMixRatio:function () {
         let me = projectGljObject;
@@ -1131,7 +1131,7 @@ projectGljObject={
     initFilterTypeList:function () {//初始化人材机汇总工料机类型过滤列表
         let htmlString = '';
         for(let t of this.displayTypeMap){
-            htmlString += '<li class="nav-item li_sub"><a class="nav-link" href="javascript:void(0)" id="'+t.ID+'">'+t.text+'</a></li>';
+            htmlString += '<li class="nav-item "><a class="nav-link pl-4" href="javascript:void(0)" id="'+t.ID+'">'+t.text+'</a></li>';
         }
         $('#ALL').after(htmlString);
     },