测试数据

app/Service/ScreenService.php

@@ -329,7 +329,6 @@ class ScreenService extends Service
     public function screenHistoryList($data){
         if(empty($data['screen_id'])) return [false,'请选择仓或台'];
         if(empty($data['device_type_id'])) return [false,'设备类型不能为空'];
-        if($data['device_type_id'] == DeviceType::type_one && empty($data['type']))  return [false,'传感器类型时需传递TYPE'];
         if(empty($data['time'][0]) || empty($data['time'][1])) return [false,'时间不能为空'];
 
         //获取仓或台的设备ID

app/Service/Service.php

@@ -272,7 +272,7 @@ class Service
 
         // 将日期时间格式化为特定格式
         $formattedDate = $dateTime->format('Y-m-d');
-        $formattedDate1 = $dateTime->format('Y-m-d');
+        $formattedDate1 = $dateTime1->format('Y-m-d');
 
         $return = [];
         $return[] = strtotime($formattedDate . " 00:00:00");