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

modules/common/base/base_controller.js

@@ -8,6 +8,7 @@
 const Moment = require("moment");
 const Url = require("url");
 const UserMessageModel = require("../../users/models/user_message_model");
+let config = require("../../../config/config.js");
 
 class BaseController {
 
@@ -64,6 +65,7 @@ class BaseController {
         // 获取未读数据
         let messageUnreadCount = await userMessageModel.count({user_id: sessionUser.id, is_read: 0, is_delete: 0});
         response.locals.unreadCount = messageUnreadCount;
+
         next();
     }
 }

modules/complementary_glj_lib/controllers/gljController.js

@@ -8,6 +8,7 @@ const EngineeringLibModel = require("../../users/models/engineering_lib_model");
 const config = require("../../../config/config.js");
 const pmFacade = require('../../pm/facade/pm_facade');
 const { ShareLibType } = require('../../../public/common_constants');
+const { getTitle } = require("../../../public/titleUtil");
 let gljDao = new GljDao();
 let callback = function(req, res, err, message, data){
     res.json({error: err, message: message, data: data});
@@ -62,7 +63,7 @@ class GljController extends BaseController{
             versionName: req.session.compilationVersion,
             LicenseKey:config.getLicenseKey(process.env.NODE_ENV),
             overWriteUrl: overWriteUrl,
-            title:config[process.env.NODE_ENV].title?config[process.env.NODE_ENV].title:"纵横公路养护云造价"
+            title:getTitle(req.headers.host)
         });
     }
 

modules/complementary_ration_lib/controllers/compleViewController.js

@@ -11,6 +11,7 @@ const CompleRationDao = require('../models/compleRationModel');
 const compleRationDao = new CompleRationDao();
 const pmFacade = require('../../pm/facade/pm_facade');
 const { ShareLibType } = require('../../../public/common_constants');
+const { getTitle } = require('../../../public/titleUtil');
 let callback = function (req, res, err, msg, data) {
     res.json({error: err, message: msg, data: data});
 };
@@ -65,7 +66,7 @@ class CompleViewController extends BaseController{
             compilationName: req.session.sessionCompilation.name,
             versionName: req.session.compilationVersion,
             LicenseKey:config.getLicenseKey(process.env.NODE_ENV),
-            title:config[process.env.NODE_ENV].title?config[process.env.NODE_ENV].title:"纵横公路养护云造价"
+            title:getTitle(req.headers.host)
         });
     }
 
@@ -97,7 +98,7 @@ class CompleViewController extends BaseController{
             compilationName: req.session.sessionCompilation.name,
             versionName: req.session.compilationVersion,
             LicenseKey:config.getLicenseKey(process.env.NODE_ENV),
-            title:config[process.env.NODE_ENV].title?config[process.env.NODE_ENV].title:"纵横公路养护云造价"
+            title:getTitle(req.headers.host)
         });
     }
 
@@ -115,7 +116,7 @@ class CompleViewController extends BaseController{
             compilationName: req.session.sessionCompilation.name,
             versionName: req.session.compilationVersion,
             LicenseKey:config.getLicenseKey(process.env.NODE_ENV),
-            title:config[process.env.NODE_ENV].title?config[process.env.NODE_ENV].title:"纵横公路养护云造价"
+            title:getTitle(req.headers.host)
         });
     }
 

modules/main/routes/main_route.js

@@ -11,6 +11,7 @@ const OptionsDao = require('../../options/models/optionsModel');
 const optionSetting = require('../../options/models/optionTypes');
 const billsUnitPriceFeatureFacade = require("../../std_bills_unitprice_feature_lib/facade/bills_unitprice_feature_facade");
 let config = require("../../../config/config.js");
+const { getTitle } = require("../../../public/titleUtil");
 
 module.exports =function (app) {
     const baseController = new BaseController();
@@ -65,7 +66,7 @@ module.exports =function (app) {
                         overWriteUrl:req.session.sessionCompilation.overWriteUrl,
                         markReadProjectIDs: JSON.stringify(markReadProjectIDs),
                         boqType,
-                        title:config[process.env.NODE_ENV].title?config[process.env.NODE_ENV].title:"纵横公路养护云造价",
+                        title:getTitle(req.headers.host),
                         billsUnitPriceFeature : JSON.stringify(billsUnitPriceFeature),
                         version
                     });

modules/pm/controllers/pm_controller.js

@@ -35,6 +35,7 @@ let consts = require('../../main/models/project_consts');
 let rp = require('request-promise');
 const commonUtil = require('../../../public/common_util');
 const { ValuationText, AdminLevelType } = require('../../../public/common_constants');
+const { getTitle } = require("../../../public/titleUtil");
 //统一回调函数
 let callback = function (req, res, err, message, data) {
     res.json({ error: err, message: message, data: data });
@@ -401,7 +402,7 @@ module.exports = {
             versionName: request.session.compilationVersion,
             socketPort:config[process.env.NODE_ENV].socketPort?config[process.env.NODE_ENV].socketPort:5500,
             LicenseKey:config.getLicenseKey(process.env.NODE_ENV),
-            title:config[process.env.NODE_ENV].title?config[process.env.NODE_ENV].title:"纵横公路养护云造价"
+            title:getTitle(request.headers.host) 
         };
 
         response.render('building_saas/pm/html/project-management.html', renderData);

modules/reports/controllers/rpt_tpl_controller.js

@@ -16,7 +16,7 @@ const JV = require("../rpt_component/jpc_value_define");
 const rttFacade = require("../facade/rpt_tpl_tree_node_facade");
 const CompilationModel = require("../../users/models/compilation_model");
 const config = require("../../../config/config.js");
-const title = config[process.env.NODE_ENV].title?config[process.env.NODE_ENV].title:"纵横公路养护云造价";
+const { getTitle } = require("../../../public/titleUtil");
 let Rpt_Cfg_Mdl = mongoose.model('rpt_cfg');
 
 //统一回调函数
@@ -131,6 +131,7 @@ let mExport = {
             sessionUserId = null;
         let userIds = ["-100"];
         if (req.session.sessionUser && req.session.sessionUser.id) sessionUserId = req.session.sessionUser.id;
+        let title = getTitle(req.headers.host);
         if (userId !== null) {
             if (typeof userId === "string") {
                 if (userIds.indexOf(userId) < 0) userIds.push(userId);

modules/unit_price_file/controllers/unit_price_controller.js

@@ -12,6 +12,7 @@ let glj_type_util = require('../../../public/cache/std_glj_type_util');
 let ration_facade = require('../../main/facade/ration_facade');
 let commonFacade = require('../../main/facade/common_facade');
 let _ = require("lodash");
+const { getTitle } = require("../../../public/titleUtil");
 
 module.exports={
     index:async function(req,res){
@@ -51,7 +52,7 @@ module.exports={
           com_electrovalence:JSON.stringify(com_electrovalence),
           socketPort:config[process.env.NODE_ENV].socketPort?config[process.env.NODE_ENV].socketPort:5500,
           LicenseKey:config.getLicenseKey(process.env.NODE_ENV),
-          title:config[process.env.NODE_ENV].title?config[process.env.NODE_ENV].title:"纵横公路养护云造价"
+          title:getTitle(req.headers.host) 
         });
     },
     addMixRatio:async function(req,res){

modules/users/controllers/boot_controller.js

@@ -8,7 +8,7 @@
 const BaseController = require("../../common/base/base_controller");
 const UserModel = require("../models/user_model");
 const CompilationModel = require("../models/compilation_model");
-const config = require("../../../config/config.js");
+const { getTitle } = require("../../../public/titleUtil");
 class BootController extends BaseController {
 
     /**
@@ -30,7 +30,7 @@ class BootController extends BaseController {
             let compilationModel = new CompilationModel();
             let compilationData = await compilationModel.getCompilationById(compilationId);
             // 判断当前用户的是使用免费版还是专业版
-            compilationVersion = await userModel.getVersionFromUpgrade(sessionUser.ssoId, compilationId);
+            compilationVersion = await userModel.getVersionFromUpgrade(sessionUser.ssoId, compilationId,request);
             request.session.compilationVersion = compilationVersion.version;
             request.session.sessionUser.compilationLock = compilationVersion.lock;
             request.session.sessionCompilation = compilationData;
@@ -50,7 +50,7 @@ class BootController extends BaseController {
             compilation: request.params.compilation,
             compilationName: request.session.sessionCompilation.name,
             versionName: request.session.compilationVersion,
-            title:config[process.env.NODE_ENV].title?config[process.env.NODE_ENV].title:"纵横公路养护云造价"
+            title:getTitle(request.headers.host) 
         };
         response.render('users/html/login-infoinput', renderData);
     }

modules/users/controllers/login_controller.js

@@ -17,8 +17,7 @@ const Captcha = require("../models/captcha");
 let mongoose = require("mongoose");
 let systemSettingModel = mongoose.model("system_setting");
 const uuidV1 = require('uuid/v1');
-let config = require("../../../config/config.js");
-let title = config[process.env.NODE_ENV].title?config[process.env.NODE_ENV].title:"纵横公路养护云造价";
+const { getTitle } = require("../../../public/titleUtil");
 class LoginController {
 
     /**
@@ -29,6 +28,8 @@ class LoginController {
      * @return {void}
      */
     async index(request, response) {
+        let title = getTitle(request.headers.host);
+
         // 判断是否有带token和ssoID参数
         if (request.query.ssoID !== undefined && request.query.token !== undefined) {
             let ssoID = request.query.ssoID;
@@ -101,7 +102,7 @@ class LoginController {
                     preferenceSetting.select_version !== '') {
                     let compilationData = await compilationModel.getCompilationById(preferenceSetting.select_version);
                     // 判断当前用户的是使用免费版还是专业版
-                    let compilationVersion = await userModel.getVersionFromUpgrade(sessionUser.ssoId, preferenceSetting.select_version);
+                    let compilationVersion = await userModel.getVersionFromUpgrade(sessionUser.ssoId, preferenceSetting.select_version,request);
                     request.session.compilationVersion = compilationVersion.version;
                     request.session.sessionUser.compilationLock = compilationVersion.lock;
                     request.session.sessionCompilation = compilationData;
@@ -276,7 +277,7 @@ class LoginController {
                 preferenceSetting.select_version !== '') {
                 let compilationData = await compilationModel.getCompilationById(preferenceSetting.select_version);
                 // 判断当前用户的是使用免费版还是专业版
-                let compilationVersion = await userModel.getVersionFromUpgrade(sessionUser.ssoId, preferenceSetting.select_version);
+                let compilationVersion = await userModel.getVersionFromUpgrade(sessionUser.ssoId, preferenceSetting.select_version,request);
                 request.session.compilationVersion = compilationVersion.version;
                 request.session.sessionUser.compilationLock = compilationVersion.lock;
                 request.session.sessionCompilation = compilationData;

modules/users/controllers/user_controller.js

@@ -16,7 +16,7 @@ const mongoose = require("mongoose");
 const moment = require("moment");
 const userData = mongoose.model('user');
 const config = require("../../../config/config.js");
-const title=config[process.env.NODE_ENV].title?config[process.env.NODE_ENV].title:"纵横公路养护云造价";
+const { getTitle } = require("../../../public/titleUtil");
 class UserController extends BaseController {
 
     /**
@@ -41,7 +41,7 @@ class UserController extends BaseController {
             companyScaleList: userModel.companyScale,
             compilationName: request.session.sessionCompilation.name,
             versionName: request.session.compilationVersion,
-            title:title
+            title:getTitle(request.headers.host)
         };
         response.render('users/html/user-info', renderData);
     }
@@ -125,7 +125,7 @@ class UserController extends BaseController {
             pages: pageData,
             compilationName: request.session.sessionCompilation.name,
             versionName: request.session.compilationVersion,
-            title:title
+            title:getTitle(request.headers.host)
         };
         response.render('users/html/user-safe', renderData);
     }
@@ -171,7 +171,7 @@ class UserController extends BaseController {
             compilationList: compilationList,
             compilationName: request.session.sessionCompilation.name,
             versionName: request.session.compilationVersion,
-            title:title
+            title:getTitle(request.headers.host)
         };
         response.render('users/html/user-buy', renderData);
     }
@@ -205,7 +205,7 @@ class UserController extends BaseController {
             compilationList: compilationList,
             compilationName: request.session.sessionCompilation.name,
             versionName: request.session.compilationVersion,
-            title:title
+            title:getTitle(request.headers.host)
         };
         response.render('users/html/user-set', renderData);
     }
@@ -241,7 +241,7 @@ class UserController extends BaseController {
                 let compilationData = await compilationModel.getCompilationById(selectVersion);
                 // 判断当前用户的是使用免费版还是专业版
                 let userModel = new UserModel();
-                let compilationVersion = await userModel.getVersionFromUpgrade(sessionUserData.ssoId, compilationData._id);
+                let compilationVersion = await userModel.getVersionFromUpgrade(sessionUserData.ssoId, compilationData._id,request);
                 request.session.compilationVersion = compilationVersion.version;
                 request.session.sessionUser.compilationLock = compilationVersion.lock;
                 request.session.sessionCompilation = compilationData;

modules/users/models/user_model.js

@@ -10,6 +10,7 @@ const Request = require("request");
 const BaseModel = require("../../common/base/base_model")
 const LogModel = require("./log_model");
 const config = require("../../../config/config.js");
+const { getTitle } = require("../../../public/titleUtil");
 class UserModel extends BaseModel {
 
     /**
@@ -346,8 +347,8 @@ class UserModel extends BaseModel {
      * @param compilationId
      * @return {version}
      */
-    async getVersionFromUpgrade(ssoId, compilationId) {
-        let title = config[process.env.NODE_ENV].title?config[process.env.NODE_ENV].title:"纵横公路养护云造价";
+    async getVersionFromUpgrade(ssoId, compilationId,request) {
+        let title = getTitle(request.headers.host); 
         let versionText = title === '纵横公路云造价'?'免费版':'学习版';
         let version = `${title}(${versionText})`;//'纵横公路养护造价(免费云版)'; 2019-03-28 需求修改，听说不知道多久的以后还会改回来--勿删！！！！！
         let lock = 0;

public/titleUtil.js

@@ -0,0 +1,14 @@
+let config = require("../config/config.js");
+
+
+module.exports = {
+    getTitle:getTitle
+}
+function getTitle(host){
+   let title = config[process.env.NODE_ENV].title?config[process.env.NODE_ENV].title:"纵横公路养护云造价"
+       //设置title
+    if (/cgyh.smartcost.com.cn/.test(host)) {
+        title = '四川高速养护云造价'
+    }
+    return title
+}

web/building_saas/standard_interface/export/zhejiang_ninghai.js

@@ -555,6 +555,7 @@ INTERFACE_EXPORT = (() => {
     /* 生成定额信息表 */
     function createDEXXB(node) {
       const rst = [];
+      if(isBidInvitation) return rst; //招标工程量清单不导出定额数据
       node.children.forEach(ration => {
         const dexxb = new DEXXB(ration);
         rst.push(dexxb);
@@ -749,7 +750,6 @@ INTERFACE_EXPORT = (() => {
         rationSeq = 1;
         jrgSeq = 1;
         hzSeq = 1;
-        debugger;
         curTender = tenderDetailMap[tender.ID];
         const {
           gongLBDGC,

web/users/html/login.html

@@ -56,7 +56,9 @@
                 <a href="javascript:void(0)" id="changeLogin" data-status="user" class="mr-3">短信登录</a>
                 <div>
                     <a href="https://sso.smartcost.com.cn/getpasswd" target="_blank" class="mr-3">忘记密码</a>
-                    <a href="https://sso.smartcost.com.cn/reg" target="_blank">免费注册</a>
+                    <% if (title != "四川高速养护云造价") { %>
+                    <a href="https://sso.smartcost.com.cn/reg" id='registerLink' target="_blank">免费注册</a>
+                    <% } %>
                 </div>
             </div>
         </form>

web/users/js/login.js

@@ -8,6 +8,11 @@
 $(document).ready(function () {
     let referer = scUrlUtil.GetQueryString('referer');
 
+    /* if (/std.smartcost.com.cn/.test(window.location.host)) {
+       $("#registerLink").hide();
+    } */
+
+
     // 载入时先获取相关参数
     // $.ajax({
     //     url: '/captcha',