Merge branch 'master' of http://192.168.1.41:3000/SmartCost/ConstructionCost

logs/online_logs.js

@@ -33,13 +33,13 @@ async function saveOnlineTime(req) {
         let record = await logs_model.findOne(condition);
         if(record){ //如果找到，则累加
             await logs_model.update(condition,{$inc:{'online_times' : online_times }});
-            await user_model.update(userCondition,{$inc:{'online_times' : online_times }});
+            await user_model.update(userCondition,{$inc:{'online_times' : online_times, 'all_online_times' : online_times}});
         }else {//如果没找到，则新增一条记录
             condition["online_times"] = online_times;
             let today = moment(dataString).toDate();
             condition["dateTime"] = +today;
             await logs_model.create(condition);
-            await user_model.update(userCondition,{'online_times' : online_times});
+            await user_model.update(userCondition,{'online_times' : online_times,$inc:{'all_online_times' : online_times }});
         }
     }catch (e){
         console.log("统计登录时间错误，online_times值："+online_times);

modules/all_models/user.js

@@ -121,10 +121,14 @@ let schema = {
     },
     welcomeShowTime:String,
     token: String,
-    online_times: {
+    online_times: {//最近一天的登录时长累计
         type: Number,
         default: 0
-    }, //最近一天的登录时长累计
+    }, 
+    all_online_times: {//所有登录时长累计
+        type: Number,
+        default: 0
+    }, 
     is_cld: {
         type: Number,
         default: 0, // 0为普通用户，时间戳代表CLD剔除用户并按时间戳排序

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;
     }
 }
 

public/web/tree_sheet/tree_sheet_helper.js

@@ -177,6 +177,7 @@ var TREE_SHEET_HELPER = {
                 }
                 if(colSetting.visible == false) return;//隐藏列不做其它操作
                 if (colSetting.data.getText && Object.prototype.toString.apply(colSetting.data.getText) === "[object Function]") {
+                    if(colSetting.data.field=="quantity") sheet.setFormatter(iRow, iCol, '@');//输入 % 号时会出现奇怪的现像， %一直追加在后面
                     cell.value(colSetting.data.getText(node));
                 }else if((colSetting.data.field=="mainBills"||(['outPutMaxPrice', 'outPutLimitPrice'].includes(colSetting.data.field)))&&MainTreeCol.mainBillsEnable(node)){//主要清单有三种状态，所以直接显示就好，不走最后的逻辑
                     cell.value(node.data[colSetting.data.field]===undefined?false:node.data[colSetting.data.field]);

web/building_saas/complementary_glj_lib/js/init.js

@@ -11,7 +11,7 @@ const GLJ_INIT = (() => {
     </select>`;
     // 设置分享按钮
     const shareHtml = `
-    <span id="share-tip" class="ml-2" data-toggle="tooltip" data-placement="bottom" data-original-title="">
+    <span id="share-tip" style="width: 100%" class="ml-2" data-toggle="tooltip" data-placement="bottom" data-original-title="">
         <a id="init-share" href="javascript:;" class="btn btn-xs btn-primary ${isReadOnly ? 'disabled' : ''}"><i class="fa fa-share-alt"></i> 分享</a>
     </span>`;
     const html = `

web/building_saas/complementary_ration_lib/html/dinge.html

@@ -97,13 +97,13 @@
             <div class="row" id="dataRow">
                 <div class="main-side p-0" id="leftContent" style="width: 25%; height: 100%; overflow: hidden">
                     <div style="width: 99%; float: left">
-                        <div class="tab-bar">
-                            <a href="javascript:void(0);" id="tree_Insert" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="插入"><i class="fa fa-plus" aria-hidden="true"></i></a>
-                            <a href="javascript:void(0);" id="tree_remove" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="删除"><i class="fa fa-remove" aria-hidden="true"></i></a>
-                            <a href="javascript:void(0);" id="tree_upLevel" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="升级"><i class="fa fa-arrow-left" aria-hidden="true"></i></a>
-                            <a href="javascript:void(0);" id="tree_downLevel" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="降级"><i class="fa fa-arrow-right" aria-hidden="true"></i></a>
-                            <a href="javascript:void(0);" id="tree_downMove" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="下移"><i class="fa fa-arrow-down" aria-hidden="true"></i></a>
-                            <a href="javascript:void(0);" id="tree_upMove" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="上移"><i class="fa fa-arrow-up" aria-hidden="true"></i></a>
+                        <div class="toolsbar">
+                            <a href="javascript:void(0);" id="tree_Insert" class="btn btn-light btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="插入"><i class="fa fa-plus" aria-hidden="true"></i></a>
+                            <a href="javascript:void(0);" id="tree_remove" class="btn btn-light btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="删除"><i class="fa fa-remove" aria-hidden="true"></i></a>
+                            <a href="javascript:void(0);" id="tree_upLevel" class="btn btn-light btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="升级"><i class="fa fa-arrow-left" aria-hidden="true"></i></a>
+                            <a href="javascript:void(0);" id="tree_downLevel" class="btn btn-light btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="降级"><i class="fa fa-arrow-right" aria-hidden="true"></i></a>
+                            <a href="javascript:void(0);" id="tree_downMove" class="btn btn-light btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="下移"><i class="fa fa-arrow-down" aria-hidden="true"></i></a>
+                            <a href="javascript:void(0);" id="tree_upMove" class="btn btn-light btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="上移"><i class="fa fa-arrow-up" aria-hidden="true"></i></a>
                         </div>
                         <div class="tab-content" id="sectionSpread" style="overflow: hidden">
                         </div>

web/building_saas/complementary_ration_lib/js/init.js

@@ -19,7 +19,7 @@ const initialization = (() => {
         </select>`;
         // 设置分享按钮
         const shareHtml = `
-        <span id="share-tip" class="ml-2" data-toggle="tooltip" data-placement="bottom" data-original-title="">
+        <span id="share-tip" style="width: 100%" class="ml-2" data-toggle="tooltip" data-placement="bottom" data-original-title="">
             <a id="init-share" href="javascript:;" class="btn btn-xs btn-primary"><i class="fa fa-share-alt"></i> 分享</a>
         </span>`;
         const html = `

web/building_saas/main/html/main.html

@@ -1341,7 +1341,7 @@
         </div>
         <div class="modal-footer">
           <a href="javascript:void(0);" class="btn btn-primary" id="property_default" data-dismiss="modal"
-            style="margin-right: 485px">恢复默认系统设置</a>
+            style="margin-right: 475px">恢复默认系统设置</a>
           <a href="javascript:void(0);" class="btn btn-primary" id="property_ok" data-dismiss="modal">确定</a>
           <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
         </div>

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

@@ -296,7 +296,7 @@ var projectObj = {
         let searchStdBillsAndUpdate = function (stdCode, formatCode) {
             let orgCode = node.data.code?node.data.code.substr(0, 9):"";
             if (projectObj.project.projectInfo.engineeringInfo.bill_lib.length === 0 || updateCodeCheck(value,stdCode === orgCode)) {
-                normalUpdate(node,value,stdCode === orgCode);
+                normalUpdate(node,formatCode,stdCode === orgCode);
             } else if (projectObj.project.projectInfo.engineeringInfo.bill_lib.length > 0) {
                 let libId = projectObj.project.projectInfo.engineeringInfo.bill_lib[0].id;
                 CommonAjax.post('/stdBillsEditor/getStdBillsByCode', {userId: userID, billsLibId: libId, code: stdCode}, function (data) {
@@ -363,7 +363,7 @@ var projectObj = {
                     return;
                 } else {
                     hintBox.infoBox("系统提示","已存在该编码的清单，将自动修改编码后3位，是否继续？",2,function () {
-                        let newFormatCode = project.Bills.newFormatCode(stdMatchCode);
+                        let newFormatCode = project.Bills.newFormatCode(stdMatchCode,node.data.code);// 传入node.data.code表示排除本身源始值 （ps:存在：001，002  把 002改成001， 这时候应该自动编成002）
                         searchStdBillsAndUpdate(stdMatchCode, newFormatCode);
                     },function () {
                         me.mainController.refreshTreeNode([node], false);
@@ -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>