diff --git a/app/Exports/ParkingLicensePlateImportTemplateExport.php b/app/Exports/ParkingLicensePlateImportTemplateExport.php index dc2f77b..10ad906 100644 --- a/app/Exports/ParkingLicensePlateImportTemplateExport.php +++ b/app/Exports/ParkingLicensePlateImportTemplateExport.php @@ -9,7 +9,10 @@ class ParkingLicensePlateImportTemplateExport implements FromArray public function array(): array { return [ - ['No.', 'License Plate No.'], + [ + __exports('global.index'), + __exports('parking_space.license_plate') + ], ['1', '测A88888'] ]; } diff --git a/app/Imports/ParkingLicensePlateImport.php b/app/Imports/ParkingLicensePlateImport.php index 19723ce..cced85a 100644 --- a/app/Imports/ParkingLicensePlateImport.php +++ b/app/Imports/ParkingLicensePlateImport.php @@ -5,11 +5,11 @@ namespace App\Imports; use App\Models\ParkingLicensePlate; use App\Services\OperationLogService; use Maatwebsite\Excel\Concerns\ToModel; -use Maatwebsite\Excel\Concerns\WithHeadingRow; -class ParkingLicensePlateImport implements ToModel, WithHeadingRow +class ParkingLicensePlateImport implements ToModel { protected string $parkingSpaceType; + protected int $index = 1; /** * @var OperationLogService @@ -28,8 +28,12 @@ class ParkingLicensePlateImport implements ToModel, WithHeadingRow */ public function model(array $row) { - if (isset($row['license_plate_no']) && $row['license_plate_no']) { - $number = $row['license_plate_no']; + if ($this->index == 1) { + $this->index += 1; + return; + } + if (isset($row[1]) && $row[1]) { + $number = $row[1]; $where = [ 'number' => $number, 'space_type_id' => $this->parkingSpaceType diff --git a/resources/lang/en/exports.php b/resources/lang/en/exports.php index 694514a..2a4ecac 100644 --- a/resources/lang/en/exports.php +++ b/resources/lang/en/exports.php @@ -41,7 +41,7 @@ return [ ], 'parking_pattern' => [ 'model_name' => 'Activity Mode', - 'parking_space_number' => 'Parking Space No.', + 'parking_space_number' => 'Parking Space Number', 'parking_space_type' => 'Parking Space Type', 'create_pattern' => 'Activity Mode Creation Template', 'spaces_pattern' => 'Activity Mode Allocation Template'