From c8d56f595650b5e8c47fa91d06194978b9a39cf1 Mon Sep 17 00:00:00 2001 From: vine_liutk <961510893@qq.com> Date: Thu, 24 Nov 2022 12:55:11 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/DeviceController.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/DeviceController.php b/app/Http/Controllers/DeviceController.php index caa47b8..2868208 100644 --- a/app/Http/Controllers/DeviceController.php +++ b/app/Http/Controllers/DeviceController.php @@ -299,13 +299,14 @@ class DeviceController extends Controller 'co2', 'noise', 'illumination', - 'daily_rainfall', 'pm25', - 'pm10', + 'pm10', ]; if($diffDays) { + $getArr[] = 'daily_rainfall'; $modelQuery = MeteorologicalMonitoringDailyLog::query()->whereBetween('monitored_at', [$startTime, $endTime]); }else{ + $getArr[] = 'current_rainfall'; $modelQuery = MeteorologicalMonitoringLog::query()->whereDate('monitored_at', $day); } break;