|
@@ -8,6 +8,8 @@ use app\admin\model\Users as Usersmodel;
|
|
|
use app\admin\model\Groups as GroupsModel;
|
|
use app\admin\model\Groups as GroupsModel;
|
|
|
use app\admin\model\Servicetimelog as ServicetimelogModel;
|
|
use app\admin\model\Servicetimelog as ServicetimelogModel;
|
|
|
use app\admin\model\Kfstatetimes as KfstatetimesModel;
|
|
use app\admin\model\Kfstatetimes as KfstatetimesModel;
|
|
|
|
|
+use app\admin\model\Office;
|
|
|
|
|
+
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 报表类
|
|
* 报表类
|
|
@@ -145,9 +147,9 @@ class Report extends Base
|
|
|
$retall = $this->reportDataFormat($ret1, $ret2, $uidarr['objs'], $zoneArray1, $limit, $offset);
|
|
$retall = $this->reportDataFormat($ret1, $ret2, $uidarr['objs'], $zoneArray1, $limit, $offset);
|
|
|
return json($retall);
|
|
return json($retall);
|
|
|
} else {
|
|
} else {
|
|
|
- $title = ['账号', '姓名', '日期', '首次登陆时间', '最后登出时间', '登陆时长', '休息时长', '隐身时长', '在线占比', '休息占比', '', '隐身占比','xx','bb'];
|
|
|
|
|
|
|
+ $title = ['账号', '姓名', '日期', '首次登陆时间', '最后登出时间', '登陆时长', '休息时长', '隐身时长', '在线占比', '休息占比', '', '隐身占比'];
|
|
|
$retall = $this->reportDataFormat($ret1, $ret2, $uidarr['objs'], $zoneArray1, $limit, $offset, true);
|
|
$retall = $this->reportDataFormat($ret1, $ret2, $uidarr['objs'], $zoneArray1, $limit, $offset, true);
|
|
|
- exportExcel($title, $retall);
|
|
|
|
|
|
|
+ (new Office())->outdata('数据导出', $retall, $title, ['account', 'uname', 'day', 'of0', 'of1', 'all', '1', '2', '3', 's1p', 's2p', 's3p']);
|
|
|
return true;
|
|
return true;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -183,7 +185,7 @@ class Report extends Base
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
usort($all_last, function ($a, $b) {
|
|
usort($all_last, function ($a, $b) {
|
|
|
- return $a == $b ? 0 : ($a > $b ? 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) {
|
|
@@ -193,6 +195,8 @@ class Report extends Base
|
|
|
$all_last[$key]['s1p'] = perDisplay($all_last[$key]['s1p']);
|
|
$all_last[$key]['s1p'] = perDisplay($all_last[$key]['s1p']);
|
|
|
$all_last[$key]['s2p'] = perDisplay($all_last[$key]['s2p']);
|
|
$all_last[$key]['s2p'] = perDisplay($all_last[$key]['s2p']);
|
|
|
$all_last[$key]['s3p'] = perDisplay($all_last[$key]['s3p']);
|
|
$all_last[$key]['s3p'] = perDisplay($all_last[$key]['s3p']);
|
|
|
|
|
+ unset($all_last[$key]['uid']);
|
|
|
|
|
+ unset($all_last[$key]['0']);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
//导出数据
|
|
//导出数据
|