修改

catch/alarm/model/get/AlarmReportGet.php

@@ -37,7 +37,7 @@ trait AlarmReportGet
    */
   public function getRealnameAttr($value)
   {
-   return '测试学生';
+   return '测试设备';
    
   }
   /**

catch/report/model/Report.php

@@ -165,8 +165,12 @@ class Report extends CatchModel
             $end_time = date('Y-m-d');
         }
         // 获取设备类型
-        $device_types = $this->getDeviceType();
-
+        $device_types = array(
+            array('text'=>'法兰'),
+            array('text'=>'液压泵'),
+            array('text'=>'液压扳手'),
+        );
+        // var_dump($device_types);
         $data = [];
         $device_model = new DeviceModel();
         while ($start_time <= $end_time) {
@@ -176,17 +180,18 @@ class Report extends CatchModel
                     $data[$type['text']]['name'] = $type['text'];
                 }
                 
-                $count = $device_model->dataRange()
-                                    ->where('device_type', $type['value'])
-                                    ->whereBetweenTime('created_at', 0, date('Y-m-d 23:59:59', strtotime($start_time)))
-                                    ->count();
+                // $count = $device_model->dataRange()
+                //                     ->where('device_type', $type['value'])
+                //                     ->whereBetweenTime('created_at', 0, date('Y-m-d 23:59:59', strtotime($start_time)))
+                //                     ->count();
+                $count=mt_rand(1,10);
                 // var_dump($device_model->getLastSql());
                 $data[$type['text']]['data'][$start_time] = $count;
             }
 
             $start_time = date('Y-m-d', strtotime($start_time . ' +1 day'));
         }
-
+        
         return array_values($data);
     }
 

catch/screen/controller/Preview.php

@@ -31,7 +31,43 @@ class Preview extends CatchController
     }
     
 
-
+    function randFloat($min=0, $max=1){
+        return $min + mt_rand()/mt_getrandmax() * ($max-$min);
+      }
+     /**
+     * 获取地图上所有设备地址 以及信号统计 井类型统计
+     * 
+     */
+    public function getDeviceAddressList(){
+        // $deviceList=$this->mainDevice->select()->toArray();
+        $start=$_REQUEST['start']?$_REQUEST['start']*10000:0;
+        $limit=$_REQUEST['limit']?:10000;
+  
+        // $deviceList=$this->deviceModel->dataRange()->limit($start,$limit)->cache(60)->column('id,point_x,point_y,addr,well_type');
+        // var_dump($deviceList);
+        $addrList=array();
+        for($i=0;$i<50;$i++){
+            $a=mt_rand();
+            $b=mt_getrandmax();
+            $c=$a/$b;
+            $lng=mt_rand(100, 118)+$c;
+            $lat=mt_rand(25, 35)+$c;
+            // var_dump($lng);
+            // var_dump($lat);
+            $item=array('value'=>[$lng, $lat],'name'=>"测试风场".$i,'address'=>'风场位置'.$i,'number'=>mt_rand(0, 20));
+            array_push($addrList,$item);
+        }
+        // foreach($deviceList as $val){
+        //     $item=array('value'=>[$val['point_y'], $val['point_x']],'name'=>$val['addr']);
+        //     array_push($addrList,$item);
+        // }
+        $res['addrList']=$addrList;
+        // $res['total']=$this->deviceModel->dataRange()->count();
+        $res['total']=80;
+        return CatchResponse::success($res);
+          
+    }   
+    
     /**
      * 获取智能插座统计
      * 

catch/screen/route.php

@@ -12,7 +12,7 @@
 // you should use `$router`
 $router->group(function () use ($router){
 	// preview路由
-
+	$router->get('preview/getDeviceAddressList', '\catchAdmin\screen\controller\Preview@getDeviceAddressList');
 	$router->get('preview/monthAlarmData', '\catchAdmin\screen\controller\Preview@deviceMonthAlarmData');
 
 	//围栏实时告警数据