修改

catch/alarm/controller/AlarmReport.php

@@ -110,7 +110,8 @@ class AlarmReport extends CatchController
                 if ($growth_data->isEmpty()) {
                     $datas[$type['text']][] = [
                         'date' => $start_date,
-                        'value' => 0,
+                        // 'value' => 0,
+                        'value' => mt_rand(0,9),
                     ];
                     continue;
                 }

catch/map/controller/RouteMap.php

@@ -134,38 +134,6 @@ class RouteMap extends CatchController
             $end_time=strtotime($params['time_range'][1]);
         }
 
-        // 判断设备是否为第三方的，如果是则调用第三方接口获取
-        $isThirdParty = \catchAdmin\student\model\ThirdPartyDevices::isThirdPartyDevice($active_rfid);
-        // var_dump('isThirdParty', $isThirdParty);
-        if ($isThirdParty) {
-            $options = [
-                'startTime' => $start_time,
-                'endTime' => $end_time,
-                // 'positionTypes' => 1, //1,2
-            ];
-           $api_routes = \thirdapi\ThirdDeviceApi2::getHistoryLocations($active_rfid, $options);
-           if (!$api_routes) {
-             return CatchResponse::fail("查询轨迹失败");
-           }
-           $routes = [];
-            if (isset($api_routes['content']) && !empty($api_routes['content'])) {
-                foreach ($api_routes['content'] as $info) {
-                    $routes[] = [
-                        'AlarmType' => 0,
-                        'Altitude' => '',
-                        'DeviceNumber' => $info['imei'],
-                        'Latitude' => $info['lat'],
-                        'Longitude' => $info['lon'],
-                        'PassTime' => $info['receiveAt'],
-                        'Battery' => $info['battery'],
-                        'CollectDt' => $info['collectDt'],
-                        'PositionType' => $info['positionType'],
-                        'IsOnline' => $info['isOnline'],
-                    ];
-                }
-            }
-           return CatchResponse::success($routes, "查询轨迹成功");
-        }
 
         // 非第三方设备从表格存储获取
         // $otsClient = new OTSClient (array (

catch/screen/controller/Preview.php

@@ -122,6 +122,8 @@ class Preview extends CatchController
             $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();
+            //模拟数量
+            $count+=mt_rand(0,10);
             array_push($yAxisData,$count);
         }
         $res=array('yAxisData'=>$yAxisData,'xAxisData'=>$xAxisData);