From 5aa84af65968dd5214b4f6e58f0c4d60c4e35a3e Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq.com>
Date: Thu, 2 Jul 2026 15:49:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96vip=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=EF=BC=8C=E8=BD=A6=E4=BD=8D=E7=9B=B8=E6=9C=BA?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Exports/ParkingCameraExport.php  |  2 ++
 app/Exports/ParkingVipListExport.php | 27 ++++++++++++++++-----------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/app/Exports/ParkingCameraExport.php b/app/Exports/ParkingCameraExport.php
index d270b35..502daa3 100644
--- a/app/Exports/ParkingCameraExport.php
+++ b/app/Exports/ParkingCameraExport.php
@@ -21,6 +21,7 @@ class ParkingCameraExport implements FromArray, WithHeadings
                 ))->optionItems($item);
                 $data[] = [
                     'id'                    => $index,
+                    'parking'               => $oldItem['parking'],
                     'floor'                 => $oldItem['floor'],
                     'number'                => $oldItem['number'],
                     'camera_ip'             => $oldItem['camera_ip'],
@@ -44,6 +45,7 @@ class ParkingCameraExport implements FromArray, WithHeadings
     {
         return [
             __('exports.global.index'),
+            __('exports.whitelist.parking'),
             __('exports.parking_space.floor'),
             __('exports.parking_camera.number'),
             __('exports.parking_camera.camera_ip'),
diff --git a/app/Exports/ParkingVipListExport.php b/app/Exports/ParkingVipListExport.php
index aab0983..9ff0ade 100644
--- a/app/Exports/ParkingVipListExport.php
+++ b/app/Exports/ParkingVipListExport.php
@@ -5,23 +5,28 @@ namespace App\Exports;
 use App\Models\AdminUsers;
 use App\Models\ParkingLicensePlate;
 use App\Models\ParkingVipList;
-use Illuminate\Database\Eloquent\Collection;
-use Maatwebsite\Excel\Concerns\FromCollection;
+use Maatwebsite\Excel\Concerns\FromArray;
 use Maatwebsite\Excel\Concerns\WithHeadings;
 
-class ParkingVipListExport implements FromCollection, WithHeadings
+class ParkingVipListExport implements FromArray, WithHeadings
 {
     /**
-     * @return Collection
+     * @return array
      */
-    public function collection(): Collection
+    public function array(): array
     {
-        return ParkingVipList::all()->each(function ($item) {
-            $item['license'] = ParkingLicensePlate::getNumber($item['license_id']);
-            $item['user_id'] = AdminUsers::getUsername(
-                $item['user_id']
-            );
-        });
+        $list = ParkingVipList::all()->toArray();
+        $data = [];
+        $index = 1;
+        foreach ($list as $item) {
+            $data[] = [
+                $index,
+                ParkingLicensePlate::getNumber($item['license_id']),
+                AdminUsers::getUsername($item['user_id']),
+            ];
+            $index += 1;
+        }
+        return $data;
     }
 
     /**