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

web/building_saas/css/main.css

@@ -79,6 +79,10 @@ font-size: .875rem;
   background:#fff;
   box-shadow:#333 1px 1px 5px
 }
+.login-img-cr{
+  right:0;
+  font-size:9px;
+}
 .ver-panel {
   width:100%;
   top:10%;

web/over_write/js/neimeng_2019.js

@@ -18,7 +18,7 @@ function overwriteRationCalcBases (){
         return calcTools.rationBaseFee(node, baseMachineTypes, priceTypes.ptMarketPrice, isTender);
     };
     rationCalcBases['施工机械人工费'] = function (node, isTender) {
-        return calcTools.rationBaseFee(node, [gljType.MACHINE_LABOUR], priceTypes.ptDiffPrice, isTender);
+        return calcTools.machineDetailFee(node, node.data.gljList, [], gljType.MACHINE_LABOUR, isTender);
     };
     rationCalcBases['设备购置费'] = function (node, isTender) {
         return calcTools.rationBaseFee(node, [gljType.EQUIPMENT], priceTypes.ptMarketPrice, isTender);
@@ -53,6 +53,7 @@ function overwriteRationCalcBases (){
         {type: 'marketLabour', name: '人工费'},
         {type: 'marketMaterial', name: '材料费'},
         {type: 'marketMachine', name: '施工机械使用费'},
+        {type: 'marketMachineLabour', name: '施工机械人工费'},
         {type: 'marketEquipment', name: '设备购置费'},
         {type: 'marketDirect', name: '直接费'},