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

modules/users/facade/online_facade.js

@@ -12,7 +12,7 @@ let logs_model = mongoose.model("online_logs");
 
 async function getOnlineInfo(filter) {
     let datas = [];
-    let logs = await logs_model.find(filter);
+    let logs = await logs_model.find(filter, null, {sort:{_id:-1}});
     let less = 0;
     for(let l of logs){
         let d = getTimeString(l.online_times);
@@ -52,11 +52,13 @@ async function setOnlineTimes(userList,condition){
 
 
 function getTimeString(times) {
-    let s = "",perHour = 1000 * 60 * 60,perMin = 1000 * 60;
-    let hour = parseInt(times/perHour);
+    let s = "",perHour = 1000 * 60 * 60,perMin = 1000 * 60,perDay = 24*perHour;
+    let day = parseInt(times/perDay);
+    let hour = parseInt(parseInt(times % perDay) / perHour);
     let min = parseInt((times % perHour)/perMin);
     let less =  (times % perHour)%perMin;//不够一分钟的时间
+    if(day > 0) s = s+`${day}天`;
     if(hour > 0) s = s+`${hour}小时`;
     if(min > 0)  s= s+`${min}分钟`;
     return {s:s,less:less}
-}
+}

web/building_saas/report/js/rpt_print.js

@@ -93,7 +93,7 @@ let rptPrintHelper = {
 
 function getActualBorderStyle(cell, styles, mergeBorderStyle, pageBorderArea, borderStr) {
     let rst = styles[cell[JV.PROP_STYLE]][borderStr];
-    if (parseFloat(rst[JV.PROP_LINE_WEIGHT]) === 1) {
+    if (rst && parseFloat(rst[JV.PROP_LINE_WEIGHT]) === 1) {
         rst[JV.PROP_LINE_WEIGHT] = 0.5;
     }
     if (mergeBorderStyle) {