ChenWuJie преди 4 години
родител
ревизия
4078c94173
променени са 2 файла, в които са добавени 5 реда и са изтрити 1 реда
  1. 4 0
      app/Http/Controllers/Api/mini/DataController.php
  2. 1 1
      resources/views/admin/base/index/welcome.blade.php

+ 4 - 0
app/Http/Controllers/Api/mini/DataController.php

xqd
@@ -351,6 +351,10 @@ class DataController extends BaseController
 
     public function getTotalInfo(Request $request)
     {
+        if (!$request->input('project_ids'))
+        {
+            return $this->error(['msg' => '暂未选择项目']);
+        }
         $start_at = $this->getStartAt($request->input('date'));
         $end_at = $this->getEndAt($request->input('date'));
         $total_money = $this->order->whereIn('project_id', $request->input('project_ids'))->sum('money') / 100;

+ 1 - 1
resources/views/admin/base/index/welcome.blade.php

xqd
@@ -398,7 +398,7 @@
                                 filterMode: 'filter',
                                 height:30,
                                 start:1,
-                                end:48,
+                                end:12,
                             }
                         ],
                         tooltip: {},