Merge branch '1.0.0_online' of http://smartcost.f3322.net:3000/SmartCost/ConstructionCost into 1.0.0_online

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,7 +13,7 @@
 
 <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>
@@ -29,7 +29,7 @@
                 <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

@@ -32,7 +32,8 @@ function autoFlashHeight(){
     $(".form-view").height($(window).height()-headerHeight-ftoolsbarHeight);
     $(".form-list").height($(window).height()-headerHeight);
     $('#comments').find('textarea').height($('#comments').height() - 25);
-    typeof(adaptiveTzjnrWidth)== 'function' ?adaptiveTzjnrWidth():''
+    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/over_write/js/gansu_2013.js

@@ -27,4 +27,37 @@ if(typeof region !== 'undefined') {
         '白银',
     ];
     console.log(region);
-}
+}
+
+(function overwriteFeeTypes() {
+    if (typeof cpFeeTypes == 'undefined') return;
+    cpFeeTypes = [
+        {type: 'labour', name: '人工费'},
+        {type: 'marketMaterial', name: '市场价材料费'},
+        {type: 'marketMachine', name: '市场价机械费'},
+        {type: 'mainMaterial', name: '主材费'},
+        {type: 'equipment', name: '设备费'},
+        {type: 'manage', name: '管理费'},
+        {type: 'profit', name: '利润'},
+        {type: 'risk', name: '风险费'},
+        {type: 'labourDiff', name: '人工价差'},
+        {type: 'secondMaterialAdjust', name: '二类材料调整'},
+        {type: 'machineDiff', name: '机械调整及价差'},
+        {type: 'safeMeasures', name: '安全文明施工费'},
+        {type: 'environment', name: '环境保护费'},
+        {type: 'civilization', name: '文明施工费'},
+        {type: 'safe', name: '安全施工费'},
+        {type: 'tempFacility', name: '临时设施费'},
+        {type: 'otherTotalMeasures', name: '其他总价措施费'},
+        {type: 'night', name: '夜间施工增加费'},
+        {type: 'secondHandling', name: '二次搬运费'},
+        {type: 'protect', name: '已完工程及设备保护费'},
+        {type: 'winter', name: '冬雨季施工增加费'},
+        {type: 'retest', name: '工程定位复测费'},
+        {type: 'factor', name: '施工因素增加费'},
+        {type: 'specialArea', name: '特殊地区施工增加费'},
+        {type: 'force', name: '规费'},
+        {type: 'tax', name: '税金'},
+        {type: 'common', name: '工程造价'}
+    ];
+})();

web/over_write/js/neimenggu_2017.js

@@ -0,0 +1,31 @@
+'use strict';
+
+// CSL, 2019-01-18
+
+(function overwriteFeeTypes() {
+    if (typeof cpFeeTypes == 'undefined') return;
+    cpFeeTypes = [
+        {type: 'marketLabour', name: '市场价人工费'},
+        {type: 'marketMaterial', name: '市场价材料费'},
+        {type: 'marketMachine', name: '市场价机械费'},
+        {type: 'equipment', name: '设备费'},
+        {type: 'mainMaterial', name: '主材费'},
+        {type: 'manage', name: '管理费'},
+        {type: 'profit', name: '利润'},
+        {type: 'risk', name: '风险费'},
+        {type: 'safeMeasures', name: '安全文明施工费'},
+        {type: 'safeAndEnvironment', name: '安全文明施工与环境保护费'},
+        {type: 'tempFacility', name: '临时设施费'},
+        {type: 'rain', name: '雨季施工增加费'},
+        {type: 'protect', name: '已完工程及设备保护费'},
+        {type: 'retest', name: '工程定位复测费'},
+        {type: 'secondHandling', name: '二次搬运费'},
+        {type: 'specialArea', name: '特殊地区施工增加费'},
+        {type: 'night', name: '夜间施工增加费'},
+        {type: 'basement', name: '白天在地下室施工增加费'},
+        {type: 'winter', name: '冬季施工增加费'},
+        {type: 'force', name: '规费'},
+        {type: 'tax', name: '税金'},
+        {type: 'common', name: '工程造价'}
+    ];
+})();