后端流量记录排序改为更精确时间优先(避免只按 record_at 导致排序/分钟不准)
StatController.php (E:/code/php/Xboard-new/app/Http/Controllers/V1/User/StatController.php:22)
StatController.php (E:/code/php/Xboard-new/app/Http/Controllers/V2/Admin/StatController.php:242)
2. 流量资源新增 display_at(优先 updated_at,回退 created_at/record_at)
TrafficLogResource.php (E:/code/php/Xboard-new/app/Http/Resources/TrafficLogResource.php:19)
TrafficLogResource.php (E:/code/php/Xboard-new/app/Http/Resources/TrafficLogResource.php:43)
3. 管理端前端(打包产物)流量列改为:时间/上行/下行/倍率/节点/设备/总计,时间显示 YYYY/MM/DD HH:mm
index.js (E:/code/php/Xboard-new/public/assets/admin/assets/index.js:16)
This commit is contained in:
@@ -19,7 +19,9 @@ class StatController extends Controller
|
||||
->with(['server:id,name'])
|
||||
->where('user_id', $userId)
|
||||
->where('record_at', '>=', $startDate)
|
||||
->orderBy('record_at', 'DESC')
|
||||
->orderByDesc('updated_at')
|
||||
->orderByDesc('created_at')
|
||||
->orderByDesc('record_at')
|
||||
->get();
|
||||
|
||||
$deviceMap = $this->buildNodeDeviceMap($userId);
|
||||
|
||||
@@ -239,7 +239,9 @@ class StatController extends Controller
|
||||
$userId = (int) $request->input('user_id');
|
||||
$records = StatUser::query()
|
||||
->with(['server:id,name'])
|
||||
->orderBy('record_at', 'DESC')
|
||||
->orderByDesc('updated_at')
|
||||
->orderByDesc('created_at')
|
||||
->orderByDesc('record_at')
|
||||
->where('user_id', $userId)
|
||||
->paginate($pageSize);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user