liutk
/
internet-everythings-agricultural
1
0
Fork 0
Code Releases Activity

处理bug

develop
vine_liutk 2023-05-17 12:12:19 +08:00
parent 3a9cdc6d9b
commit 1a251a3625
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Admin/Controllers/DeviceController.php
View File

@ -201,7 +201,7 @@ class DeviceController extends AdminController
$monitorMode = $request->monitor_mode ?? 0; $monitorMode = $request->monitor_mode ?? 0;
$monitorMode = MonitorMode::find($monitorMode); $monitorMode = MonitorMode::find($monitorMode);
$data = $this->service->getMonitorModeDeviceChartConfig($monitorMode, $startTime, $endTime, 2); $data = $monitorMode ? $this->service->getMonitorModeDeviceChartConfig($monitorMode, $startTime, $endTime, 2):[];
return $this->response()->success($data); return $this->response()->success($data);
} }

1
app/Services/Admin/DeviceService.php
View File

@ -88,7 +88,6 @@ class DeviceService extends BaseService
public function getMonitorModeDeviceChartConfig($monitorMode, $startTime, $endTime, $columnNum = 3) public function getMonitorModeDeviceChartConfig($monitorMode, $startTime, $endTime, $columnNum = 3)
{ {
list($day, $diffDays, $xKeys) = $this->makeChartXkeys($startTime, $endTime); list($day, $diffDays, $xKeys) = $this->makeChartXkeys($startTime, $endTime);
switch($monitorMode->type){ switch($monitorMode->type){
case MonitorMode::TYPE_METEOROLOGICAL: case MonitorMode::TYPE_METEOROLOGICAL:
$dayliyReportQuery = MeteorologicalDailyReport::query(); $dayliyReportQuery = MeteorologicalDailyReport::query();