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; } /**