人材机汇总左侧分类调整

web/building_saas/css/custom.css

@@ -48,15 +48,20 @@ legend.legend{
 }
 
 .filterType{
-    padding-left: .75rem;
+    padding-left: 6px;
+    padding-right: 6px;
+    width: 122px;
 }
 
+.filterType ul{
+    width: 110px;
+}
 .a_color{
     color: #007bff;
 }
 
 .filterType a{
-    padding: 8px;
+    padding: 1px;
     padding-top: 7px;
     padding-bottom: 7px;
 }

web/building_saas/glj/html/project_glj.html

@@ -13,23 +13,19 @@
 
 <div class="container-fluid">
     <div class="row">
-        <div class="gl-side col-lg-1 filterType" id='filterType'>
+        <div class="gl-side  filterType" id='filterType'>
             <ul class="nav flex-column nav-pills mt-2 mb-2">
                 <li class="nav-item"><a class="nav-link active" href="#" id="ALL">所有人材机</a></li>
-             <!--   <li class="nav-item li_sub"><a class="nav-link" href="javascript:void(0)" id="LABOUR">人工</a></li>
-                <li class="nav-item li_sub"><a class="nav-link" href="javascript:void(0)" id="GENERAL_MATERIAL">材料</a></li>
-                <li class="nav-item li_sub"><a class="nav-link" href="javascript:void(0)" id="GENERAL_MACHINE">机械</a></li>
-                <li class="nav-item li_sub"><a class="nav-link" href="javascript:void(0)" id="MAIN_MATERIAL">主材</a></li>
-                <li class="nav-item li_sub"><a class="nav-link" href="javascript:void(0)" id="EQUIPMENT">设备</a></li>-->
-                <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="FBFX">分部分项人材机</a></li>
+
+              <!--  <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="FBFX">分部分项人材机</a></li>
                 <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="TECH">措施项目人材机</a></li>
                 <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="JGCL">甲供材料</a></li>
                 <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="ZGCL">暂估材料</a></li>
                 <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="SCHZ">三材汇总</a></li>
-                <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="ZYCL">主要材料</a></li>
+                <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="ZYCL">主要材料</a></li>-->
             </ul>
         </div>
-        <div class="main-content col p-0 col-lg-11" id="project-glj-main">
+        <div class="main-content col p-0 " id="project-glj-main">
             <div class="top-content" id="projectGljTop">
                 <div class="main-data-top" style="width: 100% " id="project_glj_sheet">
                 </div>

web/building_saas/js/global.js

@@ -33,6 +33,7 @@ function autoFlashHeight(){
     $(".form-list").height($(window).height()-headerHeight);
     $('#comments').find('textarea').height($('#comments').height() - 25);
     typeof(adaptiveTzjnrWidth)== 'function' ?adaptiveTzjnrWidth():''
+    $('#project-glj-main').width($(window).width()-($('.main-nav').width()+ 2)-($('.filterType').width()+12)-5); //2、12是padding宽度，width 是不算padding宽度的
     //typeof zmhs_obj === 'object' ? zmhs_obj.loadSideResize() : '';
 };
 

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

@@ -46,9 +46,9 @@ projectGljObject={
     displayTypeMap:[
         {ID:'LABOUR',text:'人工'},
         {ID:'GENERAL_MATERIAL',text:'材料'},
-        {ID:'GENERAL_MACHINE',text:'机械'},
-        {ID:'MAIN_MATERIAL',text:'主材'},
-        {ID:'EQUIPMENT',text:'设备'}
+        {ID:'GENERAL_MACHINE',text:'机械'}
+        /*{ID:'MAIN_MATERIAL',text:'主材'},
+        {ID:'EQUIPMENT',text:'设备'}*/
     ],
     initProjectGljSpread:function () {
         if(!this.projectGljSpread){