admin 7 лет назад
Родитель
Сommit
cfdb817d6b

+ 1 - 0
app/Http/Controllers/AdminController.php

@@ -541,6 +541,7 @@ class AdminController extends Controller
             $last_log_time = time() - 600; // 10分钟内
             $online_log = SsNodeOnlineLog::query()->where('node_id', $node->id)->where('log_time', '>=', $last_log_time)->orderBy('id', 'desc')->first();
             $node->online_users = empty($online_log) ? 0 : $online_log->online_user;
+            $node->uptime = empty($online_log) ? 0 : seconds2time($online_log->uptime);
 
             // 已产生流量
             $totalTraffic = SsNodeTrafficDaily::query()->where('node_id', $node->id)->sum('total');

+ 3 - 3
app/helpers.php

@@ -110,12 +110,12 @@ if (!function_exists('seconds2time')) {
         $hour = floor(($seconds % (3600 * 24)) / 3600);
         $minute = floor((($seconds % (3600 * 24)) % 3600) / 60);
         if ($day > 0) {
-            echo $day . '天' . $hour . '小时' . $minute . '分';
+            return $day . '天' . $hour . '小时' . $minute . '分';
         } else {
             if ($hour != 0) {
-                echo $hour . '小时' . $minute . '分';
+                return $hour . '小时' . $minute . '分';
             } else {
-                echo $minute . '分';
+                return $minute . '分';
             }
         }
     }

+ 1 - 1
resources/views/admin/nodeList.blade.php

@@ -70,7 +70,7 @@
                                                     @endif
                                                 </td>
                                                 <td> <span class="label {{$node->status ? 'label-danger' : 'label-default'}}">{{$node->server}}</span> </td>
-                                                <td> <span class="label {{$node->status ? 'label-danger' : 'label-default'}}">{{seconds2time($node->uptime)}}</span> </td>
+                                                <td> <span class="label {{$node->status ? 'label-danger' : 'label-default'}}">{{$node->uptime}}</span> </td>
                                                 <td> <span class="label {{$node->status ? 'label-danger' : 'label-default'}}">{{$node->load}}</span> </td>
                                                 <td> <span class="label {{$node->status ? 'label-danger' : 'label-default'}}">{{$node->online_users}}</span> </td>
                                                 <td> {{$node->transfer}} </td>