debug

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

@@ -273,7 +273,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;

web/building_saas/complementary_glj_lib/html/tools-gongliaoji.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" type="text/css">
     <link rel="stylesheet" href="/web/building_saas/css/main.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">

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

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

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

@@ -1482,8 +1482,12 @@ $(function () {
             gljOprObj.gljLibSheet.setActiveCell(index, 0);
             gljOprObj.initSelection({row: index});
             gljOprObj.gljLibSpresd.focus(true);
-        }
-        else gljOprObj.showLibGLJSheetData();
+        } 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();
     });
 
     $('#glj_tree_div').on('hidden.bs.modal', 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">

web/building_saas/pm/js/pm_newMain.js

@@ -1040,7 +1040,7 @@ const projTreeObj = {
                 hitinfo.sheet.repaint();
             }
         };
-        TreeNodeCellType.prototype.processMouseMove = function (hitInfo) {
+        /*TreeNodeCellType.prototype.processMouseMove = function (hitInfo) {
             let sheet = hitInfo.sheet;
             let div = sheet.getParent().getHost();
             let canvasId = div.id + "vp_vp";
@@ -1054,7 +1054,7 @@ const projTreeObj = {
                 canvas.style.cursor='default';
             }
             return false;
-        };
+        };*/
         TreeNodeCellType.prototype.processMouseEnter = function (hitinfo) {
             let text = hitinfo.sheet.getText(hitinfo.row, hitinfo.col);
             let value = hitinfo.sheet.getValue(hitinfo.row, hitinfo.col);

web/building_saas/pm/js/pm_share.js

@@ -398,7 +398,7 @@ const pmShare = (function () {
                 hitinfo.sheet.repaint();
             }
         };
-        TreeNodeCellType.prototype.processMouseMove = function (hitInfo) {
+        /*TreeNodeCellType.prototype.processMouseMove = function (hitInfo) {
             let sheet = hitInfo.sheet;
             let div = sheet.getParent().getHost();
             let canvasId = div.id + "vp_vp";
@@ -411,7 +411,7 @@ const pmShare = (function () {
                 canvas.style.cursor='default';
             }
             return false;
-        };
+        };*/
         TreeNodeCellType.prototype.processMouseEnter = function (hitinfo) {
             let text = hitinfo.sheet.getText(hitinfo.row, hitinfo.col);
             let value = hitinfo.sheet.getValue(hitinfo.row, hitinfo.col);

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">
@@ -16,7 +16,7 @@
 <body>
     <div class="container">
         <form class="form-signin" method="post" onsubmit="return false">
-            <h1 class="d-flex justify-content-center mb-5">纵横建筑云计价</h1>
+            <h1 class="d-flex justify-content-center mb-5">纵横建筑计价</h1>
             <div class="form-group">
                 <input id="inputEmail" class="form-control " name="inputEmail" placeholder="邮箱/手机" autofocus="" />
                 <small id="emailHelp" class="form-text text-danger"></small>

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