From c739a5a7bf1f0277871b2e4e52bba8cb2b55155a Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq.com>
Date: Mon, 14 Sep 2026 10:45:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=81=9C=E8=BD=A6=E5=9C=BA=E5=8D=A0=E7=94=A8?=
 =?UTF-8?q?=E7=8E=87=E5=9B=BE=E6=A0=87=E6=8E=92=E5=BA=8F=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Admin/OccupancyRateController.php | 4 +++-
 app/Services/ParkingOccupancyRateService.php           | 6 ++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Admin/OccupancyRateController.php b/app/Http/Controllers/Admin/OccupancyRateController.php
index 61cc6ed..9c61c39 100644
--- a/app/Http/Controllers/Admin/OccupancyRateController.php
+++ b/app/Http/Controllers/Admin/OccupancyRateController.php
@@ -99,7 +99,8 @@ class OccupancyRateController extends BaseController
                 'name',
                 'id'
             );
-            foreach ($list as &$item) {
+            $colorArr = $this->service->colorArr;
+            foreach ($list as $index => &$item) {
                 $time = $item['time'];
                 $time_type = $item['time_type'];
                 if ($time_type == 1) {
@@ -122,6 +123,7 @@ class OccupancyRateController extends BaseController
                     unset($space_type_list[$key]['space_type_id']);
                 }
                 $item['space_type_list'] = $space_type_list;
+                $item['color'] = $colorArr[$index];
                 unset($item['time_type'], $item['floor_id']);
             }
             return $this->responseService->success($list);
diff --git a/app/Services/ParkingOccupancyRateService.php b/app/Services/ParkingOccupancyRateService.php
index 5161bd4..99dbe46 100644
--- a/app/Services/ParkingOccupancyRateService.php
+++ b/app/Services/ParkingOccupancyRateService.php
@@ -10,6 +10,12 @@ class ParkingOccupancyRateService extends BaseService
 {
     protected string $menuTitle = 'occupancy_rate';
 
+    public array $colorArr = [
+        '#73c0de', '#fac858', '#5470c6', '#67c23a', '#ff0000', '#349c32',
+        '#ffff00', '#0000ff', '#00ffff', '#ca00c9', '#ce4478', '#31dc21',
+        '#f9d1c1', '#5e4439', '#21375f', '#63beef', '#60c6ad', '#a7a7a7',
+    ];
+
     public static function createData(
         $space_type_id,
         $floor_id,