Merge branch 'master' of http://smartcost.f3322.net:3000/SmartCost/YangHuCost

modules/complementary_glj_lib/controllers/gljController.js

@@ -40,7 +40,7 @@ class GljController extends BaseController{
             gljLibId: gljLibId,
             compilationId: sessionCompilation._id,
             compilationName: sessionCompilation.name,
-            versionName: `纵横公路养护云版(${req.session.compilationVersion})`,
+            versionName: req.session.compilationVersion,
             LicenseKey:config.getLicenseKey(process.env.NODE_ENV),
             overWriteUrl: overWriteUrl,
         });

modules/complementary_ration_lib/controllers/compleViewController.js

@@ -48,7 +48,7 @@ class CompleViewController extends BaseController{
             redirectInstallation: redirectInstallation,
             gljLibId: gljLibId,
             compilationName: req.session.sessionCompilation.name,
-            versionName: `纵横公路养护云版(${req.session.compilationVersion})`,
+            versionName: req.session.compilationVersion,
             LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
         });
     }
@@ -65,7 +65,7 @@ class CompleViewController extends BaseController{
             redirectInstallation: redirectInstallation,
             gljLibId: gljLibId,
             compilationName: req.session.sessionCompilation.name,
-            versionName: `纵横公路养护云版(${req.session.compilationVersion})`,
+            versionName: req.session.compilationVersion,
             LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
         });
     }
@@ -82,7 +82,7 @@ class CompleViewController extends BaseController{
             redirectInstallation: redirectInstallation,
             gljLibId: gljLibId,
             compilationName: req.session.sessionCompilation.name,
-            versionName: `纵横公路养护云版(${req.session.compilationVersion})`,
+            versionName: req.session.compilationVersion,
             LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
         });
     }
@@ -98,7 +98,7 @@ class CompleViewController extends BaseController{
             redirectGlj: redirectGlj,
             redirectCoe: redirectCoe,
             compilationName: req.session.sessionCompilation.name,
-            versionName: `纵横公路养护云版(${req.session.compilationVersion})`,
+            versionName: req.session.compilationVersion,
             LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
         });
     }

modules/main/routes/main_route.js

@@ -28,7 +28,7 @@ module.exports =function (app) {
                         userID: req.session.sessionUser.id,
                         projectData: projectData,
                         compilationName: req.session.sessionCompilation.name,
-                        versionName: `纵横公路养护云版(${req.session.compilationVersion})`,
+                        versionName: req.session.compilationVersion,
                         projectReadOnly: projectReadOnly,
                         projectCooperate: projectCooperate,
                         LicenseKey:config.getLicenseKey(process.env.NODE_ENV),

modules/pm/controllers/pm_controller.js

@@ -274,7 +274,7 @@ module.exports = {
             rationValuation: JSON.stringify(rationValuation),
             engineeringList: JSON.stringify(engineering.List),
             compilationName: sessionCompilation.name,
-            versionName: `纵横公路养护云版(${request.session.compilationVersion})`,
+            versionName: request.session.compilationVersion,
             LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
         };
 

modules/users/controllers/boot_controller.js

@@ -49,7 +49,7 @@ class BootController extends BaseController {
             companyScaleList: userModel.companyScale,
             compilation: request.params.compilation,
             compilationName: request.session.sessionCompilation.name,
-            versionName: `纵横公路养护云版(${request.session.compilationVersion})`,
+            versionName: request.session.compilationVersion,
         };
         response.render('users/html/login-infoinput', renderData);
     }

modules/users/controllers/user_controller.js

@@ -39,7 +39,7 @@ class UserController extends BaseController {
             companyTypeList: userModel.companyType,
             companyScaleList: userModel.companyScale,
             compilationName: request.session.sessionCompilation.name,
-            versionName: `纵横公路养护云版(${request.session.compilationVersion})`,
+            versionName: request.session.compilationVersion,
         };
         response.render('users/html/user-info', renderData);
     }
@@ -119,7 +119,7 @@ class UserController extends BaseController {
             logList: logList,
             pages: pageData,
             compilationName: request.session.sessionCompilation.name,
-            versionName: `纵横公路养护云版(${request.session.compilationVersion})`,
+            versionName: request.session.compilationVersion,
         };
         response.render('users/html/user-safe', renderData);
     }
@@ -162,7 +162,7 @@ class UserController extends BaseController {
             userData: userData,
             compilationList: compilationList,
             compilationName: request.session.sessionCompilation.name,
-            versionName: `纵横公路养护云版(${request.session.compilationVersion})`,
+            versionName: request.session.compilationVersion,
         };
         response.render('users/html/user-buy', renderData);
     }
@@ -195,7 +195,7 @@ class UserController extends BaseController {
             preferenceSetting: preferenceSetting,
             compilationList: compilationList,
             compilationName: request.session.sessionCompilation.name,
-            versionName: `纵横公路养护云版(${request.session.compilationVersion})`,
+            versionName: request.session.compilationVersion,
         };
         response.render('users/html/user-set', renderData);
     }

modules/users/models/user_model.js

@@ -237,14 +237,14 @@ class UserModel extends BaseModel {
      * @return {version}
      */
     async getVersionFromUpgrade(ssoId, compilationId){
-        let version = '免费版';
+        let version = '纵横公路养护造价(免费云版)';
         let userData = await this.findDataBySsoId(ssoId);
         if (userData.upgrade_list !== undefined) {
             let compilationInfo = userData.upgrade_list.find(function (item) {
                 return item.compilationID === compilationId;
             });
             if (compilationInfo !== undefined && compilationInfo.isUpgrade === true) {
-                version = '专业版';
+                version = '纵横公路养护造价(专业云版)';
             }
         }
         return version;

public/web/id_tree.js

@@ -278,11 +278,13 @@ var idTree = {
                 }
                 tools.addUpdateDataForNextSibling(data, this.parent, this.getID());
                 let updateData = this.tree.getDataTemplate(this.getID(), this.parent.getParentID(), this.parent.getNextSiblingID());
-                //如果设置了专项暂定，则需要清空
-                if (this.data.specialProvisional) {
-                    this.data.specialProvisional = '';
+                if (!this.isLast()) {
+                    //如果设置了专项暂定，则需要清空
+                    if (this.data.specialProvisional) {
+                        this.data.specialProvisional = '';
+                        updateData.specialProvisional = '';
+                    }
                 }
-                updateData.specialProvisional = '';
                 data.push({type: 'update', data: updateData});
             }
             return data;
@@ -314,7 +316,13 @@ var idTree = {
                 if (this.preSibling.children.length !== 0) {
                     tools.addUpdateDataForNextSibling(data, this.preSibling.lastChild(), this.getID());
                 }
-                tools.addUpdateDataForNextSibling(data, this.preSibling, this.getNextSiblingID());
+                let updateData = this.tree.getDataTemplate(this.preSibling.getID(), this.preSibling.getParentID(), this.getNextSiblingID());
+                if (this.preSibling.data.specialProvisional) {
+                    //如果设置了专项暂定，则需要清空
+                    this.preSibling.data.specialProvisional = '';
+                    updateData.specialProvisional = '';
+                }
+                data.push({type: 'update', data: updateData});
                 data.push({type: 'update', data: this.tree.getDataTemplate(this.getID(), this.preSibling.getID(), this.tree.setting.rootId)});
             }
             return data;

web/building_saas/complementary_glj_lib/html/tools-gongliaoji.html

@@ -5,8 +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>
-    <!--inject:css-->
+    <title>工料机库编辑-纵横公路养护造价</title>    <!--inject:css-->
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css" type="text/css">
     <link rel="stylesheet" href="/web/building_saas/css/main.css" type="text/css">
     <link rel="stylesheet" href="/lib/font-awesome/font-awesome.min.css" type="text/css">

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>
     <!--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">

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>
     <!--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">
@@ -133,7 +133,7 @@
                                 <!-- 标签 -->
                                 <ul class="nav nav-tabs" role="tablist">
                                     <li class="nav-item">
-                                        <a class="nav-link active" id="linkGLJ" data-toggle="tab" href="#rDetail" role="tab">人材机</a>
+                                        <a class="nav-link active" id="linkGLJ" data-toggle="tab" href="#rDetail" role="tab">工料机</a>
                                     </li>
                                     <li class="nav-item">
                                         <a class="nav-link" id="linkFZDE" data-toggle="tab" href="#rDetail" role="tab">辅助定额调整</a>
@@ -511,7 +511,7 @@
     <div class="modal-dialog modal-lg" role="document" id="modalCon">
         <div class="modal-content" >
             <div class="modal-header">
-                <h5 class="modal-title">选择人材机</h5>
+                <h5 class="modal-title">选择工料机</h5>
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">&times;</span>
                 </button>

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>
     <!--inject:css-->
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="/web/building_saas/css/main.css">

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>
     <!--inject:css-->
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="/web/building_saas/css/main.css">
@@ -74,7 +74,7 @@
         <div class="modal-dialog" role="document">
             <div class="modal-content">
                 <div class="modal-header">
-                  <h5 class="modal-title">添加人材机</h5>
+                  <h5 class="modal-title">添加工料机</h5>
                   <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">×</span>
                   </button>
@@ -120,7 +120,7 @@
         <div class="modal-dialog" role="document">
             <div class="modal-content">
                 <div class="modal-header">
-                  <h5 class="modal-title">编辑人材机</h5>
+                  <h5 class="modal-title">编辑工料机</h5>
                   <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">×</span>
                   </button>

web/building_saas/complementary_ration_lib/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>定额库编辑器-纵横公路养护云版</title>
+    <title>定额库编辑器-纵横公路养护造价</title>
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
    <!-- <link rel="stylesheet" href="css/bootstrap/themes.css">-->
     <link rel="stylesheet" href="/web/building_saas/css/main.css">

web/building_saas/complementary_ration_lib/js/ration_glj.js

@@ -132,7 +132,7 @@ var rationGLJOprObj = {
                     return {
                         callback: function(){},
                         items: {
-                            "add": {name: "添加人材机", disabled: addDis, icon: "fa-plus", callback: function (key, opt) {
+                            "add": {name: "添加工料机", disabled: addDis, icon: "fa-plus", callback: function (key, opt) {
                                 //默认radio所有工料机
                                 gljSelOprObj.initRadio();
                                 gljSelOprObj.gljCurTypeId = null;
@@ -140,7 +140,7 @@ var rationGLJOprObj = {
                                 //弹出窗口
                                 $('#selGlj').modal('show');
                             }},
-                            "delete": {name: "删除人材机", disabled: delDis, icon: "fa-remove", callback: function (key, opt) {
+                            "delete": {name: "删除工料机", disabled: delDis, icon: "fa-remove", callback: function (key, opt) {
                                 rationGlj.splice(target.row, 1);
                                 me.updateRationItem(function(){
                                     me.sheet.getParent().focus();

web/building_saas/css/main.css

@@ -32,7 +32,7 @@ a{
 .login-bg{
     width: 100%;
     height: 100%;
-    background: #f2f6f5 url("login-bg.jpg") bottom center no-repeat;
+    background: #f2f6f5 url("login-bgp.jpg") bottom center no-repeat;
     background-size: 100% auto;
     display: inline-block;
     position: absolute;

web/building_saas/glj/js/project_glj_spread.js

@@ -154,7 +154,7 @@ ProjectGLJSpread.prototype.init = function () {
         // 如果类型为混凝土、砂浆、配合比、机械，则提示
         if (field === 'unit_price.market_price' && canNotChangeTypeId.indexOf(type) >= 0) {
             if(ratioData&&ratioData.length>0){
-                alert('当前人材机的市场单价由组成物计算得出，不可直接修改');
+                alert('当前工料机的市场单价由组成物计算得出，不可直接修改');
             }
         }
     });

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>
 
 
     <link rel="stylesheet" href="/lib/jquery-ui/jquery-ui.css" type="text/css">
@@ -993,7 +993,7 @@
         <div class="modal-dialog modal-lg" role="document" id="modalCon">
             <div class="modal-content" style="width: 1020px; left:50%; transform: translate(-50%,0%);">
                 <div class="modal-header">
-                    <h5 class="modal-title">请选择人材机</h5>
+                    <h5 class="modal-title">请选择工料机</h5>
                     <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                         <span aria-hidden="true">&times;</span>
                     </button>

web/building_saas/main/html/tender_price.html

@@ -9,12 +9,12 @@
         </div>
         <div class="input-group input-group-sm mr-2" style="width:240px">
             <div class="input-group-prepend">
-                <span class="input-group-text" id="inputGroup-sizing-sm">人材机单价调整系数</span>
+                <span class="input-group-text" id="inputGroup-sizing-sm">工料机单价调整系数</span>
             </div>
             <input id = 'gljPriceTenderCoe' type="number" step="0.1" class="form-control" placeholder="请输入系数" value="1">
         </div>
         <div class="btn-group mr-2">
-            <button type="button" class="btn btn-outline-primary btn-sm" id = "tenderGLJQuantity">调整人材机消耗</button>
+            <button type="button" class="btn btn-outline-primary btn-sm" id = "tenderGLJQuantity">调整工料机消耗</button>
             <button type="button" class="btn btn-outline-primary btn-sm" id = "tenderRationQuantity">调整子目工程量</button>
            <!-- <button type="button" class="btn btn-outline-primary btn-sm">反调单价</button>-->
             <button type="button" class="btn btn-outline-primary btn-sm" id = "tenderPrice">调价计算</button>

web/building_saas/main/js/models/calc_base.js

@@ -1118,7 +1118,7 @@ let cbParser = {
             }
         }
         for(let i = 0, len = exps.length; i < len; i++){
-            exp = exp.replace(new RegExp(exps[i].orgExp, 'g'), exps[i].newExp);
+            exp = exp.replace(new RegExp(`${exps[i].orgExp}\\b`, 'g'), exps[i].newExp);
         }
         return exp;
     },
@@ -1138,7 +1138,7 @@ let cbParser = {
             }
         }
         for(let i = 0, len = exps.length; i < len; i++){
-            exp = exp.replace(new RegExp(exps[i].orgExp, 'g'), exps[i].newExp);
+            exp = exp.replace(new RegExp(`${exps[i].orgExp}\\b`, 'g'), exps[i].newExp);
         }
         return exp;
     },

web/building_saas/main/js/views/fee_rate_view.js

@@ -554,7 +554,7 @@ var feeRateObject={
             subRateObject.initSubRateSpread(me.mainFeeRateData[row]);
         }
     },
-    setRateFromSub:function (subRate,value,subList) {
+    setRateFromSub:function (subRate,value,subList,editText) {//editText  下拉框选择的值，对于如“19.00”这样下拉选择项，value会变成19，所以在valueMap里找的时候要用editText去查找
          let me = feeRateObject,feeRate =  projectObj.project.FeeRate;
          let rates = feeRate.getActivateFeeRate().rates;
          let updateDatas = [];
@@ -575,7 +575,7 @@ var feeRateObject={
                          if(match == true) {//匹配上了，改对应的selected 为 true
                              if(o.name == value){
                                  o.selected = true;
-                                 valueArray.push(value);
+                                 valueArray.push(editText);//这里要用字符串去匹配而不是转换成数值的value
                                  setValue = true;
                              }else {
                                  o.selected = false;

web/building_saas/main/js/views/glj_view.js

@@ -1485,6 +1485,11 @@ $(function () {
                 gljOprObj.gljLibSheet.setActiveCell(0, 0);
                 gljOprObj.initSelection({row: 0});
             }
+        } else if ($('#actionType').val() === 'add') {
+            gljOprObj.locateZTree(null);
+            gljOprObj.gljLibSheet.showRow(0, GC.Spread.Sheets.VerticalPosition.top);
+            gljOprObj.gljLibSheet.setActiveCell(0, 0);
+            gljOprObj.initSelection({row: 0});
         } else {
             gljOprObj.showLibGLJSheetData();
         }

web/building_saas/main/js/views/main_tree_col.js

@@ -222,7 +222,7 @@ let MainTreeCol = {
             if(node.sourceType === projectObj.project.Bills.getSourceType()){
                 //如果是预算项目的，所有清单的数量1、数量2不做输入限制。
                 if(projectInfoObj.projectInfo.property && projectInfoObj.projectInfo.property.valuationType == "bill")  return false;
-                if(node.data.type==billType.FB||(node.data.type==billType.BILL&&MainTreeCol.readOnly.billsParent(node))){//大项费用、分部、清单父项行，工程量只读。
+                if(node.data.type==billType.DXFY||(node.data.type==billType.BILL&&MainTreeCol.readOnly.billsParent(node))){//大项费用、清单父项行，工程量只读。
                     return true;
                 }
             }else if(MainTreeCol.readOnly.glj(node)){

web/building_saas/main/js/views/project_view.js

@@ -1356,7 +1356,7 @@ var projectObj = {
                     callback: function (key, opt) {
                         let selected = project.mainTree.selected;
                         if(selected.data.calcBase&&selected.data.calcBase!=""){
-                            alert("当前有基数计算，不能插入定额/量价/人材机。");
+                            alert("当前有基数计算，不能插入定额/量价/工料机。");
                             return;
                         }
                         getGLJData('insertEquipment');// ProjectController.addRation(project, controller, rationType.volumePrice);
@@ -3155,6 +3155,7 @@ function disableTools(){
     $('a[data-target="#copy-lv"]').remove();
     $('#standardSelect').prop('disabled', 'disabled');
     $('#cascadeSet').prop('disabled', 'disabled');
+    $('#changeConfirm').prop('disabled', 'disabled');
     //计算程序标准
     $('#calcProgramFileSelect').prop('disabled', 'disabled');
     //调价

web/building_saas/main/js/views/std_billsGuidance_lib.js

@@ -286,9 +286,22 @@ const billsGuidance = (function () {
                 return -1;
             }
             let insertCode = orgNode.data.code ? orgNode.data.code : '';
-            //插入最顶层节点或者无编码，则直接插入到清单主树最后面
+            //插入最顶层节点或者无编码，对比选中节点后兄弟节点和同层主树节点的名称，插在的匹配的节点前面
+            function mathNext(selNode, compareNodes) {
+                let selNext = selNode.nextSibling;
+                while (selNext) {
+                    for (let i = 0; i < compareNodes.length; i++) {
+                        if (compareNodes[i].data.name === selNext.data.name) {
+                            return i;
+                        }
+                    }
+                    selNext = selNext.nextSibling;
+                }
+                return compareNodes.length;
+            }
             if (orgNode.depth() === 0 || insertCode === '') {
-                return peerNodes.length;
+                return mathNext(orgNode, peerNodes);
+                //return peerNodes.length;
             }
             for (let i = 0; i < peerNodes.length; i++) {
                 let thisNode = peerNodes[i];

web/building_saas/main/js/views/sub_fee_rate_views.js

@@ -152,7 +152,7 @@ var subRateObject={
                 t.value = value
             }
         }
-        feeRateObject.setRateFromSub(subRate,value,subList);
+        feeRateObject.setRateFromSub(subRate,value,subList,info.newValue);
     },
 
     destorySpreadView:function () {

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>
     <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">
@@ -634,7 +634,7 @@
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title">欢迎使用纵横公路养护云版</h5>
+                <h5 class="modal-title">欢迎使用纵横公路养护造价</h5>
             </div>
             <div class="modal-body">
                 <h5 class="my-3">首次加载例题，请稍候……</h5>

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>
     <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">

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>
     <!-- inject:css -->
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="/web/building_saas/css/main.css">
@@ -19,7 +19,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="mt-2 mr-3">
-                纵横云计价
+                纵横公路养护云版
             </h1>
             <div class="form-group">
                 <input id="inputEmail" class="form-control " name="inputEmail" placeholder="通行账号 邮箱/手机" autofocus="" />

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>
     <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">

web/users/html/user-info.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>
     <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">

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>
     <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">

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>
     <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">