liutk
/
internet-everythings-agricultural
1
0
Fork 0
Code Releases Activity

调整

main
vine_liutk 2023-09-25 19:54:05 +08:00
parent 92e5e18113
commit f296e06098
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Admin/Controllers/RegionController.php
View File

@ -78,7 +78,7 @@ class RegionController extends AdminController
'aspectRatio'=> 1.1, 'aspectRatio'=> 1.1,
'scalable' => true, 'scalable' => true,
])->autoUpload(true), ])->autoUpload(true),
Components::make()->fuEditorControl('description', '介绍'), Components::make()->fuEditorControl('description', '介绍', 300),
Components::make()->decimalControl('area', '面积m²'), Components::make()->decimalControl('area', '面积m²'),
Components::make()->sortControl(), Components::make()->sortControl(),
\amisMake()->SwitchControl()->name('is_enable')->value(1)->label('显示'), \amisMake()->SwitchControl()->name('is_enable')->value(1)->label('显示'),

5
app/Http/Controllers/Api/WarningNoticeController.php
View File

@ -18,6 +18,7 @@ class WarningNoticeController extends Controller
public function warningLogNum(Request $request){ public function warningLogNum(Request $request){
$list = WarningNotice::filter($request->input(), WarningNoticeFilter::class) $list = WarningNotice::filter($request->input(), WarningNoticeFilter::class)
->select(DB::raw('lv, count(1) as num')) ->select(DB::raw('lv, count(1) as num'))
->where('status', 0)
->groupBy('lv') ->groupBy('lv')
->get() ->get()
->pluck('num', 'lv')->toArray(); ->pluck('num', 'lv')->toArray();
@ -35,7 +36,9 @@ class WarningNoticeController extends Controller
*/ */
public function warningLog(Request $request) public function warningLog(Request $request)
{ {
$query = WarningNotice::with(['device.modes'])->filter($request->input(), WarningNoticeFilter::class)->orderBy('created_at', 'desc'); $query = WarningNotice::with(['device.modes'])->filter($request->input(), WarningNoticeFilter::class)
->where('status', 0)
->orderBy('created_at', 'desc');
$list = $query->simplePaginate(Paginator::resolvePerPage('per_page', 20, 50)); $list = $query->simplePaginate(Paginator::resolvePerPage('per_page', 20, 50));
return $this->json(WarningNoticeResource::collection($list)); return $this->json(WarningNoticeResource::collection($list));