fix bugs

app/Http/Controllers/AdminController.php

@@ -118,8 +118,8 @@ class AdminController extends Controller
         $qq = trim($request->get('qq'));
         $port = intval($request->get('port'));
         $pay_way = intval($request->get('pay_way'));
-        $status = intval($request->get('status'));
-        $enable = intval($request->get('enable'));
+        $status = $request->get('status');
+        $enable = $request->get('enable');
         $online = $request->get('online');
         $unActive = $request->get('unActive');
         $flowAbnormal = $request->get('flowAbnormal');
@@ -152,11 +152,11 @@ class AdminController extends Controller
         }
 
         if ($status != '') {
-            $query->where('status', $status);
+            $query->where('status', intval($status));
         }
 
         if ($enable != '') {
-            $query->where('enable', $enable);
+            $query->where('enable', intval($enable));
         }
 
         // 流量超过100G的
@@ -1110,26 +1110,31 @@ class AdminController extends Controller
     {
         $port = $request->get('port');
         $user_id = $request->get('user_id');
-        $username = $request->get('username');
+        $username = trim($request->get('username'));
+        $nodeId = intval($request->get('nodeId'));
 
-        $query = UserTrafficLog::with(['User', 'SsNode']);
+        $query = UserTrafficLog::query()->with(['user', 'node']);
 
-        if (!empty($port)) {
+        if ($port) {
             $query->whereHas('user', function ($q) use ($port) {
                 $q->where('port', $port);
             });
         }
 
-        if (!empty($user_id)) {
-            $query->where('user_id', $user_id);
+        if ($user_id) {
+            $query->where('user_id', intval($user_id));
         }
 
-        if (!empty($username)) {
+        if ($username) {
             $query->whereHas('user', function ($q) use ($username) {
                 $q->where('username', 'like', '%' . $username . '%');
             });
         }
 
+        if ($nodeId) {
+            $query->where('node_id', $nodeId);
+        }
+
         // 已使用流量
         $view['totalTraffic'] = flowAutoShow($query->sum('u') + $query->sum('d'));
 
@@ -1141,6 +1146,7 @@ class AdminController extends Controller
         }
 
         $view['list'] = $list;
+        $view['nodeList'] = SsNode::query()->where('status', 1)->orderBy('sort', 'desc')->orderBy('id', 'desc')->get();
 
         return Response::view('admin.trafficLog', $view);
     }

app/Http/Models/UserTrafficLog.php

@@ -20,13 +20,13 @@ class UserTrafficLog extends Model
     public $timestamps = false;
 
     // 关联账号
-    public function User()
+    public function user()
     {
         return $this->belongsTo(User::class, 'user_id', 'id');
     }
 
     // 关联节点
-    public function SsNode()
+    public function node()
     {
         return $this->belongsTo(SsNode::class, 'node_id', 'id');
     }

resources/views/admin/trafficLog.blade.php

@@ -18,7 +18,7 @@
                 <div class="portlet light bordered">
                     <div class="portlet-title">
                         <div class="caption font-dark">
-                            <span class="caption-subject bold uppercase"> 流量日志</span>
+                            <span class="caption-subject bold uppercase"> 流量日志 </span>
                         </div>
                     </div>
                     <div class="portlet-body">
@@ -32,6 +32,14 @@
                             <div class="col-md-3 col-sm-4 col-xs-12">
                                 <input type="text" class="col-md-4 form-control" name="username" value="{{Request::get('username')}}" id="username" placeholder="用户名" onkeydown="if(event.keyCode==13){do_search();}">
                             </div>
+                            <div class="col-md-3 col-sm-4 col-xs-12">
+                                <select class="form-control" name="nodeId" id="nodeId" onChange="doSearch()">
+                                    <option value="" @if(Request::get('nodeId') == '') selected @endif>选择节点</option>
+                                    @foreach($nodeList as $node)
+                                        <option value="{{$node->id}}" @if(Request::get('nodeId') == $node->id) selected @endif>{{$node->name}}</option>
+                                    @endforeach
+                                </select>
+                            </div>
                             <div class="col-md-3 col-sm-4 col-xs-12">
                                 <button type="button" class="btn blue" onclick="do_search();">查询</button>
                                 <button type="button" class="btn grey" onclick="do_reset();">重置</button>
@@ -105,8 +113,9 @@
             var port = $("#port").val();
             var user_id = $("#user_id").val();
             var username = $("#username").val();
+            var nodeId = $("#nodeId option:checked").val();
 
-            window.location.href = '{{url('admin/trafficLog')}}' + '?port=' + port + '&user_id=' + user_id + '&username=' + username;
+            window.location.href = '{{url('admin/trafficLog')}}' + '?port=' + port + '&user_id=' + user_id + '&username=' + username + '&nodeId=' + nodeId;
         }
 
         // 重置