Merge remote-tracking branch 'origin/master' into dev

modules/users/controllers/cld_controller.js

@@ -207,6 +207,7 @@ class CLDController {
             userData.create_time = date.getFullYear() + '年' +
                 (date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1) : date.getMonth()+1) + '月' +
                 (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) + '日';
+            userData.all_online_times = online_facade.getTimeString(userData.all_online_times).s;
 
             //获取编办列表
             let compilationModel = new CompilationModel();

modules/users/facade/online_facade.js

@@ -4,7 +4,8 @@
 
 module.exports = {
     setOnlineTimes:setOnlineTimes,
-    getOnlineInfo:getOnlineInfo
+    getOnlineInfo:getOnlineInfo,
+    getTimeString:getTimeString,
 };
 
 let mongoose = require("mongoose");
@@ -47,6 +48,7 @@ async function setOnlineTimes(userList,condition){
         u._doc.filter = JSON.stringify(filter);
         if(result.length > 0)  u._doc.online_times = getTimeString(result[0].total).s;
         u._doc.online_list = await this.getOnlineInfo(filter);
+        u._doc.all_online_times = getTimeString(u.all_online_times).s;
     }
 }
 

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

@@ -3311,6 +3311,7 @@ function doAfterImportPosition(positionData){
         }
         //插入清单节点
         projectObj.project.Bills.tree.insertByDatas(positionData.insert.bill);
+        projectObj.project.Bills.datas.push(...positionData.insert.bill);
         //插入主树节点
         let newNodes = projectObj.project.mainTree.insertByDatas(positionData.insert.bill);
         for(let node of newNodes){
@@ -3646,7 +3647,6 @@ function changeCalcBaseFeeRate(toggle) {
         $('#mixedHeader').hide();
         $('#normalHeader').show();
         $('#calcBaseFeeRate').find('.modal-title').text('计算基数选择').show();
-        $('#calcBaseFeeRate').find('.modal-body').find('button:first').hide();
         $('#calcBaseFeeRate').find('.modal-body').find('ul:first').show();
         $('#calcBaseExp').remove();
         let $textarea = $('<textarea>').attr('id', 'calcBaseExp').prop('rows', 2).addClass('form-control').css('resize', 'none');

web/users/html/index.html

@@ -379,7 +379,7 @@
                               <a  href="http://ol.smartcost.com.cn" target="_blank">纵横造价网络版</a>
                            </li>
                            <li>
-                              <a  href="https://smartcost.com.cn/train" target="_blank">纵横专业培训</a>
+                              <a  href="https://smartcost.com.cn/train" target="_blank">呆瓜培训</a>
                            </li>
                            <li>
                               <a  href="https://smartcost.com.cn/contact2" target="_blank">联系我们</a>