From 40f84c2db79f066ab679060dd2aaf91bb5613f46 Mon Sep 17 00:00:00 2001 From: Jing Li Date: Wed, 9 Nov 2022 14:03:07 +0800 Subject: [PATCH] Update --- app/Http/Controllers/ChartController.php | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/ChartController.php b/app/Http/Controllers/ChartController.php index 39a2865..f1f7587 100644 --- a/app/Http/Controllers/ChartController.php +++ b/app/Http/Controllers/ChartController.php @@ -86,24 +86,30 @@ class ChartController extends Controller foreach ($quarters as $key => $value) { $riceShrimpIndustry = $riceShrimpIndustries[$key] ?? null; - $areas[] = $riceShrimpIndustry?->area; - $productOutputs[] = $riceShrimpIndustry?->product_output; - $productValues[] = $riceShrimpIndustry?->product_value; + if ($riceShrimpIndustry) { + $areas[] = $riceShrimpIndustry->area; + $productOutputs[] = bcdiv($riceShrimpIndustry->product_output, 2000, 2); + $productValues[] = bcdiv($riceShrimpIndustry->product_value, 10000, 2);; + } else { + $areas[] = null; + $productOutputs[] = null; + $productValues[] = null; + } } return [ 'x_axis' => array_values($quarters), 'series' => [ [ - 'name' => '产值', + 'name' => '产值(万元)', 'data' => $productValues, ], [ - 'name' => '面积', + 'name' => '面积(亩)', 'data' => $areas, ], [ - 'name' => '产量', + 'name' => '产量(吨)', 'data' => $productOutputs, ], ],