diff --git a/app/Admin/Controllers/DeviceController.php b/app/Admin/Controllers/DeviceController.php
index a1e989e..828a2f1 100644
--- a/app/Admin/Controllers/DeviceController.php
+++ b/app/Admin/Controllers/DeviceController.php
@@ -176,8 +176,8 @@ class DeviceController extends AdminController
         return $this->basePage()->title('')->body([
             \amisMake()->grid()->columns([
                 \amisMake()->Form()->title('搜索条件')->mode('inline')->body([
-                    amisMake()->SelectControl('monitor_mode', '监测点位')->size('md')->options($options)->selectFirst(true),
-                    \amisMake()->DateRangeControl('date_range', '时间范围')->value('today,today'),
+                    amisMake()->SelectControl('monitor_mode', '监测点位')->size('md')->options($options)->selectFirst(true)->required(),
+                    \amisMake()->DateRangeControl('date_range', '时间范围')->clearable(false)->value('today,today')->required(),
                     amis('submit')->label(__('admin.search'))->level('primary'),
                 ])->target('meteorological_chart'),
             ]),
@@ -193,8 +193,13 @@ class DeviceController extends AdminController
 
     public function deviceChart(Request $request)
     {
-        $dateRange = $request->date_range ?? '';
-        list($startTime, $endTime) = explode(',', $dateRange);
+        $dateRange = $request->input('date_range');
+        if (!$dateRange) {
+            $startTime = now()->startOfDay()->timestamp;
+            $endTime = now()->endOfDay()->timestamp;
+        } else {
+            list($startTime, $endTime) = explode(',', $dateRange);
+        }
         $startTime = date('Y-m-d', $startTime);
         $endTime = date('Y-m-d', $endTime);
 
diff --git a/app/Filters/Admin/MonitorModeFilter.php b/app/Filters/Admin/MonitorModeFilter.php
index 8903517..abb8fa8 100644
--- a/app/Filters/Admin/MonitorModeFilter.php
+++ b/app/Filters/Admin/MonitorModeFilter.php
@@ -38,6 +38,6 @@ class MonitorModeFilter extends ModelFilter
      * 分组
      */
     public function groupTags($groupTags){
-        return $this->whereRaw("FIND_IN_SET(group_tags,'$groupTags')");
+        return $this->whereRaw("FIND_IN_SET(group_tags,$groupTags)");
     }
 }