bugs

modules/main/controllers/project_controller.js

@@ -39,6 +39,7 @@ module.exports = {
         // Project.getFilterData(data.project_id, ['bills', 'projectGLJ'], function (err, result) {
         //     console.log(result);
         // });
+        project_facade.getIndexReportData(data.project_id,['ProjectInfoFields','ProjectFeatureFields','ProjectQtyFields','ProjectLabMaterialFields','ProjectEcoFields','ProjectCostFields']);
         Project.getData(data.project_id, function (err, message, result) {
             if (!err) {
                 callback(req, res, err, message, result);

modules/main/facade/project_facade.js

@@ -384,23 +384,65 @@ async function setSEILibData(property){
     }
 }
 
-async function getIndexReportData(projectID) {
+async function getIndexReportData(projectID,keyArr) {
     let project = await projectsModel.findOne({ID:projectID});
     let bills = await bill_model.getDataSync(projectID);
-    let engineerCostList = getEngineerCostData(project.property,bills);
-    let engineerEcoList = getEconomicDatas(project.property,bills);
-    let mainMaterialList = await getMainMaterialDatas(projectID,project.property);
-    let quantityList = await getQuantityDatas(project.property,bills);
-    let result = {
-        ProjectCostFields:engineerCostList,
-        ProjectEcoFields:engineerEcoList,
-        ProjectLabMaterialFields:mainMaterialList,
-        ProjectQtyFields:quantityList
-    };
+    let result = {};
+
+     for(let key of keyArr){
+         switch (key) {
+             case 'ProjectCostFields':
+                 result[key] =getEngineerCostData(project.property,bills);
+                 break;
+             case 'ProjectEcoFields':
+                 result[key] = getEconomicDatas(project.property,bills);
+                 break;
+             case 'ProjectLabMaterialFields':
+                 result[key] = await getMainMaterialDatas(projectID,project.property);
+                 break;
+             case 'ProjectQtyFields':
+                 result[key] = await getQuantityDatas(project.property,bills);
+                 break;
+             case 'ProjectInfoFields':
+                 result[key] = getEngineerInfoData(project.property.engineerInfos);
+                 break;
+             case 'ProjectFeatureFields':
+                 result[key] = getEngineerFeaturesDatas(project.property.engineerFeatures);
+                 break;
+         }
+     }
     return result
 }
 
 
+
+
+function getEngineerInfoData(engineerInfos) {
+    let datas = [];
+    for(let info of engineerInfos){
+        let d = {
+            name:info.dispName,
+            value:info.value
+        };
+        datas.push(d);
+    }
+    return datas;
+}
+
+function getEngineerFeaturesDatas(engineerFeatures) {
+    let datas = [];
+    for(let f of engineerFeatures){
+        let tem = {
+            ID:f.ID,
+            name:f.name,
+            value:f.value,
+            ParentID:f.ParentID
+        }
+        datas.push(tem);
+    }
+    return datas;
+}
+
 function getQuantityDatas(property,bills) {
      return gljUtil.getQuantityDatas(property.engineerFeatures,property.mainQuantities,bills,fixedFlag,_,scMathUtil,property.decimal)
 }

modules/users/models/user_model.js

@@ -176,10 +176,13 @@ class UserModel extends BaseModel {
                 latest_login:userData.latest_login,
                 isUserActive: userData.isUserActive,
             };
+            console.log("updateUser 开始 -------------------------------");
             let updateResult = await this.updateUser(condition,UpdateData);
+            console.log("updateUser 完成 -------------------------------");
             if (updateResult.ok === 1) {
                 let logModel = new LogModel();
                 result = await logModel.addLoginLog(userDataFromDb._id, request);
+                console.log("addLoginLog 完成 -------------------------------");
             }
         }
         request.session.sessionUser.id = userDataFromDb._id;

web/building_saas/main/html/main.html

@@ -288,7 +288,7 @@
                                                           <li class="nav-item" data-toggle="tooltip" data-placement="left" title="项目特征">
                                                               <a data-toggle="tab" id="xm-nav" href="#rnc-xm" role="tab" class="zmhs-link nav-link">特征<!--<i class="fa fa-info-circle"></i>--></a>
                                                           </li>
-                                                          <li class="nav-item" data-toggle="tooltip" data-placement="left" title="附注条件"><a data-toggle="tab" href="#rnc-zm" role="tab"class="zmhs-link nav-link">换算<!--<i class="fa fa-check-circle-o"></i>--></a></li>
+                                                          <li class="nav-item" data-toggle="tooltip" data-placement="left" title="附注条件"><a data-toggle="tab" id="hs-nav" href="#rnc-zm" role="tab"class="zmhs-link nav-link">换算<!--<i class="fa fa-check-circle-o"></i>--></a></li>
                                                           <li class="nav-item" data-toggle="tooltip" data-placement="left" title="自定义系数"><a data-toggle="tab" href="#rnc-cus" role="tab"class="zmhs-link nav-link">系数<!--<i class="fa fa-wrench"></i>--></a></li>
                                      <!--                     <li class="nav-item" data-toggle="tooltip" data-placement="left" title="增减换算"><a data-toggle="tab" href="#rnc-fz" role="tab"class="zmhs-link nav-link "><i class="fa fa-plus"></i></a></li>-->
                                                         <!--  <li class="nav-item"><a data-toggle="tab" href="#rnc-xm" role="tab"  class="nav-link">项目特征</a></li>
@@ -1633,7 +1633,7 @@
                         </label>
                     </div>
                     <div class="form-check">
-                        <input class="form-check-input zlfb-check" type="checkbox" checked id="bill_recode"  >
+                        <input class="form-check-input zlfb-check" type="checkbox" id="bill_recode"  >
                         <label class="form-check-label">
                             清单重新编码
                         </label>

web/building_saas/main/js/views/sub_view.js

@@ -13,6 +13,7 @@ let subObj = {
     TZJNRrePercent:null,
     showGljSubTab:false,
     showQDSubTab:false,
+    firstOpen:true,
     initSubSpread:function () {
         //清单精灵
         BillsElf.buildSheet();
@@ -198,6 +199,10 @@ let subObj = {
         if (gljOprObj.activeTab !== gljOprObj.preActiveTab) {   //提高焦点变换性能 2019年4月12日
             refreshSubSpread();
         }
+        if(this.firstOpen == true){
+            $("#zmhs_toogle").click();
+            this.firstOpen = false;
+        }
     },
     showQDSubTabData:function () {
         this.initQDSubTab();
@@ -815,7 +820,7 @@ $('#linkAZZJF').on('shown.bs.tab', function () {
 $('#zmhs_toogle').bind('click',function (){
    $("#zmhs_nav").show();
    if(subObj.showGljSubTab == false){
-       subObj.activeGLJItemTab?$(subObj.activeGLJItemTab).click():$("#xm-nav").click();
+       subObj.activeGLJItemTab?$(subObj.activeGLJItemTab).click():$("#hs-nav").click();
    }
     $("#zmhs_toogle").hide();
 });