vali 6 жил өмнө
parent
commit
ee3f0cc887

+ 2 - 0
application/admin/controller/Report.php

@@ -189,6 +189,7 @@ class Report extends Base
             return $a['uid'] == $b['uid'] ? 0 : ($a['uid'] > $b['uid'] ? 1 : -1);
             return $a['uid'] == $b['uid'] ? 0 : ($a['uid'] > $b['uid'] ? 1 : -1);
         });
         });
 
 
+        
         foreach ($all_last as $key => $val) {
         foreach ($all_last as $key => $val) {
             $all_last[$key]['1'] = secendToHourMinit($all_last[$key]['1']);
             $all_last[$key]['1'] = secendToHourMinit($all_last[$key]['1']);
             $all_last[$key]['2'] = secendToHourMinit($all_last[$key]['2']);
             $all_last[$key]['2'] = secendToHourMinit($all_last[$key]['2']);
@@ -199,6 +200,7 @@ class Report extends Base
             unset($all_last[$key]['uid']);
             unset($all_last[$key]['uid']);
             unset($all_last[$key]['0']);
             unset($all_last[$key]['0']);
         }
         }
+        
 
 
         //导出数据
         //导出数据
         if ($returnAll) {
         if ($returnAll) {

+ 3 - 2
application/admin/view/report/attendancereport.html

@@ -65,12 +65,13 @@
                         <th data-field="day">日期</th>
                         <th data-field="day">日期</th>
                         <th data-field="of1">首次登陆时间</th>
                         <th data-field="of1">首次登陆时间</th>
                         <th data-field="of0">最后登出时间</th>
                         <th data-field="of0">最后登出时间</th>
-                        <th data-field="1">登陆时长</th>
+                        <th data-field="1">在线时长</th>
                         <th data-field="3">休息时长</th>
                         <th data-field="3">休息时长</th>
                         <th data-field="2">隐身时长</th>
                         <th data-field="2">隐身时长</th>
+                        <th data-field="all">总登陆时长</th>
                         <th data-field="s1p">在线占比</th>
                         <th data-field="s1p">在线占比</th>
-                        <th data-field="s3p">休息占比</th>
                         <th data-field="s2p">隐身占比</th>
                         <th data-field="s2p">隐身占比</th>
+                        <th data-field="s3p">休息占比</th>
                         </thead>
                         </thead>
                     </table>
                     </table>
                 </div>
                 </div>