From f296e06098cdb40c162dc40996b978a1a62c9644 Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Mon, 25 Sep 2023 19:54:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/RegionController.php           | 2 +-
 app/Http/Controllers/Api/WarningNoticeController.php | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/Admin/Controllers/RegionController.php b/app/Admin/Controllers/RegionController.php
index 1cc5982..6163d0c 100644
--- a/app/Admin/Controllers/RegionController.php
+++ b/app/Admin/Controllers/RegionController.php
@@ -78,7 +78,7 @@ class RegionController extends AdminController
                 'aspectRatio'=> 1.1,
                 'scalable' => true,
             ])->autoUpload(true),
-            Components::make()->fuEditorControl('description', '介绍'),
+            Components::make()->fuEditorControl('description', '介绍', 300),
             Components::make()->decimalControl('area', '面积m²'),
             Components::make()->sortControl(),
             \amisMake()->SwitchControl()->name('is_enable')->value(1)->label('显示'),
diff --git a/app/Http/Controllers/Api/WarningNoticeController.php b/app/Http/Controllers/Api/WarningNoticeController.php
index 1bbc173..18264df 100644
--- a/app/Http/Controllers/Api/WarningNoticeController.php
+++ b/app/Http/Controllers/Api/WarningNoticeController.php
@@ -18,6 +18,7 @@ class WarningNoticeController extends Controller
     public function warningLogNum(Request $request){
         $list = WarningNotice::filter($request->input(), WarningNoticeFilter::class)
                 ->select(DB::raw('lv, count(1) as num'))
+                ->where('status', 0)
                 ->groupBy('lv')
                 ->get()
                 ->pluck('num', 'lv')->toArray();
@@ -35,7 +36,9 @@ class WarningNoticeController extends Controller
      */
     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));
 
         return $this->json(WarningNoticeResource::collection($list));