Explorar o código

节点流量监控

bingo %!s(int64=8) %!d(string=hai) anos
pai
achega
1b28528389

+ 2 - 7
app/Http/Controllers/AdminController.php

@@ -544,8 +544,6 @@ class AdminController extends BaseController
         }
 
         // 30天内的流量
-        $trafficDaily = [];
-        $trafficHourly = [];
         $dailyData = [];
         $hourlyData = [];
 
@@ -561,19 +559,16 @@ class AdminController extends BaseController
             $hourlyData[] = round($hourly->total / (1024 * 1024), 2);
         }
 
-        $trafficDaily[$node->id] = [
+        $view['trafficDaily'] = [
             'nodeName' => $node->name,
             'dailyData' => "'" . implode("','", $dailyData) . "'"
         ];
 
-        $trafficHourly[$node->id] = [
+        $view['trafficHourly'] = [
             'nodeName' => $node->name,
             'hourlyData' => "'" . implode("','", $hourlyData) . "'"
         ];
 
-        $view['trafficDaily'] = $trafficDaily;
-        $view['trafficHourly'] = $trafficHourly;
-
         return Response::view('admin/nodeMonitor', $view);
     }
 

+ 24 - 24
resources/views/admin/nodeMonitor.blade.php

@@ -77,19 +77,19 @@
                 }
             },
             series: [
-                    @if(!empty($trafficHourly))
+                @if(!empty($trafficHourly))
                     @foreach($trafficHourly as $traffic)
-                {
-                    name:'{{$traffic['nodeName']}}',
-                    type:'line',
-                    data:[{!! $traffic['hourlyData'] !!}],
-                    markPoint: {
-                        data: [
-                            {type: 'max', name: '最大值'}
-                        ]
-                    }
-                },
-                @endforeach
+                    {
+                        name:'{{$traffic['nodeName']}}',
+                        type:'line',
+                        data:[{!! $traffic['hourlyData'] !!}],
+                        markPoint: {
+                            data: [
+                                {type: 'max', name: '最大值'}
+                            ]
+                        }
+                    },
+                    @endforeach
                 @endif
             ]
         };
@@ -126,19 +126,19 @@
                 }
             },
             series: [
-                    @if(!empty($trafficDaily))
+                @if(!empty($trafficDaily))
                     @foreach($trafficDaily as $traffic)
-                {
-                    name:'{{$traffic['nodeName']}}',
-                    type:'line',
-                    data:[{!! $traffic['dailyData'] !!}],
-                    markPoint: {
-                        data: [
-                            {type: 'max', name: '最大值'}
-                        ]
-                    }
-                },
-                @endforeach
+                    {
+                        name:'{{$traffic['nodeName']}}',
+                        type:'line',
+                        data:[{!! $traffic['dailyData'] !!}],
+                        markPoint: {
+                            data: [
+                                {type: 'max', name: '最大值'}
+                            ]
+                        }
+                    },
+                    @endforeach
                 @endif
             ]
         };