cqp 1 день тому
батько
коміт
e7a05d641b
1 змінених файлів з 4 додано та 1 видалено
  1. 4 1
      app/Service/ReportFormsService.php

+ 4 - 1
app/Service/ReportFormsService.php

@@ -831,7 +831,8 @@ class ReportFormsService extends Service
         $time1 = $data['time'][0] / 1000;
         $time2 = $data['time'][1] / 1000;
         $model = SystemL::where('time','>=', $time1)
-            ->where('time','<=',$time2);
+            ->where('time','<=',$time2)
+            ->where('time','<=',time());
 //        if(! empty($data['title'])) $model->whereIn('device_name',$data['title']);
         $result = $model->select('device_name','time','value','data_point_name')
             ->get()
@@ -1012,6 +1013,7 @@ class ReportFormsService extends Service
         $device = (new EquipmentService())->getDeviceList();
         $result = SystemL::where('time','>=',$data['time'][0])
             ->where('time','<',$data['time'][1])
+            ->where('time','<=',time())
             ->whereIn('data_point_name',[SystemL::run, SystemL::run_one])
             ->whereIn('device_name',array_keys($device))
             ->select('device_name','time','value')
@@ -1086,6 +1088,7 @@ class ReportFormsService extends Service
         //获取数据
         $result = SystemL::where('time','>=',$data['time'][0])
             ->where('time','<',$data['time'][1])
+            ->where('time','<=',time())
             ->whereIn('device_name', $device_name)
             ->select('device_name','time','value','data_point_name')
             ->get()->toArray();