mama/star-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FEAT] 優化廣告與機台管理介面及效能

Browse Source 
1. [廣告管理] 修復編輯素材時刪除按鈕顯示邏輯並優化預覽功能。
2. [廣告管理] 修正請求回傳格式為 JSON，解決 AJAX 解析錯誤。
3. [機台管理] 實作 Alpine.js 無感頁籤切換（機台列表與效期管理）。
4. [機台管理] 移除冗餘返回按鈕，改為動態標題與頁籤重設邏輯。
5. [機台管理] 統一後端查詢，減少切換分頁時的延遲感。
6. [商品管理] 支援商品圖片 WebP 自動轉換，並調整上傳大小限制 (10MB)。
7. [UI] 修正多個管理模組的 JS 時序競爭與 Preline HSSelect 重置問題。
This commit is contained in:
sky121113
2026-04-01 13:01:45 +08:00
parent 2e49129d77
commit 953d6a41f3
14 changed files with 387 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
app/Http/Controllers/Admin/MachineController.php
View File

@@ -8,9 +8,6 @@ use Illuminate\View\View;
class MachineController extends AdminController
{
/**
* 顯示所有機台列表或效期管理
*/
public function index(Request $request): View
{
$tab = $request->input('tab', 'list');
@@ -26,33 +23,27 @@ class MachineController extends AdminController
});
}
if ($tab === 'list') {
$machines = $query->when($request->status, function ($query, $status) {
return $query->where('status', $status);
})
->orderBy("last_heartbeat_at", "desc")->orderBy("id", "desc")
->paginate($per_page)
->withQueryString();
// 統一預加載貨道統計資料 (無論在哪一個頁籤)
$machines = $query->withCount(['slots as total_slots'])
->withCount(['slots as expired_count' => function ($q) {
$q->where('expiry_date', '<', now()->toDateString());
}])
->withCount(['slots as pending_count' => function ($q) {
$q->whereNull('expiry_date');
}])
->withCount(['slots as warning_count' => function ($q) {
$q->whereBetween('expiry_date', [now()->toDateString(), now()->addDays(7)->toDateString()]);
}])
// 只有在機台列表且有狀態篩選時才套用狀態過濾
->when($request->status && $tab === 'list', function ($q, $status) {
return $q->where('status', $status);
})
->orderBy("last_heartbeat_at", "desc")
->orderBy("id", "desc")
->paginate($per_page)
->withQueryString();
return view('admin.machines.index', compact('machines', 'tab'));
} else {
// 效期管理模式：獲取機台及其貨道統計
$machines = $query->withCount(['slots as total_slots'])
->withCount(['slots as expired_count' => function ($q) {
$q->where('expiry_date', '<', now()->toDateString());
}])
->withCount(['slots as pending_count' => function ($q) {
$q->whereNull('expiry_date');
}])
->withCount(['slots as warning_count' => function ($q) {
$q->whereBetween('expiry_date', [now()->toDateString(), now()->addDays(7)->toDateString()]);
}])
->orderBy("last_heartbeat_at", "desc")->orderBy("id", "desc")
->paginate($per_page)
->withQueryString();
return view('admin.machines.index', compact('machines', 'tab'));
}
return view('admin.machines.index', compact('machines', 'tab'));
}
/**