修改

catch/alarm/controller/ControlAlarm.php

@@ -83,7 +83,16 @@ class ControlAlarm extends CatchController
             ->order('created_at', 'desc')
             ->select();
        
-      
+        // $list=[
+        //     ['created_at'=>'2023-11-13 08:15:40','plate_no'=>'江北003931','address'=>'HS0577科创北路与布政东路交叉口'],
+        //     ['created_at'=>'2023-11-13 09:25:10','plate_no'=>'江北019216','address'=>'HS0086联丰中路如家酒店门口-FX1'],
+        //     ['created_at'=>'2023-11-13 09:32:13','plate_no'=>'江北028692','address'=>'JB287中官西路广汽丰田对面1'],
+        //     ['created_at'=>'2023-11-13 10:15:34','plate_no'=>'江北023166','address'=>'BL031学院路-学院南路东南-FX1'],
+        //     ['created_at'=>'2023-11-13 11:13:25','plate_no'=>'江北003931','address'=>'HZW兴慈三路——七塘公路'],
+        //     ['created_at'=>'2023-11-13 12:20:06','plate_no'=>'江北025106','address'=>'江北新增12月份JB38姚江花园门口1'],
+        //     ['created_at'=>'2023-11-13 12:21:20','plate_no'=>'江北003931','address'=>'JB新增点002长兴东路与洪都路2'],
+        //     ['created_at'=>'2023-11-13 13:15:12','plate_no'=>'江北003931','address'=>'FH27桥西岸路与岳林路1-FXQ'],
+        // ];
         // return $rows;
         return CatchResponse::success($list);
     }
@@ -108,6 +117,8 @@ class ControlAlarm extends CatchController
             $xAxisData[]=$val['address'];
             $yAxisData[]=$val['num'];
         }
+        // $xAxisData=['HS0577科创北路与布政东路交叉口','HS0086联丰中路如家酒店门口','JB287中官西路广汽丰田对面1','BL031学院路-学院南路东南-FX1','HZW兴慈三路——七塘公路','江北新增12月份JB38姚江花园门口1','JB新增点002长兴东路与洪都路2'];
+        // $yAxisData=['70','65','47','40','35','20','9'];
         // return $rows;
         return CatchResponse::success(['xAxisData'=>$xAxisData,'yAxisData'=>$yAxisData]);
     }

catch/map/controller/RouteMap.php

@@ -647,7 +647,7 @@ class RouteMap extends CatchController
         // ];
         
         if($params['name']){
-            $mac=Db::table('stations')->whereLike('name',$params['name'])->value('mac');
+            $mac=Db::table('stations')->where('name',$params['name'])->value('mac');
             $cond['RF_ID']=['=',$mac];
         }
         if($params['rfid_sn']){

catch/report/controller/Report.php

@@ -54,6 +54,8 @@ class Report extends CatchController
         // oci_free_statement($stid);
         // oci_close($conn);
         $alarmCount=Db::table('control_alarm')->whereBetweenTime('created_at', $start_time,$end_time)->count();
+        // $passCount=2000000;
+        // $alarmCount=26;
         $data = array(
             'passCount'=>(string)$passCount,
             'alarmCount'=>(string)$alarmCount,