From 09a24aaa83307bbbc0f29ada6d0fcb687ab16378 Mon Sep 17 00:00:00 2001
From: panliang <1163816051@qq.com>
Date: Fri, 28 Jul 2023 12:22:17 +0800
Subject: [PATCH] monitor history

---
 app/Admin/Controllers/DeviceController.php | 4 ++--
 app/Services/Admin/DeviceService.php       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Admin/Controllers/DeviceController.php b/app/Admin/Controllers/DeviceController.php
index 8abac77..322a918 100644
--- a/app/Admin/Controllers/DeviceController.php
+++ b/app/Admin/Controllers/DeviceController.php
@@ -2,7 +2,7 @@
 
 namespace App\Admin\Controllers;
 
-use Slowlyo\OwlAdmin\Renderers\{Button, Form, Page, TableColumn, TextControl, Json, Component, CRUDTable, Card, Video, DateRangeControl, Mapping, SelectControl};
+use Slowlyo\OwlAdmin\Renderers\{Button, Form, Page, TableColumn, TextControl, Json, Component, CRUDTable, Card, Video, InputDatetimeRange, DateTimeControl, Mapping, SelectControl};
 use Slowlyo\OwlAdmin\Controllers\AdminController;
 use App\Services\Admin\DeviceService;
 use App\Admin\Components;
@@ -153,7 +153,7 @@ class DeviceController extends AdminController
             ->headerToolbar([])
             ->filter($this->baseFilter()->actions([])->body([
                 amisMake()->SelectControl('monitor_mode', '点位名称')->size('md')->options($query->toArray())->selectFirst(true),
-                DateRangeControl::make()->name('date')->label('日期')->maxDate('now')->size('md'),
+                InputDatetimeRange::make()->name('date')->label('日期')->maxDate('now')->size('md'),
                 Button::make()->label(__('admin.reset'))->actionType('clear-and-submit'),
                 Component::make()->setType('submit')->label(__('admin.search'))->level('primary'),
             ]))
diff --git a/app/Services/Admin/DeviceService.php b/app/Services/Admin/DeviceService.php
index 73579dc..f93034f 100644
--- a/app/Services/Admin/DeviceService.php
+++ b/app/Services/Admin/DeviceService.php
@@ -37,8 +37,8 @@ class DeviceService extends BaseService
                 if ($base && $url) {
                     // 查看历史监控 &starttime=2023_02_02_14_00_00&endtime=2023_02_02_15_00_00
                     if ($history && $start && $end) {
-                        $start_format = Carbon::createFromTimestamp($start)->startOfDay()->format('Y_m_d_H_i_s');
-                        $end_format = Carbon::createFromTimestamp($end)->endOfDay()->format('Y_m_d_H_i_s');
+                        $start_format = Carbon::createFromTimestamp($start)->format('Y_m_d_H_i_s');
+                        $end_format = Carbon::createFromTimestamp($end)->format('Y_m_d_H_i_s');
                         $url .= (str_contains($url, '?') ? '&' : '?') .'starttime=' . $start_format . '&endtime=' . $end_format;
                     }
                     $src = $base . base64_encode($url);