diff --git a/plugin/admin/app/controller/VehicleController.php b/plugin/admin/app/controller/VehicleController.php index f8dc405..1203514 100644 --- a/plugin/admin/app/controller/VehicleController.php +++ b/plugin/admin/app/controller/VehicleController.php @@ -545,20 +545,14 @@ class VehicleController extends Crud $item = $vehicle::find($item['id']); $location = $hz::find($item->locations_id); $item['status_txt'] = $this->status[$lang][$item->status]??$this->status[$lang][0]; -// $item->status = "已到达迪拜仓库"; $item->location_name = $location ? $location->name : ''; $final_location = $hz::find($item->final_locations_id); -// log::info('final_location_name:',[$item->final_locations_id]); $item->final_location_name = $final_location ? $final_location->name : ''; $fbo_location = $hz::find($item->fbo_locations_id); $item->fbo_location_name = $fbo_location ? $fbo_location->name : ''; $location = $hz::find($item->locations_id); $item->location_name = $location ? $location->name : ''; -// $car = $vehicle::find($item->id); -// $item->status = $car ? $car->status : $item->status; -// $location = $hz::find($item->final_location_id); -// $item->final_location_name = $location ? $location->name : ''; $location = $hz::find($item->fbo_locations_id); $item->fbo_location_name = $location ? $location->name : ''; @@ -573,9 +567,6 @@ class VehicleController extends Crud Cache::set('img_dib_'.$item->id, $img_url, 86390); } - // $ossservice = new OssService(); - // $oss_picture = $ossservice->generatePrivateUrl($follow['picture'],86400); -// $item['img_url'] = $img_url; } catch (\Exception $e) { Log::error("Vehicle image URL generation failed:", [ 'error' => $e->getMessage(), diff --git a/plugin/admin/app/view/vehicle/index.html b/plugin/admin/app/view/vehicle/index.html index 05e1e26..a7bba5f 100644 --- a/plugin/admin/app/view/vehicle/index.html +++ b/plugin/admin/app/view/vehicle/index.html @@ -100,6 +100,7 @@ {type: "checkbox", align: "center"}, {title: translations.vin, align: "center", field: "vin"}, {title: translations.brand, align: "center", field: "brand"}, + {title: translations.model, align: "center", field: "model"}, // {title: translations.img_url, align: "center", field: "img_url"}, { title: translations.img_url, @@ -110,8 +111,8 @@ }, // {title: translations.status, align: "center", field: "status_txt"}, {title: translations.status, align: "center", field: "status_txt"}, - {title: translations.current_location, align: "center", field: "location_name"}, - // {title: translations.final_location, align: "center", field: "final_location_name"}, + // {title: translations.current_location, align: "center", field: "location_name"}, + {title: translations.final_location, align: "center", field: "final_location_name"}, // {title: translations.fbo_location, align: "center", field: "fbo_location_name"}, // {title: translations.created_at, align: "center", field: "created_at"}, // {title: translations.updated_at, align: "center", field: "updated_at"},