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

bug monitor_modes

develop
panliang 2023-05-29 12:50:08 +08:00
parent 9cd82c64bc
commit 58c83b5f7d
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -176,8 +176,8 @@ class DeviceController extends AdminController
return $this->basePage()->title('')->body([ return $this->basePage()->title('')->body([
\amisMake()->grid()->columns([ \amisMake()->grid()->columns([
\amisMake()->Form()->title('搜索条件')->mode('inline')->body([ \amisMake()->Form()->title('搜索条件')->mode('inline')->body([
amisMake()->SelectControl('monitor_mode', '监测点位')->size('md')->options($options)->selectFirst(true), amisMake()->SelectControl('monitor_mode', '监测点位')->size('md')->options($options)->selectFirst(true)->required(),
\amisMake()->DateRangeControl('date_range', '时间范围')->value('today,today'), \amisMake()->DateRangeControl('date_range', '时间范围')->clearable(false)->value('today,today')->required(),
amis('submit')->label(__('admin.search'))->level('primary'), amis('submit')->label(__('admin.search'))->level('primary'),
])->target('meteorological_chart'), ])->target('meteorological_chart'),
]), ]),
@ -193,8 +193,13 @@ class DeviceController extends AdminController
public function deviceChart(Request $request) public function deviceChart(Request $request)
{ {
$dateRange = $request->date_range ?? ''; $dateRange = $request->input('date_range');
list($startTime, $endTime) = explode(',', $dateRange); if (!$dateRange) {
$startTime = now()->startOfDay()->timestamp;
$endTime = now()->endOfDay()->timestamp;
} else {
list($startTime, $endTime) = explode(',', $dateRange);
}
$startTime = date('Y-m-d', $startTime); $startTime = date('Y-m-d', $startTime);
$endTime = date('Y-m-d', $endTime); $endTime = date('Y-m-d', $endTime);

2
app/Filters/Admin/MonitorModeFilter.php
View File

@ -38,6 +38,6 @@ class MonitorModeFilter extends ModelFilter
* 分组 * 分组
*/ */
public function groupTags($groupTags){ public function groupTags($groupTags){
return $this->whereRaw("FIND_IN_SET(group_tags,'$groupTags')"); return $this->whereRaw("FIND_IN_SET(group_tags,$groupTags)");
} }
} }