fyy

app/Http/Controllers/Api/ScreenController.php

@@ -52,7 +52,7 @@ class ScreenController extends BaseController
 
         if(! empty($result)){
             foreach ($result as $key => $value){
-                $result[$key]['rate'] = number_format($value['finished_num'] / $value['total'],2) * 100;
+                $result[$key]['rate'] = number_format($value['finished_num'] / $value['total'] * 100,2) * 1;
                 unset($result[$key]['total']);
                 unset($result[$key]['finished_num']);
             }
@@ -93,12 +93,60 @@ class ScreenController extends BaseController
         return $this->json_return(200,'',$arr);
     }
 
+    //假数据
+    public function output_value_month1(Request $request){
+        $date = date('Ymd',time());
+
+        $startDate = strtotime(date('Y-m-01 00:00:00', time())) * 1000;
+        $endDate = strtotime(date('Y-m-t 23:59:59', time())) * 1000;
+        $return = $this->getDayInMonth();
+
+        //获取数据
+        $data = SystemL::where('time','>=',$startDate)
+            ->where('time','<',$endDate)
+            ->where('data_point_name',SystemL::stop)
+            ->where('value',0)
+            ->select('time','value')
+            ->get()->toArray();
+
+        if(! empty($data)){
+            foreach ($data as $value){
+                $crt_time = date('Y-m-d',$value['time'] / 1000);
+                if(isset($return[$crt_time])){
+                    $return[$crt_time]['num'] += 1;
+                }
+            }
+            ksort($return);
+        }
+        $return = array_values($return);
+        return $this->json_return(200,'',$return);
+    }
+
+    function getDayInMonth(){
+        $startDate = strtotime(date('Y-m-01 00:00:00', time()));
+
+        // 获取当前日期
+        $currentDate = time();
+
+        $dates = array();
+        while ($currentDate >= $startDate) {
+            $t = date('Y-m-d', $currentDate);
+            $dates[$t] = [
+                'value' => $t,
+                'num' =>  0
+            ];
+            $currentDate = strtotime('-1 day', $currentDate);
+        }
+
+        return $dates;
+    }
+
     /**
      * 本月质量
      * @param Request $request
      * @return array
      */
-    public function output_value_month1(Request $request){
+    public function output_value_month11(Request $request){
         $date = date('Ymd',time());
 
         $startDate = strtotime(date('Y-m-01 00:00:00', time()));
@@ -193,8 +241,8 @@ class ScreenController extends BaseController
                     $result[$time]['output'] += 1;
                 }
             }
-            ksort($result);
         }
+        ksort($result);
         $result = array_values($result);
         return $this->json_return(200,'',$result);
     }
@@ -290,10 +338,10 @@ class ScreenController extends BaseController
                     "title"=> "压贴",
                     "rate"=> $rate
                 ],
-                [
-                    "title"=> "包装",
-                    "rate"=> $rate2
-                ]
+//                [
+//                    "title"=> "包装",
+//                    "rate"=> $rate2
+//                ]
             ],
         ];
         return $this->json_return(200,'',['data' => $arr]);