From 666cd6fa8866298b3138ac5f91a83d96a4b4bf13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=9D=99?= Date: Tue, 16 May 2023 17:13:55 +0800 Subject: [PATCH] Update --- app/Http/Controllers/ChartController.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/ChartController.php b/app/Http/Controllers/ChartController.php index 9bf35ca..6a039d2 100644 --- a/app/Http/Controllers/ChartController.php +++ b/app/Http/Controllers/ChartController.php @@ -69,7 +69,9 @@ class ChartController extends Controller */ public function riceShrimpWeeklyPrice(Request $request) { - $weeks = Keywords::where('type_key', 'weeks-per-year')->pluck('name', 'key'); + $now = now(); + + $weeks = Keywords::where('type_key', 'weeks-per-year')->pluck('name', 'id'); $years = RiceShrimpWeeklyPrice::select('year') ->groupBy('year') @@ -98,6 +100,7 @@ class ChartController extends Controller }); return [ + 'c_week' => ($now->month - 1) * 4 + ($now->weekOfMonth > 4 ? 4 : $now->weekOfMonth), 'x_axis' => $weeks->values(), 'series' => $series->sortKeys()->values()->all(), ];