修改

catch/logs/model/MaintainLog.php

@@ -35,6 +35,7 @@ class MaintainLog extends Model
     public function getList()
     {
         return $this->catchSearch()
+            ->append(['run_time'])
             ->order($this->aliasField('id'), 'desc')
             ->paginate();
     }
@@ -46,4 +47,12 @@ class MaintainLog extends Model
     {
         return $value ? date('Y-m-d H:i:s',$value) : '';
     }
+        /**
+     * 获取部门名称（文本）
+     */
+    public function getRunTimeAttr()
+    {
+       
+        return 1200;
+    }
 }

catch/report/controller/Report.php

@@ -23,8 +23,7 @@ class Report extends CatchController
      */
     public function homePageCountData(Request $request)
     {
-        // 基站数据
-        // $station_data = $this->reportModel->getStationCountData() ?: [];
+
         // 部门数据
         $department_data = $this->reportModel->getDepartmentCountData() ?: [];
         // 用户数据
@@ -55,4 +54,155 @@ class Report extends CatchController
         
         return CatchResponse::success($data);
     }
+
+    /**
+     * 设备类型统计
+     * @param Request $request 
+     */
+    public function hydraulicCount(Request $request)
+    {
+        $list =array(
+            ['type'=>'液压泵','name'=>'在线','value'=>103],
+            ['type'=>'液压泵','name'=>'离线','value'=>17],
+            ['type'=>'液压泵','name'=>'其他','value'=>28],
+            ['type'=>'液压泵','name'=>'总数','value'=>148],
+
+            ['type'=>'液压扳手','name'=>'合格','value'=>140],
+            ['type'=>'液压扳手','name'=>'不合格','value'=>24],
+            ['type'=>'液压扳手','name'=>'总数','value'=>164],
+        );
+        $pump_bar=array(
+            'xData'=>['总数','B1','B2','B3','B4','B5',],
+            'yData'=>[250,100,20,30,60,40],
+        );
+        $pump_pie=array(
+            ['name'=>'在线','value'=>113],
+            ['name'=>'离线','value'=>17],
+            ['name'=>'其他','value'=>18],
+        );
+        $wrench_bar=array(
+            'xData'=>['总数','A1','A2','A3','A4','A5',],
+            'yData'=>[230,103,17,50,35,25],
+        );
+        $wrench_pie=array(
+            ['name'=>'合格','value'=>103],
+            ['name'=>'不合格','value'=>17],
+
+        );
+
+        $data=array(
+            'list'=>$list,
+            'pump_bar'=>$pump_bar,
+            'pump_pie'=>$pump_pie,
+            'wrench_bar'=>$wrench_bar,
+            'wrench_pie'=>$wrench_pie,
+        );
+        return CatchResponse::success($data);
+    }
+
+    /**
+     * 风场设备统计
+     * @param Request $request 
+     */
+    public function windCount(Request $request)
+    {
+        $list =array(
+            ['name'=>'风场1','total'=>103,'online'=>20,'offline'=>40],
+            ['name'=>'风场2','total'=>103,'online'=>20,'offline'=>40],
+            ['name'=>'风场3','total'=>42,'online'=>20,'offline'=>40],
+            ['name'=>'风场4','total'=>10,'online'=>20,'offline'=>40],
+            ['name'=>'风场5','total'=>103,'online'=>20,'offline'=>40],
+            ['name'=>'风场6','total'=>103,'online'=>20,'offline'=>40],
+            ['name'=>'风场7','total'=>123,'online'=>20,'offline'=>40],
+            ['name'=>'风场8','total'=>103,'online'=>20,'offline'=>40],
+            ['name'=>'风场9','total'=>103,'online'=>20,'offline'=>40],
+          
+        );
+        $xdata=['风场1','风场2','风场3','风场4','风场5','风场6','风场7','风场8','风场9',];
+        $ydata=[20,30,49,20,56,54,87,23,69];
+
+        $data=array(
+            'list'=>$list,
+            'xdata'=>$xdata,
+            'ydata'=>$ydata,
+        );
+        return CatchResponse::success($data);
+    }
+    
+    /**
+     * 告警统计
+     * @param Request $request 
+     */
+    public function alarmDeviceCount(Request $request)
+    {
+        $list =array(
+            ['type'=>'液压泵','name'=>'电量告警','value'=>100],
+            ['type'=>'液压泵','name'=>'液压油偏低','value'=>120],
+            ['type'=>'液压泵','name'=>'液压油偏高','value'=>30],
+            ['type'=>'液压泵','name'=>'总数','value'=>250],
+
+          
+        );
+        $pump_bar=array(
+            'xData'=>['总数','电量告警','液压油偏低','液压油偏高'],
+            'yData'=>[250,100,120,30],
+        );
+        $pump_pie=array(
+            ['name'=>'电量告警','value'=>100],
+            ['name'=>'液压油偏低','value'=>120],
+            ['name'=>'液压油偏高','value'=>30],
+        );
+    
+
+        $data=array(
+            'list'=>$list,
+            'pump_bar'=>$pump_bar,
+            'pump_pie'=>$pump_pie,
+        );
+        return CatchResponse::success($data);
+    }
+     /**
+     * 告警统计
+     * @param Request $request 
+     */
+    public function companyCount(Request $request)
+    {
+        $list =array(
+            ['type'=>'测试部门1','name'=>'液压泵','value'=>100],
+            ['type'=>'测试部门1','name'=>'液压扳手','value'=>120],
+            ['type'=>'测试部门1','name'=>'法兰','value'=>30],
+            ['type'=>'测试部门1','name'=>'总数','value'=>250],
+
+            ['type'=>'测试部门2','name'=>'液压泵','value'=>100],
+            ['type'=>'测试部门2','name'=>'液压扳手','value'=>120],
+            ['type'=>'测试部门2','name'=>'法兰','value'=>30],
+            ['type'=>'测试部门2','name'=>'总数','value'=>250],
+
+            ['type'=>'测试部门3','name'=>'液压泵','value'=>100],
+            ['type'=>'测试部门3','name'=>'液压扳手','value'=>120],
+            ['type'=>'测试部门3','name'=>'法兰','value'=>30],
+            ['type'=>'测试部门3','name'=>'总数','value'=>250],
+        );
+        $bar_data=array(
+            'xData'=>['测试部门1','测试部门2','测试部门3'],
+            'pump_yData'=>[120,120,130],
+            'wrench_yData'=>[40,150,90],
+            'flange_yData'=>[100,80,30],
+        );
+        $pump_pie=array(
+            ['name'=>'电量告警','value'=>100],
+            ['name'=>'液压油偏低','value'=>120],
+            ['name'=>'液压油偏高','value'=>30],
+        );
+    
+
+        $data=array(
+            'list'=>$list,
+            'bar_data'=>$bar_data,
+            'pump_pie'=>$pump_pie,
+        );
+        return CatchResponse::success($data);
+    }
+    
+    
 }

catch/report/model/Report.php

@@ -6,9 +6,9 @@ use catcher\exceptions\FailedException;
 use catcher\Utils;
 use catchAdmin\permissions\model\DataRangScopeTrait;
 
-use catchAdmin\stations\model\Station as StationModel;
 
-use catchAdmin\school\model\KqBuilding as BuildingModel;
+
+
 use catchAdmin\permissions\model\Users as UsersModel;
 use catchAdmin\permissions\model\Department as DepartmentModel;
 use catchAdmin\permissions\model\Roles;
@@ -42,79 +42,6 @@ class Report extends CatchModel
     }
 
     /**
-     * 基站数量数据
-     */
-    public function getStationCountData()
-    {
-        $station_type_arr = []; // 基站类型数组
-        $total_count = 0; // 基站总数量
-        $online_count = 0; // 基站总在线数量
-        $yesterday_add_count = 0; // 基站昨日新增总数
-        $today_add_count = 0; // 基站今日新增总数
-        $station_type_data = [];
-        $time = time();
-        $today_time = strtotime(date('Y-m-d'));
-        // 获取基站类型
-        $station_types = $this->getStationType();
-        foreach ($station_types as $type) {
-            $station_type_arr[$type['value']] = $type;
-        }
-        // 基站离线时间间隔
-        $offline_interval = SysConfig::getConfigValueBy('station_offline_interval', 'station_config') ?? 86400;
-        // 基站总数据
-        $cursor = (new StationModel)->dataRange()->field('station_mac, station_type, online_time, created_at')->cursor();
-        foreach ($cursor as $station) {
-            $total_count++;
-            // 按基站类型分类
-            if (isset($station_type_arr[$station['station_type']])) {
-                $key = $station_type_arr[$station['station_type']]['text'];
-            } else {
-                $key = '未知类型';
-            }
-            if (!isset($station_type_data[$key])) {
-                $station_type_data[$key] = isset($station_type_arr[$station['station_type']]) ? $station_type_arr[$station['station_type']] : [];
-            }
-            // 总数量
-            $station_type_data[$key]['total'] = isset($station_type_data[$key]['total']) ? ($station_type_data[$key]['total'] + 1) : 1;
-            // 昨日新增
-            $create_time = $station->getData('created_at');
-            if ($today_time - $create_time > 0 && $today_time - $create_time < 86400) {
-                $yesterday_add_count++;
-                $station_type_data[$key]['yesterday_add'] = isset($station_type_data[$key]['yesterday_add']) ? ($station_type_data[$key]['yesterday_add'] + 1) : 1;
-            } 
-            // 今日新增
-            if ($today_time - $create_time <= 0) {
-                $today_add_count++;
-                $station_type_data[$key]['today_add'] = isset($station_type_data[$key]['today_add']) ? ($station_type_data[$key]['today_add'] + 1) : 1;
-            }
-            // 在线数
-            if ($time - intval(strtotime($station['online_time'])) > $offline_interval) { // 离线时间,秒
-                $online_count++;
-                $station_type_data[$key]['online'] = isset($station_type_data[$key]['online']) ? ($station_type_data[$key]['online'] + 1) : 1;
-            }
-
-        }
-        // 转化为输出数据
-        $type_data = [];
-        foreach ($station_type_data as $data) {
-            $data['yesterday_add'] = isset($data['yesterday_add']) ? $data['yesterday_add'] : 0;
-            $data['today_add'] = isset($data['today_add']) ? $data['today_add'] : 0;
-            $data['online'] = isset($data['online']) ? $data['online'] : 0;
-            $data['offline'] = $data['total'] - $data['online'];
-            $type_data[] = $data;
-        }
-
-        return [
-            'station_total_count' => $total_count,
-            'station_online_count' => $online_count,
-            'station_offline_count' => $total_count - $online_count,
-            'station_yesterday_add_count' => $yesterday_add_count,
-            'station_today_add_count' => $today_add_count,
-            'station_type_data' => $type_data,
-        ];
-    }
-    
-    /**
      * 基站设备增长趋势数据
      */
     public function getStationGrowthTrendData($start_time = '', $end_time = '')

catch/report/route.php

@@ -16,3 +16,11 @@ $router->group('total', function () use ($router){
     $router->get('getDeviceGrowthTrendData','\catchAdmin\report\controller\Report@deviceGrowthTrendData'); // 获取设备增长趋势数据
 })->middleware('auth');
 
+$router->group('report', function () use ($router){
+    $router->get('hydraulicCount','\catchAdmin\report\controller\Report@hydraulicCount'); 
+    $router->get('windCount','\catchAdmin\report\controller\Report@windCount'); 
+    $router->get('alarmDeviceCount','\catchAdmin\report\controller\Report@alarmDeviceCount'); 
+    $router->get('companyCount','\catchAdmin\report\controller\Report@companyCount'); 
+    
+    
+})->middleware('auth');