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

config/gulpConfig.js

@@ -3,7 +3,7 @@
  */
 
 module.exports = {
-    version:'1.0.1',
+    version:'1.0.2',
     common_jspaths:[
         'lib/jquery/jquery-3.2.1.min.js',
         'lib/jquery-ui/jquery-ui.min.js',

modules/glj/facade/glj_facade.js

@@ -9,7 +9,8 @@ module.exports={ //先导出后require可以解决循环引用问题
     updateMaterialCalc:updateMaterialCalc,
     updateMaterialCalcTasks:updateMaterialCalcTasks,
     updateUserFreight:updateUserFreight,
-    getUserFreights:getUserFreights
+    getUserFreights:getUserFreights,
+    insertElectrovalence:insertElectrovalence
 };
 
 const mongoose = require('mongoose');
@@ -24,7 +25,7 @@ let original_calc_model = mongoose.model('original_calc');
 let freight_calc_model = mongoose.model('freight_calc');
 let unit_price_model = mongoose.model('unit_price');
 let user_freights_model = mongoose.model('user_freights');
-
+let std_glj_lib_model = mongoose.model('std_glj_lib_map');
 
 let ration_glj = require('../../ration_glj/facade/ration_glj_facade');
 const uuidV1 = require('uuid/v1');
@@ -57,6 +58,8 @@ async function changeUnitFile(projectData,unitFile,type,userID) {
             insertData.user_id = userID;
             delete insertData._id;
             delete insertData.ID;
+            currentUnitPriceId = changeUnitPriceId; //从其它建设项目复制时，这个ID要变成被选中的来源的单价文件ID
+
         }
         // 获取即将更改的单价文件信息
         let targetUnitPriceFile = type === 0 ? await unitPriceFileModel.findDataByCondition({id: changeUnitPriceId}) :
@@ -159,7 +162,7 @@ async function handleVvTaxForChang(unitFileID,newVvTaxFileID) {//切换车船税
 async function addMixRatioForNew(projectID,unitFileId,engineerID,ext){
 /*    1050001机械工	工日	机上人工/ 3003001	重油	kg	普通材料/ 3003002 汽油	93号	kg	普通材料
     3003003	柴油	0号，-10号，-20号	kg	普通材料/  3003004	丙烷	kg	普通材料/ 3005001	煤	t	普通材料
-    3005002	电	kw·h	普通材料/  3005004	水	m3	普通材料/ 3005005	液化天然气	m3	普通材料
+    3005002	电	kW·h	普通材料/  3005004	水	m3	普通材料/ 3005005	液化天然气	m3	普通材料
      02JXF	折旧费	元	机械组成物/ 03WHF	检修费	元	机械组成物/    04ACFZF	维护费	元	机械组成物
   05QT	安拆辅助费	元	机械组成物/ 80CCS	车船税	元	机械组成物*/
     let mixCodes = ['1051001','3003001','3003002','3003003','3003004','3005001','3005002','3005004','3005005','02JXF','03WHF','04ACFZF','05QT','80CCS'];
@@ -208,6 +211,25 @@ async function getUserFreights(req) {
     return await user_freights_model.find({"userID":req.session.sessionUser.id,"compilationID": req.session.sessionCompilation._id}).lean();
 }
 
+//插入综合电价中的属性
+async function insertElectrovalence(data,compilationID) {
+    let result = {};
+    let projectGljModel = new GLJListModel();
+    let lib = await std_glj_lib_model.findOne({compilationId:compilationID}).lean();
+    let stdGLJs = await std_glj_lib_gljList_model.find({'repositoryId':lib.ID,'code':data.code}).lean();
+    for(let std of stdGLJs){
+        let sIndex = projectGljModel.getIndex(std,['code','specs','unit','gljType']);//机械台班下拉列表名字里kw和数据库里名字kw大小写不一致，忽略名字做对应
+        if(sIndex == projectGljModel.getIndex(data,['code','specs','unit','type'])){
+            let tem = {projectID:data.projectID};
+            ration_glj.setPropertyFromStd(tem,std);
+            result.projetcGLJData =  await projectGljModel.addList(ration_glj.getGLJSearchInfo(tem));
+        }
+    }
+
+    return result;
+}
+
+
 async function updateMaterialCalcTasks(data) {
     let freightTasks = [];
     let priceTasks = [];

modules/glj/models/glj_list_model.js

@@ -362,7 +362,7 @@ class GLJListModel extends BaseModel {
                     }
                 }
             }
-            projectGljData.subList=CompositionGLJ;
+            projectGljData._doc.subList=CompositionGLJ;
             // 新增单价文件
             let [unitPriceInsertData, isAdd] = await unitPriceModel.addUnitPrice(data, unitPriceFileId);
 

web/building_saas/css/custom.css

@@ -400,3 +400,11 @@ input.text-right{
 .border-radius {
     border-radius: .2rem !important;
 }
+.pm-i {
+    width: 18px;
+}
+.calcbase-btn {
+    width: 24px;
+    padding-left: 0;
+    padding-right: 0;
+}

web/building_saas/css/main.css

@@ -6,89 +6,89 @@ body {
     font-family: "Helvetica Neue","Hiragino Sans GB",stheiti,"Microsoft Yahei","微软雅黑",tahoma,sans-serif
 }
 a{
-  outline: none
+    outline: none
 }
 .dropdown-menu {
     font-size: 0.9rem
 }
 .btn.disabled, .btn:disabled {
-  color:#999
+    color:#999
 }
 .btn-link:focus, .btn-link:hover{
-  text-decoration: none
+    text-decoration: none
 }
 .dropdown-menu {
-  padding:.2rem 0;
+    padding:.2rem 0;
 }
 .dropdown-item:focus, .dropdown-item:hover{
-  background-color: #f7f7f9
+    background-color: #f7f7f9
 }
 .text-indent {
-  text-indent:26px;
+    text-indent:26px;
 }
 .modal-header{
-  background:#f2f2f2;
-  border-bottom:1px solid #ccc;
-  padding:.8rem 1rem;
+    background:#f2f2f2;
+    border-bottom:1px solid #ccc;
+    padding:.8rem 1rem;
 }
 .modal-title{
-  font-size:1rem;
+    font-size:1rem;
 }
 .modal-footer{
-  padding:.8rem 1rem;
+    padding:.8rem 1rem;
 }
-.form-check .form-check-label,.form-radio .form-check-label{
-  cursor: pointer;
+.form-check .form-check-label,.form-radio .form-radio-label{
+    cursor: pointer
 }
 .custom-file-sm,.custom-file-sm .custom-file-label{
-  height: calc(1.5em + .5rem + 2px);
-  padding-top: .25rem;
-  padding-bottom: .25rem;
-  padding-left: .5rem;
+    height: calc(1.5em + .5rem + 2px);
+    padding-top: .25rem;
+    padding-bottom: .25rem;
+    padding-left: .5rem;
 }
 .custom-file-sm .custom-file-label:after{
-  height: calc(1.4em + .5rem + 2px);
-padding-top: .25rem;
-padding-bottom: .25rem;
-font-size: .875rem;
+    height: calc(1.4em + .5rem + 2px);
+    padding-top: .25rem;
+    padding-bottom: .25rem;
+    font-size: .875rem;
 }
 .custom-file-sm input{
-  height: calc(1.5em + .5rem + 2px);
-font-size: .875rem;
+    height: calc(1.5em + .5rem + 2px);
+    font-size: .875rem;
 }
 /*自定义css*/
 .login-body,.login-html{
-  height:100%;
+    height:100%;
 }
 .login-bg{
-  width: 100%;
-  height: 100%;
-  background: #f2f6f5 url("login-bg.jpg") bottom center no-repeat;
-  background-size: 100% auto;
-  display: inline-block;
-  position: absolute;
+    width: 100%;
+    height: 100%;
+    background: #f2f6f5 url("login-bg.jpg") bottom center no-repeat;
+    background-size: 100% auto;
+    display: inline-block;
+    position: absolute;
 }
 .login-panel {
-  width: 500px;
-  margin: 0 auto;
-  position: absolute;
-  left: 0;
-  right: 0;
-  top: 20%;
-  padding:30px;
-  background:#fff;
-  box-shadow:#333 1px 1px 5px
+    width: 500px;
+    margin: 0 auto;
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: 20%;
+    padding:30px;
+    background:#fff;
+    box-shadow:#333 1px 1px 5px
 }
 .login-img-cr{
-  right:0;
-  font-size:9px;
+    right:0;
+    font-size:9px;
 }
 .ver-panel {
-  width:100%;
-  top:10%;
+    width:100%;
+    top:10%;
 }
 .header {
-  border-bottom: 1px solid #ccc
+    border-bottom: 1px solid #ccc
 }
 .header .header-logo {
     background: #ff6501;
@@ -100,26 +100,26 @@ font-size: .875rem;
     padding-left:50px;
 }
 .header-logo div.v-title{
-  font-size:11px;
-  color:#aeaeae;
-  line-height: 12px;
-  margin-top:3px;
+    font-size:11px;
+    color:#aeaeae;
+    line-height: 12px;
+    margin-top:3px;
 }
 .header-logo div.p-title{
-  font-size:16px;
-  color:#ff6501;
+    font-size:16px;
+    color:#ff6501;
 }
 .header-logo div.b-title{
-  font-size:24px;
-  color:#ff6501;
+    font-size:24px;
+    color:#ff6501;
 }
 .top-msg{
-  position: fixed;
-  top:10px;
-  width:900px;
-  z-index: 9999;
-  left:50%;
-  margin-left:-450px;
+    position: fixed;
+    top:10px;
+    width:900px;
+    z-index: 9999;
+    left:50%;
+    margin-left:-450px;
 }
 .main {
     position: relative;
@@ -151,55 +151,55 @@ font-size: .875rem;
     color: #333
 }
 .main-nav .nav-tabs{
-  border-bottom: none
+    border-bottom: none
 }
 .poj-manage .col-auto{
-  background:#f7f7f9
+    background:#f7f7f9
 }
 .poj-cate {
-  width:58px;
-  margin-right:-1px;
-  margin-top:2px;
+    width:58px;
+    margin-right:-1px;
+    margin-top:2px;
 }
 .poj-cate .nav-pills .nav-link{
-  border-radius: 0;
-  font-size: 24px;
-  color: #007bff
+    border-radius: 0;
+    font-size: 24px;
+    color: #007bff
 }
 .poj-cate .nav-item{
-  position: relative;
+    position: relative;
 }
 .poj-cate .nav-pills .badge{
-  position: absolute;
-  right:5px;
-  top:5px;
+    position: absolute;
+    right:5px;
+    top:5px;
 }
 .poj-cate .nav-pills .nav-link:hover{
-  color:#0056b3
+    color:#0056b3
 }
 .poj-cate .nav-pills .nav-link.active, .nav-pills .show > .nav-link{
-  background-color: #6c757d;
-  color:#fff
+    background-color: #6c757d;
+    color:#fff
 }
 .gl-side.gl-side-lg{
-  width:200px;
+    width:200px;
 }
 .nav-side .nav-link{
-  padding:.5rem;
+    padding:.5rem;
 }
 .nav-side .nav-link.active{
-  background:#ddd;
-  color:#333;
+    background:#ddd;
+    color:#333;
 }
 .pm-side{
-  position: fixed;
-  left:0;
-  height:100%;
-  border-right:1px solid #ccc;
-  background: #f7f7f9
+    position: fixed;
+    left:0;
+    height:100%;
+    border-right:1px solid #ccc;
+    background: #f7f7f9
 }
 .pm-content{
-  padding-left:58px
+    padding-left:58px
 }
 .content {
     border-left: 1px solid #ccc;
@@ -207,8 +207,8 @@ font-size: .875rem;
     background: #fff
 }
 .toolsbar,.toolsbar-f {
-  background: #f7f7f9;
-  border-bottom: 1px solid #ccc
+    background: #f7f7f9;
+    border-bottom: 1px solid #ccc
 }
 .tools-btn {
     height: 30px;
@@ -218,40 +218,40 @@ font-size: .875rem;
     background: #f7f7f9;
 }
 .toolsbar .btn-light {
-  color:#007bff;
-  min-width: 34px;
+    color:#007bff;
+    min-width: 34px;
 }
 .toolsbar .btn-light.disabled {
-  color:#999;
+    color:#999;
 }
 .main-side {
     border-left: 1px solid #ccc;
     overflow-y: hidden;
 }
 .main-data-top,.main-data-full{
-  overflow: hidden;
-  width:100%
+    overflow: hidden;
+    width:100%
 }
 .main-data-top-side{
-  overflow: hidden
+    overflow: hidden
 }
 .main-content.col-lg-8{
-  width:66.666667%
+    width:66.666667%
 }
 .main-content.col-lg-12{
-  width:100%
+    width:100%
 }
 .main-side.col-lg-4{
-  width: 33.333333%;
+    width: 33.333333%;
 }
 .main-side.col-lg-0{
-  width:0%;
+    width:0%;
 }
 .sidebar-middle{
-  height:80px;
+    height:80px;
 }
 .sidebar-bottom,.sidebar-bottom .col-lg-6,.sidebar-bottom .col-lg-12 {
-  height:300px
+    height:300px
 }
 .top-content, .fluid-content {
     overflow: auto;
@@ -275,7 +275,7 @@ font-size: .875rem;
     z-index: 999
 }
 .side-tabs .nav-tabs .nav-item {
-  z-index: 999
+    z-index: 999
 }
 .side-tabs .nav-tabs {
     border-bottom: none;
@@ -351,11 +351,11 @@ font-size: .875rem;
     }
 }
 .has-danger {
-    -webkit-animation: shake 1s .2s ease both;
-    -moz-animation: shake 1s .2s ease both;
-    animation: shake 1s .2s ease both;
+    -webkit-animation: shake_a 1s .2s ease both;
+    -moz-animation: shake_a 1s .2s ease both;
+    animation: shake_a 1s .2s ease both;
 }
-@-webkit-keyframes shake {
+@-webkit-keyframes shake_a {
     0%, 100% {
         -webkit-transform: translateX(0);
     }
@@ -366,7 +366,7 @@ font-size: .875rem;
         -webkit-transform: translateX(10px);
     }
 }
-@-moz-keyframes shake {
+@-moz-keyframes shake_a {
     0%, 100% {
         -moz-transform: translateX(0);
     }
@@ -377,7 +377,7 @@ font-size: .875rem;
         -moz-transform: translateX(10px);
     }
 }
-@keyframes shake {
+@keyframes shake_a {
     0%, 100% {
         transform: translateX(0);
     }
@@ -389,8 +389,8 @@ font-size: .875rem;
     }
 }
 .gl-side{
-  border-right:1px solid #ccc;
-  width:120px
+    border-right:1px solid #ccc;
+    width:120px
 }
 .bottom-content .tab-content .main-data-bottom{
     height: 300px;
@@ -404,141 +404,141 @@ font-size: .875rem;
     overflow: hidden;
 }
 .tn-nav,.rn-nav{
-  width:30px;
-  height: 100%;
-  border-left:1px solid #dee2e6 ;
+    width:30px;
+    height: 100%;
+    border-left:1px solid #dee2e6 ;
 }
 .tn-nav,.cn-nav{
-  border-right:1px solid #dee2e6 ;
-  border-left:none;
+    border-right:1px solid #dee2e6 ;
+    border-left:none;
 }
 .tn-nav > span{
-  width:20px;
+    width:20px;
 }
 .tn-nav:hover{
-  background:#f7f7f9;
-  cursor: pointer;
+    background:#f7f7f9;
+    cursor: pointer;
 }
 .rn-nav {
-  background: #f7f7f9
+    background: #f7f7f9
 }
 .rn-nav .nav{
-  padding: 0
+    padding: 0
 }
 .rn-nav .nav-tabs {
-  border:none;
-  margin-top:2px;
+    border:none;
+    margin-top:2px;
 }
 .rn-nav .nav-tabs .nav-link{
-  padding:0.4em 0.4em;
-  line-height: 16px
+    padding:0.4em 0.4em;
+    line-height: 16px
 }
 .rn-nav .nav-tabs .nav-link.active {
-  border:none;
-  background-color: #fff;
-  border-left:1px solid #fff;
-  margin-left:-1px;
-  border-top:1px solid #ccc;
-  border-right:1px solid #ccc;
-  border-bottom:1px solid #ccc;
+    border:none;
+    background-color: #fff;
+    border-left:1px solid #fff;
+    margin-left:-1px;
+    border-top:1px solid #ccc;
+    border-right:1px solid #ccc;
+    border-bottom:1px solid #ccc;
 }
 .cn-nav .nav-tabs .nav-link.active {
-  border:none;
-  background-color: #fff;
-  border-right:1px solid #fff;
-  margin-right:-1px;
-  border-top:1px solid #ccc;
-  border-left:1px solid #ccc;
-  border-bottom:1px solid #ccc;
+    border:none;
+    background-color: #fff;
+    border-right:1px solid #fff;
+    margin-right:-1px;
+    border-top:1px solid #ccc;
+    border-left:1px solid #ccc;
+    border-bottom:1px solid #ccc;
 }
 .rn-nav .nav-tabs .nav-link span{
-  display:none;
+    display:none;
 }
 .rn-nav .nav-tabs .nav-link.active span{
-  display: inline-block;
+    display: inline-block;
 }
 .poj-list, .side-content ,.form-view{
     overflow: auto;
 }
 .print-toolsbar{
-  padding:5px
+    padding:5px
 }
 .print-toolsbar .panel {
-  display:inline-block;
-  vertical-align:top
+    display:inline-block;
+    vertical-align:top
 }
 .print-toolsbar .panel .panel-foot{
-  text-align: center;
-  font-size: 12px;
-  padding-bottom:3px;
-  background:#F2F2F2
+    text-align: center;
+    font-size: 12px;
+    padding-bottom:3px;
+    background:#F2F2F2
 }
 .print-list {
-  border-right:1px solid #ccc
+    border-right:1px solid #ccc
 }
 .print-list .form-list {
-  overflow: auto
+    overflow: auto
 }
 .print-list .list-tools{
-  height:50px;
-  padding:10px 0;
-  border-bottom:1px solid #f2f2f2
+    height:50px;
+    padding:10px 0;
+    border-bottom:1px solid #f2f2f2
 }
 .pageContainer {
-  text-align: center
+    text-align: center
 }
 .pageContainer .page{
-  border:9px solid transparent;
-  display: inline-block;
+    border:9px solid transparent;
+    display: inline-block;
 }
 .pageContainer .page img{
-  width:inherit;
-  height: inherit;
+    width:inherit;
+    height: inherit;
 }
 .modal-auto-height {
-  height: 400px;
-  overflow-y: auto;
+    height: 400px;
+    overflow-y: auto;
 }
 .modal-toolbar + .modal-auto-height{
-  height:369px
+    height:369px
 }
 .modal-fixed-height {
-  height: 400px;
-  overflow-y: hidden;
+    height: 400px;
+    overflow-y: hidden;
 }
 .sidebar-tools-bar {
-  background:#fff
+    background:#fff
 }
 .side-search-box{
-  background:#fff;
-  border-bottom:1px solid #ddd
+    background:#fff;
+    border-bottom:1px solid #ddd
 }
 .navbar-crumb span{
-  float:left;
+    float:left;
 }
 .navbar-crumb span.text-truncate{
-  max-width: 200px;
+    max-width: 200px;
 }
 .dropdown-item{
-  color:#007bff
+    color:#007bff
 }
 .dropdown-item:hover{
-  color:#0056b3
+    color:#0056b3
 }
 .dropdown-item.disabled, .dropdown-item:disabled{
-  pointer-events:none
+    pointer-events:none
 }
 .tools-symbol{
-  width:450px
+    width:450px
 }
 .tools-symbol p{
-  margin: 0
+    margin: 0
 }
 .tools-symbol a.btn{
-  font-size: .95rem;
-  width:26px;
-  padding: 0;
-  height:26px;
+    font-size: .95rem;
+    width:26px;
+    padding: 0;
+    height:26px;
 }
 .custom-file-input:lang(zh) ~ .custom-file-label::after {
     content: "浏览";
@@ -571,149 +571,149 @@ font-size: .875rem;
     border-color:#000 transparent transparent transparent;
 }
 .box-text-style {
-  font-size: 12px;
-  font-family:"Microsoft YaHei"
+    font-size: 12px;
+    font-family:"Microsoft YaHei"
 }
 .box-text-style p{
-  margin:0 0 2px 0;
+    margin:0 0 2px 0;
 }
 .box-text-style table{
-  width: 100%;
-  text-align: center;
+    width: 100%;
+    text-align: center;
 }
 .box-text-style table th,.box-text-style table td{
-  border:1px solid #fff;
+    border:1px solid #fff;
 }
 
 .box-text-style table p{
-  text-align: left;
+    text-align: left;
 }
 .sys-setting-nav .nav-link{
-  padding:.3rem 1rem;
+    padding:.3rem 1rem;
 }
 /*快捷切换单位工程*/
 .navbar-crumb{
-  position: relative;
+    position: relative;
 }
 .navbar-crumb .f-nav,.navbar-crumb .s-nav{
-  position: absolute;
-  z-index: 999;
-  width: 200px;
-  background:#fff;
-  border: 1px solid rgba(0,0,0,.15);
-  padding: .5rem 0;
+    position: absolute;
+    z-index: 999;
+    width: 200px;
+    background:#fff;
+    border: 1px solid rgba(0,0,0,.15);
+    padding: .5rem 0;
 }
 .navbar-crumb .f-nav{
-  right:50px;
-  top:35px;
+    right:50px;
+    top:35px;
 }
 .navbar-crumb .s-nav{
-  left:200px
+    left:200px
 }
 .navbar-crumb .f-nav li{
-  padding: .25rem 1rem;
-  cursor: default;
+    padding: .25rem 1rem;
+    cursor: default;
 }
 .navbar-crumb .f-nav li.focus{
-color: #16181b;
-background-color: #f7f7f9;
+    color: #16181b;
+    background-color: #f7f7f9;
 }
 .navbar-crumb .f-nav li .s-nav{
-  display: none
+    display: none
 }
 .navbar-crumb .f-nav li.focus .s-nav{
-  display: block
+    display: block
 }
 /*书签颜色*/
 .annotate-color-1{
-  background: #E2F2C5;
-  color: #E2F2C5;
+    background: #E2F2C5;
+    color: #E2F2C5;
 }
 .annotate-color-1::before{
-  color: #E2F2C5;
-  -webkit-text-stroke:.5px #ced4da;
+    color: #E2F2C5;
+    -webkit-text-stroke:.5px #ced4da;
 }
 .annotate-color-2{
-  background: #F9E2CF;
-  color:#F9E2CF
+    background: #F9E2CF;
+    color:#F9E2CF
 }
 .annotate-color-2::before{
-  color: #F9E2CF;
-  -webkit-text-stroke:.5px #ced4da;
+    color: #F9E2CF;
+    -webkit-text-stroke:.5px #ced4da;
 }
 .annotate-color-3{
-  background: #F2EFD9;
-  color:#F2EFD9
+    background: #F2EFD9;
+    color:#F2EFD9
 }
 .annotate-color-3::before{
-  color:#F2EFD9;
-  -webkit-text-stroke:.5px #ced4da;
+    color:#F2EFD9;
+    -webkit-text-stroke:.5px #ced4da;
 }
 .annotate-color-4{
-  background: #F5D1DA;
-  color:#F5D1DA
+    background: #F5D1DA;
+    color:#F5D1DA
 }
 .annotate-color-4::before{
-  color:#F5D1DA;
-  -webkit-text-stroke:.5px #ced4da;
+    color:#F5D1DA;
+    -webkit-text-stroke:.5px #ced4da;
 }
 .annotate-color-5{
-  background: #E3E3E3;
-  color:#E3E3E3
+    background: #E3E3E3;
+    color:#E3E3E3
 }
 .annotate-color-5::before{
-  color:#E3E3E3;
-  -webkit-text-stroke:.5px #ced4da;
+    color:#E3E3E3;
+    -webkit-text-stroke:.5px #ced4da;
 }
 .annotate-color-6{
-  background: #B6F3F2;
-  color:#B6F3F2
+    background: #B6F3F2;
+    color:#B6F3F2
 }
 .annotate-color-6::before{
-  color:#B6F3F2;
-  -webkit-text-stroke:.5px #ced4da;
+    color:#B6F3F2;
+    -webkit-text-stroke:.5px #ced4da;
 }
 .annotate-color-7{
-  background: #ECE0F5;
-  color:#ECE0F5
+    background: #ECE0F5;
+    color:#ECE0F5
 }
 .annotate-color-7::before{
-  color:#ECE0F5;
-  -webkit-text-stroke:.5px #ced4da;
+    color:#ECE0F5;
+    -webkit-text-stroke:.5px #ced4da;
 }
 .input-group-text.active{
-  color:#666;
+    color:#666;
 }
 /*宽屏菜单*/
 @media screen and (min-width: 900px) {
-#fluid-menu{
-}
-#min-menu{
-  display: none
-}
+    #fluid-menu{
+    }
+    #min-menu{
+        display: none
+    }
 }
 @media screen and (min-width: 912px) {
-#share-info{
-  overflow: auto;
-text-overflow: ellipsis;
-white-space: nowrap;
-max-width:inherit;
-}
+    #share-info{
+        overflow: auto;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        max-width:inherit;
+    }
 }
 /*窄屏菜单*/
 @media screen and (max-width: 900px) {
-#fluid-menu{
-  display: none
-}
-#min-menu{
+    #fluid-menu{
+        display: none
+    }
+    #min-menu{
 
-}
+    }
 }
 @media screen and (max-width: 1018px) {
-#share-info{
-  overflow: hidden;
-text-overflow: ellipsis;
-white-space: nowrap;
-max-width:80px;
+    #share-info{
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        max-width:80px;
+    }
 }
-}

web/building_saas/main/html/main.html

@@ -1210,13 +1210,13 @@
                             <div class="form-group" id="expArea">
                                 <input class="form-control" id="calcBaseExp" value="">
                                 <p class="form-text">
-                                    <button class="btn btn-secondary btn-sm" id="addOpr">+</button>
-                                    <button class="btn btn-secondary btn-sm" id="subOpr">-</button>
-                                    <button class="btn btn-secondary btn-sm" id="mulOpr">*</button>
-                                    <button class="btn btn-secondary btn-sm" id="divOpr">/</button>
-                                    <button class="btn btn-secondary btn-sm" id="percentOpr">%</button>
-                                    <button class="btn btn-secondary btn-sm" id="leftOpr">(</button>
-                                    <button class="btn btn-secondary btn-sm" id="rightOpr">)</button>
+                                    <button class="calcbase-btn btn btn-secondary btn-sm" id="addOpr">+</button>
+                                    <button class="calcbase-btn btn btn-secondary btn-sm" id="subOpr">-</button>
+                                    <button class="calcbase-btn btn btn-secondary btn-sm" id="mulOpr">*</button>
+                                    <button class="calcbase-btn btn btn-secondary btn-sm" id="divOpr">/</button>
+                                    <button class="calcbase-btn btn btn-secondary btn-sm" id="percentOpr">%</button>
+                                    <button class="calcbase-btn btn btn-secondary btn-sm" id="leftOpr">(</button>
+                                    <button class="calcbase-btn btn btn-secondary btn-sm" id="rightOpr">)</button>
                                     <span id="errorInfo" style="margin-left:15px;"></span>
                                 </p>
                             </div>

web/building_saas/main/js/models/quantity_detail.js

@@ -748,7 +748,7 @@ var quantity_detail = {
                                 times = 1;
                             }
                             rationNode.updateData.quantity = scMathUtil.roundForObj(ration_value / times,getDecimal("quantity",rationNode));
-                            rationNode.updateData.contain = value?scMathUtil.roundForObj(rationNode.data.quantity/value,getDecimal("process")):0;
+                            rationNode.updateData.contain = value?scMathUtil.roundForObj(rationNode.updateData.quantity/value,getDecimal("process")):0;
                             rationNode.changed = true;
                             needUpdateChildren.push(rationNode);
                             if (rationNode.children.length>0){//如果有子工料机

web/building_saas/pm/html/project-management.html

@@ -117,12 +117,12 @@
                                     <a id="downMove" href="javascript:void(0);" class="btn btn-light btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="下移"><i class="fa fa-arrow-down" aria-hidden="true"></i></a>
                                 </div>-->
                                 <div class="tools-btn btn-group align-top btn-group-sm my-1 ml-3">
-                                    <a id="addMenuBtn" href="javascript:;" data-toggle="dropdown" class="btn btn-primary px-5 border-radius"><i class="fa fa-plus"></i> 新建</a>
-                                    <div class="dropdown-menu dropright" id="addMenu">
-                                        <a href="javascript:;" id="addFolderSub" class="dropdown-item" data-toggle="modal" data-target="#add-folder-dialog"><i class="fa fa-folder-open-o" aria-hidden="true"></i> 新建文件夹</a>
-                                        <a href="javascript:;" id="addProjectSub" class="dropdown-item" data-toggle="modal" data-target="#add-project-dialog"><i class="fa fa-cubes" aria-hidden="true"></i> 新建建设项目</a>
-                                        <a href="javascript:;" id="addTenderSub" class="dropdown-item" data-toggle="modal" data-target="#add-tender-dialog"><i class="fa fa-sticky-note-o" aria-hidden="true"></i> 新建单位工程</a>
-                                    </div>
+                                    <a id="addMenuBtn" href="javascript:;" data-toggle="modal" data-target="#add-tender-dialog" class="btn btn-primary px-5 border-radius"><i class="fa fa-plus"></i> 新建</a>
+                                    <!--<div class="dropdown-menu dropright" id="addMenu">
+                                        <a href="javascript:;" id="addFolderSub" class="dropdown-item" data-toggle="modal" data-target="#add-folder-dialog"><i class="pm-i fa fa-folder-open-o" aria-hidden="true"></i> 新建文件夹</a>
+                                        <a href="javascript:;" id="addProjectSub" class="dropdown-item" data-toggle="modal" data-target="#add-project-dialog"><i class="pm-i fa fa-cubes" aria-hidden="true"></i> 新建建设项目</a>
+                                        <a href="javascript:;" id="addTenderSub" class="dropdown-item" data-toggle="modal" data-target="#add-tender-dialog"><i class="pm-i fa fa-sticky-note-o" aria-hidden="true"></i> 新建单位工程</a>
+                                    </div>-->
                                 </div>
                                 <div class="tools-btn btn-group align-top px-3 my-1">
                                     <a id="upLevel" href="javascript:void(0);" class="btn btn-light btn-sm disabled" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="升级"><i class="fa fa-arrow-left" aria-hidden="true"></i></a>

web/over_write/js/anhui_2019.js

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