diff --git a/app/Http/Controllers/ChartController.php b/app/Http/Controllers/ChartController.php index e58de8d..281b7fb 100644 --- a/app/Http/Controllers/ChartController.php +++ b/app/Http/Controllers/ChartController.php @@ -55,7 +55,7 @@ class ChartController extends Controller return [ 'x_axis' => array_values($quarters), - 'series' => $series->values()->all(), + 'series' => $series->sortKeys()->values()->all(), ]; } @@ -145,27 +145,6 @@ 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(),