1
0
Эх сурвалжийг харах

修正每日节点使用报告BUG

bingo 7 жил өмнө
parent
commit
130be652e6

+ 2 - 2
app/Console/Commands/AutoReportNode.php

@@ -27,7 +27,7 @@ class AutoReportNode extends Command
 
         if (self::$systemConfig['node_daily_report']) {
             $nodeList = SsNode::query()->where('status', 1)->get();
-            if (!empty($nodeList)) {
+            if (!$nodeList->isEmpty()) {
                 foreach ($nodeList as $node) {
                     $log = SsNodeTrafficDaily::query()
                         ->where('node_id', $node->id)
@@ -36,7 +36,7 @@ class AutoReportNode extends Command
                         ->first();
 
                     if ($log) {
-                        $this->notifyMasterByServerchan('节点使用情况日报', '节点**' . $node->name . ',上行流量:' . flowAutoShow($node->u) . ',下行流量:' . flowAutoShow($node->d) . ',共计:' . $node->traffic . '**');
+                        $this->notifyMasterByServerchan('节点使用情况日报', '节点**' . $node->name . ',上行流量:' . flowAutoShow($log->u) . ',下行流量:' . flowAutoShow($log->d) . ',共计:' . $log->traffic . '**');
                     }
                 }
             }

+ 0 - 5
resources/views/admin/export.blade.php

@@ -15,11 +15,6 @@
                         <div class="caption font-dark">
                             <span class="caption-subject bold uppercase"> 【{{$user->username}}】连接配置信息 </span>
                         </div>
-                        <div class="actions">
-                            <div class="btn-group">
-                                <button class="btn sbold blue" onclick="addLabel()"> 添加标签 </button>
-                            </div>
-                        </div>
                     </div>
                     <div class="portlet-body">
                         <div class="table-scrollable table-scrollable-borderless">

+ 5 - 5
resources/views/marketing/emailList.blade.php

@@ -23,17 +23,17 @@
                     </div>
                     <div class="portlet-body">
                         <div class="row">
-                            <div class="col-md-2 col-sm-2">
-                                <select class="form-control input-sm" name="status" id="status" onChange="doSearch()">
+                            <div class="col-md-3 col-sm-4 col-xs-12">
+                                <select class="form-control" name="status" id="status" onChange="doSearch()">
                                     <option value="" @if(Request::get('status') == '') selected @endif>状态</option>
                                     <option value="0" @if(Request::get('status') == '0') selected @endif>等待发送</option>
                                     <option value="-1" @if(Request::get('status') == '-1') selected @endif>失败</option>
                                     <option value="1" @if(Request::get('status') == '1') selected @endif>成功</option>
                                 </select>
                             </div>
-                            <div class="col-md-2 col-sm-2">
-                                <button type="button" class="btn btn-sm blue" onclick="doSearch();">查询</button>
-                                <button type="button" class="btn btn-sm grey" onclick="doReset();">重置</button>
+                            <div class="col-md-3 col-sm-4 col-xs-12">
+                                <button type="button" class="btn blue" onclick="doSearch();">查询</button>
+                                <button type="button" class="btn grey" onclick="doReset();">重置</button>
                             </div>
                         </div>
                         <div class="table-scrollable table-scrollable-borderless">

+ 5 - 5
resources/views/marketing/pushList.blade.php

@@ -26,17 +26,17 @@
                             <i class="fa fa-warning"></i> 仅会推送给关注了您的消息通道的用户 (<a href="{{url('admin/system')}}" target="_blank">设置PushBear</a>)
                         </div>
                         <div class="row">
-                            <div class="col-md-2 col-sm-2">
-                                <select class="form-control input-sm" name="status" id="status" onChange="doSearch()">
+                            <div class="col-md-3 col-sm-4 col-xs-12">
+                                <select class="form-control" name="status" id="status" onChange="doSearch()">
                                     <option value="" @if(Request::get('status') == '') selected @endif>状态</option>
                                     <option value="0" @if(Request::get('status') == '0') selected @endif>待发送</option>
                                     <option value="-1" @if(Request::get('status') == '-1') selected @endif>失败</option>
                                     <option value="1" @if(Request::get('status') == '1') selected @endif>成功</option>
                                 </select>
                             </div>
-                            <div class="col-md-2 col-sm-2">
-                                <button type="button" class="btn btn-sm blue" onclick="doSearch();">查询</button>
-                                <button type="button" class="btn btn-sm grey" onclick="doReset();">重置</button>
+                            <div class="col-md-3 col-sm-4 col-xs-12">
+                                <button type="button" class="btn blue" onclick="doSearch();">查询</button>
+                                <button type="button" class="btn grey" onclick="doReset();">重置</button>
                             </div>
                         </div>
                         <div class="table-scrollable table-scrollable-borderless">