Ver código fonte

分离全国公路

zhangweicheng 5 anos atrás
pai
commit
8783c90693
36 arquivos alterados com 113 adições e 128 exclusões
  1. 26 4
      config/config.js
  2. 3 1
      config/db/db_manager.js
  3. 2 1
      importserver.js
  4. 0 27
      modules/bills_lib/controllers/views_permissionController.js
  5. 0 28
      modules/bills_lib/routes/maintain_bills_routes.js
  6. 6 3
      modules/complementary_ration_lib/controllers/compleViewController.js
  7. 2 0
      modules/main/routes/main_route.js
  8. 3 1
      modules/pm/controllers/pm_controller.js
  9. 6 4
      modules/reports/controllers/rpt_tpl_controller.js
  10. 0 27
      modules/std_billsGuidance_lib/controllers/viewController.js
  11. 3 1
      modules/unit_price_file/controllers/unit_price_controller.js
  12. 2 0
      modules/users/controllers/boot_controller.js
  13. 5 2
      modules/users/controllers/login_controller.js
  14. 7 0
      modules/users/controllers/user_controller.js
  15. 4 2
      modules/users/models/user_model.js
  16. 4 1
      package.json
  17. 3 1
      public/web/socket/connection.js
  18. 8 2
      server.js
  19. 3 1
      socket.js
  20. 1 1
      web/building_saas/complementary_ration_lib/html/anzhuang.html
  21. 1 1
      web/building_saas/complementary_ration_lib/html/dinge.html
  22. 1 1
      web/building_saas/complementary_ration_lib/html/fuzhu.html
  23. 1 1
      web/building_saas/complementary_ration_lib/html/gongliao.html
  24. 1 1
      web/building_saas/main/html/main.html
  25. 4 3
      web/building_saas/pm/html/project-management.html
  26. 2 2
      web/building_saas/pm/js/pm_newMain.js
  27. 1 1
      web/building_saas/unit_price_file/index.html
  28. 3 0
      web/common/html/header.html
  29. 1 1
      web/users/html/login-infoinput.html
  30. 2 2
      web/users/html/login-sms.html
  31. 2 2
      web/users/html/login-ver.html
  32. 2 2
      web/users/html/login.html
  33. 1 1
      web/users/html/user-buy.html
  34. 1 1
      web/users/html/user-info.html
  35. 1 1
      web/users/html/user-safe.html
  36. 1 1
      web/users/html/user-set.html

Diferenças do arquivo suprimidas por serem muito extensas
+ 26 - 4
config/config.js


+ 3 - 1
config/db/db_manager.js

@@ -48,7 +48,9 @@ module.exports = {
     },
     connect:function (env="local") {
         var config = require("../config.js");
-        var dbURL = 'mongodb://' + config[env].server + ":" + config[env].port + '/yanghu';
+        let dbname = 'yanghu';
+        if(config[env].dbname) dbname = config[env].dbname;
+        var dbURL = 'mongodb://' + config[env].server + ":" + config[env].port + '/'+dbname;
         if(config[env].dbURL){
             mg.connect(config[env].dbURL,{connectTimeoutMS: 20000,useMongoClient: true});
         } else if(config[env].options){

+ 2 - 1
importserver.js

@@ -62,8 +62,9 @@ app.use(function(err, req, res, next) {
 //设置外增的Date对象Format函数
 //备注: 经过测试nodejs 8.9.3版本不支持eval的方式修改prototype,为兼容考虑,把方法调整到stringUtil文件里
 require('./public/stringUtil').setupDateFormat();
+let importPort = config[process.env.NODE_ENV].importPor?config[process.env.NODE_ENV].importPor:2050; 
 
-app.listen(2050, function(){
+app.listen(importPort, function(){
     console.log('import server started!');
 });
 

+ 0 - 27
modules/bills_lib/controllers/views_permissionController.js

@@ -1,27 +0,0 @@
-/**
- * 清单编辑器页面权限管理和session校验
- * Created by Zhong on 2017/8/2.
- */
-import baseController from "../../common/base/base_controller";
-
-class viewsPermContr extends baseController{
-    redirectStdBillsMain(req, res){
-        res.render("maintain/bills_lib/html/main.html",
-            {userAccount: req.session.managerData.username,
-                userID: req.session.managerData.userID});
-    }
-    redirectStdBills(req, res){
-        res.render("maintain/bills_lib/html/qingdan.html",
-            {userAccount: req.session.managerData.username});
-    }
-    redirectStdJobs(req, res){
-        res.render('maintain/bills_lib/html/neirong.html',
-            {userAccount: req.session.managerData.username});
-    }
-    redirectStdItems(req, res){
-        res.render('maintain/bills_lib/html/tezheng.html',
-            {userAccount: req.session.managerData.username});
-    }
-}
-
-export default viewsPermContr;

+ 0 - 28
modules/bills_lib/routes/maintain_bills_routes.js

@@ -1,28 +0,0 @@
-/**
- * Created by chen on 2017/7/17.
- */
-
-let express = require("express");
-
-
-module.exports = function (app) {
-    app.get("/stdBillsmain", function(req, res){
-        if(!req.session.sessionUser){
-            res.redirect('/login');
-        }
-        else {
-            res.render("maintain/bills_lib/html/main.html",
-                {userAccount: req.session.userAccount,
-                    userID: req.session.sessionUser.id});
-        }
-    });
-    app.get("/stdBills", function(req, res){
-        res.render("maintain/bills_lib/html/qingdan.html");
-    });
-    app.get('/stdJobs', function(req, res){
-        res.render('maintain/bills_lib/html/neirong.html');
-    });
-    app.get('/stdItems', function(req, res){
-        res.render('maintain/bills_lib/html/tezheng.html');
-    });
-};

+ 6 - 3
modules/complementary_ration_lib/controllers/compleViewController.js

@@ -50,7 +50,8 @@ class CompleViewController extends BaseController{
             gljLibId: gljLibId,
             compilationName: req.session.sessionCompilation.name,
             versionName: req.session.compilationVersion,
-            LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
+            LicenseKey:config.getLicenseKey(process.env.NODE_ENV),
+            title:config[process.env.NODE_ENV].title?config[process.env.NODE_ENV].title:"?????????"
         });
     }
 
@@ -79,7 +80,8 @@ class CompleViewController extends BaseController{
             gljLibId: gljLibId,
             compilationName: req.session.sessionCompilation.name,
             versionName: req.session.compilationVersion,
-            LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
+            LicenseKey:config.getLicenseKey(process.env.NODE_ENV),
+            title:config[process.env.NODE_ENV].title?config[process.env.NODE_ENV].title:"?????????"
         });
     }
 
@@ -96,7 +98,8 @@ class CompleViewController extends BaseController{
             gljLibId: gljLibId,
             compilationName: req.session.sessionCompilation.name,
             versionName: req.session.compilationVersion,
-            LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
+            LicenseKey:config.getLicenseKey(process.env.NODE_ENV),
+            title:config[process.env.NODE_ENV].title?config[process.env.NODE_ENV].title:"?????????"
         });
     }
 

+ 2 - 0
modules/main/routes/main_route.js

@@ -43,9 +43,11 @@ module.exports =function (app) {
                         projectReadOnly: projectReadOnly,
                         projectCooperate: projectCooperate,
                         LicenseKey:config.getLicenseKey(process.env.NODE_ENV),
+                        socketPort:config[process.env.NODE_ENV].socketPort?config[process.env.NODE_ENV].socketPort:5500,
                         options:JSON.stringify(options),
                         overWriteUrl:req.session.sessionCompilation.overWriteUrl,
                         markReadProjectIDs: JSON.stringify(markReadProjectIDs),
+                        title:config[process.env.NODE_ENV].title?config[process.env.NODE_ENV].title:"纵横公路养护云造价",
                         version
                     });
             } else {

+ 3 - 1
modules/pm/controllers/pm_controller.js

@@ -341,7 +341,9 @@ module.exports = {
             engineeringList: JSON.stringify(engineering.List),
             compilationName: sessionCompilation.name,
             versionName: request.session.compilationVersion,
-            LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
+            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:"纵横公路养护云造价"
         };
 
         response.render('building_saas/pm/html/project-management.html', renderData);

+ 6 - 4
modules/reports/controllers/rpt_tpl_controller.js

@@ -16,6 +16,8 @@ let rptCustCfgFacade = require("../facade/rpt_cust_cfg_facade");
 import JV from "../rpt_component/jpc_value_define";
 import rttFacade from "../facade/rpt_tpl_tree_node_facade";
 import CompilationModel from "../../users/models/compilation_model";
+let config = require("../../../config/config.js");
+let title = config[process.env.NODE_ENV].title?config[process.env.NODE_ENV].title:"纵横公路养护云造价"
 
 //统一回调函数
 let callback = function(req, res, err, message, data){
@@ -144,10 +146,10 @@ let mExport = {
                     let rstData = {isFreeUser: isFreeUser, data: tplTreeRst};
                     if (isFreeUser) {
                         let waterMarks = [];
-                        waterMarks.push({label:"纵横公路养护云造价", font:{name:'楷体', height: 32, color:'GREEN', angle:45}, left_top:[10, 100]});
-                        waterMarks.push({label:"纵横公路养护云造价", font:{name:'楷体', height: 32, color:'GREEN', angle:45}, left_top:[100, 300]});
-                        waterMarks.push({label:"纵横公路养护云造价", font:{name:'楷体', height: 32, color:'GREEN', angle:45}, left_top:[200, 500]});
-                        waterMarks.push({label:"纵横公路养护云造价", font:{name:'楷体', height: 32, color:'GREEN', angle:45}, left_top:[600, 700]});
+                        waterMarks.push({label:title, font:{name:'楷体', height: 32, color:'GREEN', angle:45}, left_top:[10, 100]});
+                        waterMarks.push({label:title, font:{name:'楷体', height: 32, color:'GREEN', angle:45}, left_top:[100, 300]});
+                        waterMarks.push({label:title, font:{name:'楷体', height: 32, color:'GREEN', angle:45}, left_top:[200, 500]});
+                        waterMarks.push({label:title, font:{name:'楷体', height: 32, color:'GREEN', angle:45}, left_top:[600, 700]});
                         rstData.waterMarks = waterMarks;
                     } else {
                         rstData.waterMarks = [];

+ 0 - 27
modules/std_billsGuidance_lib/controllers/viewController.js

@@ -1,27 +0,0 @@
-'use strict';
-
-/**
- *
- *
- * @author Zhong
- * @date 2018/5/29
- * @version
- */
-import BaseController from "../../common/base/base_controller";
-
-class ViewsController extends BaseController{
-    redirectMain(req, res){
-        res.render('maintain/billsGuidance_lib/html/main.html',
-            {
-                userAccount: req.session.managerData.username
-            });
-    }
-    redirectGuidance(req, res){
-        res.render('maintain/billsGuidance_lib/html/zhiyin.html',
-            {
-                userAccount: req.session.managerData.username
-            });
-    }
-}
-
-export default ViewsController;

+ 3 - 1
modules/unit_price_file/controllers/unit_price_controller.js

@@ -48,7 +48,9 @@ module.exports={
           gljTypeMap:JSON.stringify(gljTypeMap),
           mixRatioMap:JSON.stringify(mixRatioMap),
           com_electrovalence:JSON.stringify(com_electrovalence),
-          LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
+          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:"纵横公路养护云造价"
         });
     },
     addMixRatio:async function(req,res){

+ 2 - 0
modules/users/controllers/boot_controller.js

@@ -9,6 +9,7 @@ import BaseController from "../../common/base/base_controller";
 import UserModel from "../models/user_model";
 import CompilationModel from "../models/compilation_model";
 import UserMessageModel from "../models/user_message_model";
+let config = require("../../../config/config.js");
 
 class BootController extends BaseController {
 
@@ -51,6 +52,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:"纵横公路养护云造价"
         };
         response.render('users/html/login-infoinput', renderData);
     }

+ 5 - 2
modules/users/controllers/login_controller.js

@@ -17,7 +17,8 @@ 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:"纵横公路养护云造价";
 class LoginController {
 
     /**
@@ -60,6 +61,7 @@ class LoginController {
                 if (userInfo !== undefined && userInfo !== null && userInfo.isSmsLogin === 1) {
                     let renderData = {
                         mobile: userData.mobile,
+                        title:title
                     };
                     response.render('users/html/login-sms', renderData);
                     return;
@@ -112,6 +114,7 @@ class LoginController {
                 if (preferenceSetting.login_ask === 1 || preferenceSetting.select_version === '') {
                     let renderData = {
                         versionData: compilationList,
+                        title:title
                     };
                     response.render('users/html/login-ver', renderData);
                 } else {
@@ -126,7 +129,7 @@ class LoginController {
             if (sessionUser !== undefined && sessionUser.ssoId >= 0) {
                 return response.redirect("/pm");
             } else {
-                response.render('users/html/login', {});
+                response.render('users/html/login', {title:title});
             }
         }
     }

+ 7 - 0
modules/users/controllers/user_controller.js

@@ -14,6 +14,9 @@ import SettingType from "../../common/const/setting_type_const";
 import CompilationModel from "../models/compilation_model";
 import mongoose from "mongoose";
 import moment from "moment";
+let config = require("../../../config/config.js");
+let title=config[process.env.NODE_ENV].title?config[process.env.NODE_ENV].title:"纵横公路养护云造价";
+
 const userData = mongoose.model('user');
 
 class UserController extends BaseController {
@@ -40,6 +43,7 @@ class UserController extends BaseController {
             companyScaleList: userModel.companyScale,
             compilationName: request.session.sessionCompilation.name,
             versionName: request.session.compilationVersion,
+            title:title
         };
         response.render('users/html/user-info', renderData);
     }
@@ -123,6 +127,7 @@ class UserController extends BaseController {
             pages: pageData,
             compilationName: request.session.sessionCompilation.name,
             versionName: request.session.compilationVersion,
+            title:title
         };
         response.render('users/html/user-safe', renderData);
     }
@@ -166,6 +171,7 @@ class UserController extends BaseController {
             compilationList: compilationList,
             compilationName: request.session.sessionCompilation.name,
             versionName: request.session.compilationVersion,
+            title:title
         };
         response.render('users/html/user-buy', renderData);
     }
@@ -199,6 +205,7 @@ class UserController extends BaseController {
             compilationList: compilationList,
             compilationName: request.session.sessionCompilation.name,
             versionName: request.session.compilationVersion,
+            title:title
         };
         response.render('users/html/user-set', renderData);
     }

+ 4 - 2
modules/users/models/user_model.js

@@ -9,6 +9,7 @@ import mongoose from "mongoose";
 import Request from "request";
 import BaseModel from "../../common/base/base_model"
 import LogModel from "./log_model";
+let config = require("../../../config/config.js");
 
 class UserModel extends BaseModel {
 
@@ -347,7 +348,8 @@ class UserModel extends BaseModel {
      * @return {version}
      */
     async getVersionFromUpgrade(ssoId, compilationId) {
-        let version = '纵横公路养护云造价(学习版)';//'纵横公路养护造价(免费云版)'; 2019-03-28 需求修改,听说不知道多久的以后还会改回来--勿删!!!!!
+        let title = config[process.env.NODE_ENV].title?config[process.env.NODE_ENV].title:"纵横公路养护云造价";
+        let version = title+'(学习版)';//'纵横公路养护造价(免费云版)'; 2019-03-28 需求修改,听说不知道多久的以后还会改回来--勿删!!!!!
         let deadline = '';
         let userData = await this.findDataBySsoId(ssoId);
         if (userData.upgrade_list !== undefined) {
@@ -355,7 +357,7 @@ class UserModel extends BaseModel {
                 return item.compilationID === compilationId;
             });
             if (compilationInfo !== undefined && compilationInfo.isUpgrade === true) {
-                version = '纵横公路养护云造价(专业版)';
+                version = title+'(专业版)';
                 if (compilationInfo.deadline !== undefined && compilationInfo.deadline !== '') {
                     deadline = compilationInfo.deadline;
                 }

+ 4 - 1
package.json

@@ -68,6 +68,9 @@
     "import": "pm2-docker pm2_import.json",
     "dev_server": "SET NODE_ENV=qa&& babel-node server.js",
     "dev_socket": "SET NODE_ENV=qa&& babel-node socket.js",
-    "dev_import": "SET NODE_ENV=qa&& babel-node importserver.js"
+    "dev_import": "SET NODE_ENV=qa&& babel-node importserver.js",
+    "dev_server_sc": "SET NODE_ENV=qa_sc&& babel-node server.js",
+    "dev_socket_sc": "SET NODE_ENV=qa_sc&& babel-node socket.js",
+    "dev_import_sc": "SET NODE_ENV=qa_sc&& babel-node importserver.js"
   }
 }

+ 3 - 1
public/web/socket/connection.js

@@ -8,7 +8,9 @@ socketObject = {
         // 连接socket服务器
         var hostName = window.location.hostname;
         let me = this;
-        let port = window.location.protocol === 'http:' ? 5500 : 5501;
+        let socketPort = parseInt($("#socketPort").val());
+        if(!socketPort) socketPort= 5500;
+        let port = window.location.protocol === 'http:' ? socketPort : socketPort+1;
         socket = io(window.location.protocol + '//' + hostName + ':' + port);
         socket.on('connect', function () {
             if (from == 'pm') {

+ 8 - 2
server.js

@@ -39,8 +39,11 @@ let bodyParser = require('body-parser');
 app.use(bodyParser.urlencoded({limit: '100mb', extended: false}));
 app.use(bodyParser.json({limit: '100mb'}));
 
+let dbname = 'yanghu';
+if(config[process.env.NODE_ENV].dbname) dbname = config[process.env.NODE_ENV].dbname;
+
 app.use(session({
-    name: 'yanghuSession',
+    name: dbname+'Session',
     secret: 'session users secret',
     // @todo 上线前修改回正常值 (目前为24小时)
     cookie: {maxAge: 3600 * 24 * 1000},
@@ -89,7 +92,10 @@ app.use(function(err, req, res, next) {
 //备注: 经过测试nodejs 8.9.3版本不支持eval的方式修改prototype,为兼容考虑,把方法调整到stringUtil文件里
 require('./public/stringUtil').setupDateFormat();
 
-app.listen(2060, function(){
+let startPort = 2060;
+if(config[process.env.NODE_ENV].startPort) startPort = config[process.env.NODE_ENV].startPort;
+
+app.listen(startPort, function(){
     console.log('server started!');
 });
 

+ 3 - 1
socket.js

@@ -5,11 +5,13 @@
  * @date 2017-05-12
  * @version
  */
+let config = require("./config/config.js");
 import socket from "socket.io";
 const moment = require('moment');
 const { PageTarget } = require('./public/common_constants');
+let socketPort = config[process.env.NODE_ENV].socketPort?config[process.env.NODE_ENV].socketPort:5500; 
 
-const socketIO = socket(5500);
+const socketIO = socket(socketPort);
 
 const userCache = {};
 

+ 1 - 1
web/building_saas/complementary_ration_lib/html/anzhuang.html

@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title>定额库编辑器-纵横公路养护造价</title>
+    <title>定额库编辑器-<%= title%></title>
     <!--inject:css-->
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="/lib/spreadjs/sheets/css/gc.spread.sheets.sc.css" type="text/css">

+ 1 - 1
web/building_saas/complementary_ration_lib/html/dinge.html

@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title>定额库编辑器-纵横公路养护造价</title>
+    <title>定额库编辑器-<%= title%></title>
     <!--inject:css-->
     <link rel="stylesheet" href="/lib/jquery-ui/jquery-ui.css" type="text/css">
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">

+ 1 - 1
web/building_saas/complementary_ration_lib/html/fuzhu.html

@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title>定额库编辑器-纵横公路养护造价</title>
+    <title>定额库编辑器-<%= title%></title>
     <!--inject:css-->
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="/web/building_saas/css/main.css">

+ 1 - 1
web/building_saas/complementary_ration_lib/html/gongliao.html

@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title>定额库编辑器-纵横公路养护造价</title>
+    <title>定额库编辑器-<%= title%></title>
     <!--inject:css-->
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="/web/building_saas/css/main.css">

+ 1 - 1
web/building_saas/main/html/main.html

@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title><%= projectData.name !== undefined ? projectData.name : '造价书' %>-纵横公路养护云造价</title>
+    <title><%= projectData.name !== undefined ? projectData.name : '造价书' %>-<%= title%></title>
 
 
     <link rel="stylesheet" href="/lib/jquery-ui/jquery-ui.css" type="text/css">

+ 4 - 3
web/building_saas/pm/html/project-management.html

@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title>项目管理-纵横公路养护造价</title>
+    <title>项目管理-<%= title%></title>
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="/web/building_saas/css/main.css">
     <link rel="stylesheet" href="/web/building_saas/css/custom.css">
@@ -51,6 +51,7 @@
 <img src="/web/dest/css/img/copy.png" id="copy_pic" style="display: none">
 <img src="/web/dest/css/img/edit.png" id="edit_pic" style="display: none">
 <div class="header">
+    <input type="hidden" id="projectTitle" value="<%= title%>">
     <div class="top-msg clearfix">
         <div class="alert alert-warning mb-0 py-0" role="alert" style="display: none;">
             <button type="button" class="close" data-dismiss="alert" aria-label="Close">
@@ -643,7 +644,7 @@
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title">欢迎使用纵横公路养护造价</h5>
+                <h5 class="modal-title">欢迎使用<%= title%></h5>
             </div>
             <div class="modal-body">
                 <h5 class="my-3">首次加载例题,请稍候……</h5>
@@ -686,7 +687,7 @@
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title">欢迎使用纵横公路养护云造价</h5>
+                <h5 class="modal-title">欢迎使用<%= title%></h5>
                 <label id="countdown" ></label>
                 <button type="button" id="welcomeCloseBtn" class="close text-danger" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">&times;</span>

+ 2 - 2
web/building_saas/pm/js/pm_newMain.js

@@ -2349,7 +2349,7 @@ async function init(refresh = false, callback, expandCallback) {//refresh是刷
         if (refresh == false) socketObject.connect('pm');//socket 连接;
         if (isFirst) {
             isFirst = false;
-            $.bootstrapLoading.progressStart('欢迎使用纵横公路养护造价', true);
+            $.bootstrapLoading.progressStart('欢迎使用'+$("#projectTitle").val(), true);
             $("#progress_modal_body").text('首次加载例题,请稍候……');
             await ajaxPost('/pm/api/prepareInitialData', { user_id: userID });
             await importProcessChecking(null, null, () => {
@@ -2362,7 +2362,7 @@ async function init(refresh = false, callback, expandCallback) {//refresh是刷
             }, true);
         } else {
             await importProcessChecking(null, ({ content }) => {
-                $.bootstrapLoading.progressStart('欢迎使用纵横公路养护造价', true);
+                $.bootstrapLoading.progressStart('欢迎使用'+$("#projectTitle").val(), true);
                 $("#progress_modal_body").text(content);
             }, () => {
                 $.bootstrapLoading.start();

+ 1 - 1
web/building_saas/unit_price_file/index.html

@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title>纵横公路养护云造价</title>
+    <title><%= title%></title>
 
 
     <link rel="stylesheet" href="/lib/jquery-ui/jquery-ui.css" type="text/css">

+ 3 - 0
web/common/html/header.html

@@ -1,4 +1,7 @@
 <img id="f_btn" src="/web/dest/css/img/feeRate_btn.jpg" alt="" style="display: none" />
+<% if(typeof socketPort != 'undefined'){ %>
+<input id="socketPort" value="<%= socketPort %>" type="hidden">
+<% } %>
 <div class="top-msg clearfix">
     <div class="alert alert-warning alert-dismissible" role="alert" id="notify" style="display: none">
         <button type="button" class="close" aria-label="Close" onclick="$('#notify').hide();">

+ 1 - 1
web/users/html/login-infoinput.html

@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title>用户信息填写-纵横公路养护云造价</title>
+    <title>用户信息填写-<%= title%></title>
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="/web/building_saas/css/main.css">
     <link rel="stylesheet" href="/lib/font-awesome/font-awesome.min.css">

+ 2 - 2
web/users/html/login-sms.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title>用户登录-纵横公路养护云造价</title>
+    <title>用户登录-<%= title%></title>
     <!-- inject:css -->
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="/web/building_saas/css/main.css">
@@ -17,7 +17,7 @@
     <div class="login-bg"></div>
     <div class="container login-panel">
         <form class="form-signin">
-            <h1 class="d-flex justify-content-center mb-5"><img src="/web/building_saas/img/building.png" width="40" height="40" class="mr-3" style="margin-top: 5px"> 纵横公路养护云造价</h1>
+            <h1 class="d-flex justify-content-center mb-5"><img src="/web/building_saas/img/building.png" width="40" height="40" class="mr-3" style="margin-top: 5px"> <%= title%></h1>
             <p class="mb-1">您关闭了「账号登录」,请通过手机验证码登录。</p>
             <p class="">请点击“获取验证码”,验证码将发送至手机 <%= mobile.substr(0, 3) + '****' + mobile.substr(7, 11) %>,注意查收。</p>
             <div class="form-row sms-login-modal">

+ 2 - 2
web/users/html/login-ver.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title>用户登录-纵横公路养护云造价</title>
+    <title>用户登录-<%= title%></title>
     <!-- inject:css -->
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="/web/building_saas/css/main.css">
@@ -17,7 +17,7 @@
     <div class="login-bg"></div>
     <div class="container login-panel ver-panel">
             <h1 class="d-flex justify-content-center mb-5">
-                <img src="/web/building_saas/img/building.png" width="40" height="40" class="mr-3" style="margin-top: 5px"> 纵横公路养护云造价</h1>
+                <img src="/web/building_saas/img/building.png" width="40" height="40" class="mr-3" style="margin-top: 5px"> <%= title%></h1>
             <div class="d-flex justify-content-between">
                 <h5 class="modal-title">选择费用定额</h5>
                 <p class=" text-warning"><i class="fa fa-exclamation-triangle"></i> <b>登录设置</b> 中可以修改您的登录习惯。</p>

+ 2 - 2
web/users/html/login.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title>用户登录-纵横公路养护云造价</title>
+    <title>用户登录-<%= title%></title>
     <!-- inject:css -->
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="/web/building_saas/css/main.css">
@@ -20,7 +20,7 @@
         <form class="form-signin" method="post" onsubmit="return false">
             <h1 class="d-flex justify-content-center mb-5">
                 <img src="/web/building_saas/img/building.png" width="40" height="40" class="mr-3" style="margin-top: 5px">
-                纵横公路养护云造价
+                <%= title%>
             </h1>
             <div class="form-group user-login-modal">
                 <input id="inputEmail" class="form-control " name="inputEmail" placeholder="通行账号 邮箱/手机" autofocus="" />

+ 1 - 1
web/users/html/user-buy.html

@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title>产品激活-纵横公路养护造价</title>
+    <title>产品激活-<%= title%></title>
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="/web/building_saas/css/main.css">
     <link rel="stylesheet" href="/lib/font-awesome/font-awesome.min.css">

+ 1 - 1
web/users/html/user-info.html

@@ -10,7 +10,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title>企业资料-纵横公路养护造价</title>
+    <title>企业资料-<%= title%></title>
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="/web/building_saas/css/main.css">
     <link rel="stylesheet" href="/lib/font-awesome/font-awesome.min.css">

+ 1 - 1
web/users/html/user-safe.html

@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title>账号安全-纵横公路养护造价</title>
+    <title>账号安全-<%= title%></title>
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="/web/building_saas/css/main.css">
     <link rel="stylesheet" href="/lib/font-awesome/font-awesome.min.css">

+ 1 - 1
web/users/html/user-set.html

@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title>登录设置-纵横公路养护造价</title>
+    <title>登录设置-<%= title%></title>
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="/web/building_saas/css/main.css">
     <link rel="stylesheet" href="/lib/font-awesome/font-awesome.min.css">