1

app/adminapi/logic/WorkbenchLogic.php

@@ -60,8 +60,8 @@ class WorkbenchLogic extends BaseLogic
             'customer'=>self::customer(),
             //农机手
             'agricultural_data'=> self::agricultural(),
-            'bake_data'=> self::agricultural(),
-            'air_data'=> self::agricultural(),
+            'bake_data'=> self::bake(),
+            'air_data'=> self::air(),
         ];
     }
 
@@ -314,8 +314,82 @@ class WorkbenchLogic extends BaseLogic
             $monthFat = $i . '月';
             array_push($monthData, $monthFat);
         }
-        $data['valueData'] = [0,0,0,4,10];
+
+        $data['monthData'] = $monthData;
+        $valueData=[];
+        foreach($monthArr as &$v){
+            $date_arr = getMonthFirstAndLastDay($nowYear,$v);
+            $lastDate = $date_arr['lastDay'];
+            $lasttime = strtotime($date_arr['lastDay'].' 23:59:59');
+
+            $where=[];
+            $where[]=['type','=',1];
+            $where[]=['status','=',1];
+            $where[]=['create_time','<=',$lasttime];
+            $count = UserService::where($where)->count();
+            $valueData[]=$count;
+        }
+        $data['valueData'] = $valueData;
+        return $data;
+    }
+
+    public static function bake(){
+        $nowYear = date('Y');
+        $nowMonth = date('n');
+
+        $monthData = [];
+        $monthArr = [];
+        for ($i = 1; $i <= $nowMonth; $i++) {
+            array_push($monthArr, $i);
+            $monthFat = $i . '月';
+            array_push($monthData, $monthFat);
+        }
+
         $data['monthData'] = $monthData;
+        $valueData=[];
+        foreach($monthArr as &$v){
+            $date_arr = getMonthFirstAndLastDay($nowYear,$v);
+            $lastDate = $date_arr['lastDay'];
+            $lasttime = strtotime($date_arr['lastDay'].' 23:59:59');
+
+            $where=[];
+            $where[]=['type','=',2];
+            $where[]=['status','=',1];
+            $where[]=['create_time','<=',$lasttime];
+            $count = UserService::where($where)->count();
+            $valueData[]=$count;
+        }
+        $data['valueData'] = $valueData;
+        return $data;
+    }
+
+    public static function air(){
+        $nowYear = date('Y');
+        $nowMonth = date('n');
+
+        $monthData = [];
+        $monthArr = [];
+        for ($i = 1; $i <= $nowMonth; $i++) {
+            array_push($monthArr, $i);
+            $monthFat = $i . '月';
+            array_push($monthData, $monthFat);
+        }
+
+        $data['monthData'] = $monthData;
+        $valueData=[];
+        foreach($monthArr as &$v){
+            $date_arr = getMonthFirstAndLastDay($nowYear,$v);
+            $lastDate = $date_arr['lastDay'];
+            $lasttime = strtotime($date_arr['lastDay'].' 23:59:59');
+
+            $where=[];
+            $where[]=['type','=',3];
+            $where[]=['status','=',1];
+            $where[]=['create_time','<=',$lasttime];
+            $count = UserService::where($where)->count();
+            $valueData[]=$count;
+        }
+        $data['valueData'] = $valueData;
         return $data;
     }
 }