Merge branch 'master' of http://gogs.renlianiot.com:4000/zmcoding/smart-tool-api

catch/screen/controller/Preview.php

@@ -141,13 +141,14 @@ class Preview extends CatchController
     public function deviceMonthAlarmData(){
         $xAxisData = [];
         $yAxisData = [];
-        for ($i=1; $i<=30; $i++){
-            $day = date('Y-m-d' ,strtotime( '+' . $i-30 .' days', time()));
-            array_push($xAxisData,$day);
-            $count=$this->alarmReportModel->dataRange()->where('alarm_time','between',[$day." 00:00:00",$day." 23:59:59"])->count();
+        for ($i=0; $i<=11; $i++){
+            $day = date('Y-m' ,strtotime( '-' . $i .' Months', time()));
+            // $nextday = date('Y-m' ,strtotime( '-' . $i-1 .' Months', time()));
+            array_unshift($xAxisData,$day);
+            // $count=$this->alarmReportModel->dataRange()->where('alarm_time','between',[$day."-01 00:00:00",$nextday."-01 00:00:00"])->count();
             //模拟数量
-            $count+=mt_rand(0,10);
-            array_push($yAxisData,$count);
+            $count=mt_rand(0,10);
+            array_unshift($yAxisData,$count);
         }
         $res=array('yAxisData'=>$yAxisData,'xAxisData'=>$xAxisData);
         return CatchResponse::success($res);