fyy

app/Http/Controllers/Api/ScreenController.php

@@ -243,7 +243,7 @@ class ScreenController extends BaseController
         $today = SystemL::where('time','>=',$timestamp_today_start * 1000)
             ->where('time','<=',$timestamp_today_end * 1000)
             ->select('device_name','data_point_name','time')
-            ->whereIn('data_point_name',[SystemL::run,SystemL::work,SystemL::stop])
+            ->whereIn('data_point_name',[SystemL::run,SystemL::work,SystemL::stop,SystemL::standBy])
             ->get()->toArray();
         //组织当日数据
         $this->fillData($today,1,$models);
@@ -263,7 +263,7 @@ class ScreenController extends BaseController
             $list_week = SystemL::where('time','>=',$previousWeekStartTimeStamp)
                 ->where('time','<=',$previousWeekEndTimeStamp)
                 ->select('device_name','data_point_name')
-                ->whereIn('data_point_name',[SystemL::run,SystemL::work,SystemL::stop])
+                ->whereIn('data_point_name',[SystemL::run,SystemL::work,SystemL::stop,SystemL::standBy])
                 ->get()->toArray();
             //组织上周数据
             $this->fillData($list_week,2,$models);
@@ -289,7 +289,7 @@ class ScreenController extends BaseController
             $list_month = SystemL::where('time','>=',$previousMonthStartTimeStamp)
                 ->where('time','<=',$previousMonthEndTimeStamp)
                 ->select('device_name','data_point_name')
-                ->whereIn('data_point_name',[SystemL::run,SystemL::work,SystemL::stop])
+                ->whereIn('data_point_name',[SystemL::run,SystemL::work,SystemL::stop,SystemL::standBy])
                 ->get()->toArray();
             //组织上月数据
             $this->fillData($list_month,3,$models);
@@ -380,7 +380,7 @@ class ScreenController extends BaseController
                 $start_time_tmp = date("Y-m-d H:i:s", $value['time'] / 1000);
                 $start_time[$value['device_name']] = $start_time_tmp;
             }
-            if($value['data_point_name'] == SystemL::run){
+            if($value['data_point_name'] == SystemL::run || $value['data_point_name'] == SystemL::standBy){
                 //运行次数
                 if(isset($run_time[$value['device_name']])){
                     $run_time[$value['device_name']] += 1;
@@ -388,7 +388,7 @@ class ScreenController extends BaseController
                     $run_time[$value['device_name']] = 1;
                 }
             }
-            if($value['data_point_name'] == SystemL::work){
+            if($value['data_point_name'] == SystemL::standBy){
                 //工作次数
                 if(isset($process_time[$value['device_name']])){
                     $process_time[$value['device_name']] += 1;