From 32226b4b92caea4f241efc51c1a7752f312cb91d Mon Sep 17 00:00:00 2001 From: vine_liutk <961510893@qq.com> Date: Tue, 29 Aug 2023 11:10:29 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/RegionController.php | 2 +- app/Http/Resources/RegionResource.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Api/RegionController.php b/app/Http/Controllers/Api/RegionController.php index a9738b6..82c5c89 100644 --- a/app/Http/Controllers/Api/RegionController.php +++ b/app/Http/Controllers/Api/RegionController.php @@ -28,7 +28,7 @@ class RegionController extends Controller public function show($id) { - $info = Region::with(['currentPlant'])->show()->findOrFail($id); + $info = Region::with(['currentPlant', 'monitorModes'])->show()->findOrFail($id); return $this->json(RegionResource::make($info)); } diff --git a/app/Http/Resources/RegionResource.php b/app/Http/Resources/RegionResource.php index f07e681..5141a3a 100644 --- a/app/Http/Resources/RegionResource.php +++ b/app/Http/Resources/RegionResource.php @@ -27,6 +27,7 @@ class RegionResource extends JsonResource 'position_x'=> $this->position_x, 'position_y'=> $this->position_y, 'canvasbox'=> '1350,900', + 'monitor_modes' => MonitorModeResource::collection($this->whenLoaded('monitorModes')), ]; } }