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

monitor history

develop
panliang 2023-07-28 12:22:17 +08:00
parent b01e8e9aac
commit 09a24aaa83
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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'),
]))

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

@ -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);