Merge branch '1.0.0_online' of http://192.168.1.41:3000/SmartCost/ConstructionCost into 1.0.0_online

Dockerfile

@@ -12,6 +12,6 @@ EXPOSE 6060
 
 ENV NODE_ENV=prod
 
-ENTRYPOINT babel-node server.js
-
+ENTRYPOINT ["babel-node"]
 
+CMD ["server.js"]

modules/users/models/user_model.js

@@ -322,14 +322,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/headerOpr.js

@@ -1,4 +1,4 @@
-'use strict';
+                                                                                                                                                                                                                                      'use strict';
 
 /**
  *
@@ -37,7 +37,7 @@ const CommonHeader = (function () {
                             '<h6 class="card-subtitle mb-2 text-muted">' + staff.category + '</h6> ' +
                             '</div> ' +
                             '<ul class="list-group list-group-flush"> ' +
-                            '<li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="腾讯QQ"><i class="fa fa-qq"></i> ' + staff.qq + '</li> ' +
+                            '<li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="腾讯QQ"><a target="_blank" href="http://wpa.qq.com/msgrd?v=3&uin=' + staff.qq + '&site=qq&menu=yes"><img border="0" src="http://wpa.qq.com/pa?p=2:' + staff.qq + ':51" alt="点击这里给我发消息" title="点击这里给我发消息"/></a></li> ' +
                             '<li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="手机号码"><i class="fa fa-tablet"></i> ' + staff.telephone + '</li> ' +
                             '<li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="固定电话"><i class="fa fa-phone"></i> ' + staff.phone + '</li> ' +
                             '</ul> </div> </div>';
@@ -83,4 +83,4 @@ CommonHeader.banNavigatorContextMenu();
 
 $(document).ready(function(){
     CommonHeader.addEventListener();
-});
+});

web/building_saas/pm/html/project-management.html

@@ -634,7 +634,7 @@
                 <div class="row">
                     <div class="col-6">
                         <h5>选择项目</h5>
-                        <div class="modal-auto-height">
+                        <div style="height: 400px">
                             <div id="replaceSpread" style="height: 100%"></div>
                         </div>
                         <div class="custom-control custom-checkbox">

web/building_saas/pm/js/pm_newMain.js

@@ -216,6 +216,8 @@ const projTreeObj = {
             this.bindEvent(newWorkBook);
             this.loadContextMenu();
             this.loadStartMenu();
+        }else {
+            workBook.refresh();
         }
         return newWorkBook;
     },

web/common/html/header.html

@@ -17,8 +17,8 @@
         <!--大屏菜单-->
         <ul class="nav navbar-nav" id="fluid-menu">
             <li class="nav-item dropdown" id="showqqgroup" >
-                <a class="nav-link text-danger" href="#"><i class="fa fa-qq" ></i> QQ交流群</a>
-                <div class="dropdown-menu p-3" id="qqgroup" style="width: 200px;top:36px">
+                <a class="nav-link text-danger" href="#"><i class="fa fa-qq" ></i> 群</a>
+                <div class="dropdown-menu p-3 dropdown-menu-right" id="qqgroup" style="width: 200px;top:36px">
                     <p class="text-center">
                         <a href="https://jq.qq.com/?_wv=1027&k=5XivMJY" target="_blank" class="btn btn-sm btn-outline-primary">点击加入QQ交流群</a>
                     </p>

web/users/html/login-sms.html

@@ -18,7 +18,7 @@
     <div class="container login-panel">
         <form class="form-signin">
             <h1 class="d-flex justify-content-center mb-0"><img src="/web/building_saas/img/building2.png" width="40" height="40" class="mr-3" style="margin-top: 5px"> 大司空云计价</h1>
-            <p class="text-center mb-4 text-muted">市政、房建、轨道、管廊线等专业工程计价软件</p>
+            <p class="text-center mb-4 text-muted">市政、房建、轨道、管廊管线等专业工程计价软件</p>
             <p class="mb-1">您关闭了「账号登录」，请通过手机验证码登录。</p>
             <p class="">请点击“获取验证码”，验证码将发送至手机 <%= mobile.substr(0, 3) + '****' + mobile.substr(7, 11) %>，注意查收。</p>
             <div class="form-row sms-login-modal">

web/users/html/login-ver.html

@@ -18,7 +18,7 @@
     <div class="container login-panel ver-panel">
             <h1 class="d-flex justify-content-center mb-0">
                 <img src="/web/building_saas/img/building2.png" width="40" height="40" class="mr-3" style="margin-top: 5px"> 大司空云计价</h1>
-            <p class="text-center mb-4 text-muted">市政、房建、轨道、管廊线等专业工程计价软件</p>
+            <p class="text-center mb-4 text-muted">市政、房建、轨道、管廊管线等专业工程计价软件</p>
             <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>

web/users/html/login.html

@@ -21,7 +21,7 @@
                 <img src="/web/building_saas/img/building.png" width="40" height="40" class="mr-3" style="margin-top: 5px">
                 大司空云计价
             </h1>
-            <p class="text-center mb-4 text-muted">市政、房建、轨道、管廊线等专业工程计价软件</p>
+            <p class="text-center mb-4 text-muted">市政、房建、轨道、管廊管线等专业工程计价软件</p>
             <p class="change-login-p">账号登录</p>
             <div class="form-group user-login-modal">
                 <input id="inputEmail" class="form-control " name="inputEmail" placeholder="邮箱/手机" autofocus="" />