From 450ba732de4c1498be275813510637395eda3ced Mon Sep 17 00:00:00 2001 From: Jing Li Date: Fri, 4 Nov 2022 17:52:10 +0800 Subject: [PATCH] Update --- app/Http/Controllers/ChartController.php | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/app/Http/Controllers/ChartController.php b/app/Http/Controllers/ChartController.php index 1ccbd00..c05ec5b 100644 --- a/app/Http/Controllers/ChartController.php +++ b/app/Http/Controllers/ChartController.php @@ -145,6 +145,27 @@ class ChartController extends Controller ]; }); + if ($series->isNotEmpty()) { + $data = []; + + foreach ($series as $serie) { + foreach ($serie['data'] as $k => $v) { + if (is_null($v)) { + $data[$k] = $data[$k] ?? null; + } elseif (isset($data[$k])) { + $data[$k] += $v; + } else { + $data[$k] = $v; + } + } + } + + $series->push([ + 'name' => '总量', + 'data' => $data, + ]); + } + return [ 'x_axis' => array_values($quarters), 'series' => $series->values()->all(),