diff --git a/app/Admin/Controllers/ArticleCategoryController.php b/app/Admin/Controllers/ArticleCategoryController.php index 72a957e..5ef4312 100644 --- a/app/Admin/Controllers/ArticleCategoryController.php +++ b/app/Admin/Controllers/ArticleCategoryController.php @@ -34,7 +34,7 @@ class ArticleCategoryController extends AdminController ->columns([ TableColumn::make()->name('id')->label(__('article-category.id')), TableColumn::make()->name('name')->label(__('article-category.name')), - TableColumn::make()->name('icon')->label(__('article-category.icon'))->type('image')->width(60), + // TableColumn::make()->name('icon')->label(__('article-category.icon'))->type('image')->width(60), TableColumn::make()->name('sort')->label(__('article-category.sort'))->align('center') ->quickEdit( Components::make()->sortControl('sort', __('article-category.sort'))->saveImmediately(true)), diff --git a/app/Admin/Controllers/MonitorModeController.php b/app/Admin/Controllers/MonitorModeController.php index 5f73b51..6528f13 100644 --- a/app/Admin/Controllers/MonitorModeController.php +++ b/app/Admin/Controllers/MonitorModeController.php @@ -60,7 +60,7 @@ class MonitorModeController extends AdminController public function form(): Form { return $this->baseForm()->body([ - TextControl::make()->name('name')->label('名称'), + TextControl::make()->name('name')->label('名称')->required(), \amisMake()->RadiosControl()->name('type')->label('类型')->options(MonitorMode::typeMap())->required(true)->disabledOn('data.id > 0'), Components::make()->keywordsTagControl('group_tags', '分组', 'monitor-mode-group'), // Components::make()->sortControl('sort', __('admin.order')), diff --git a/app/Admin/Controllers/WarningNoticeController.php b/app/Admin/Controllers/WarningNoticeController.php index d791ff5..f58e963 100644 --- a/app/Admin/Controllers/WarningNoticeController.php +++ b/app/Admin/Controllers/WarningNoticeController.php @@ -22,6 +22,12 @@ class WarningNoticeController extends AdminController ->filterTogglable(false) ->headerToolbar([ ]) + ->filter($this->baseFilter()->actions([])->body([ + amisMake()->SelectControl()->name('lv')->label('报警等级')->options(WarningNotice::lvMap())->clearable()->size('md'), + amisMake()->SelectControl()->name('status')->label('状态')->options(WarningNotice::stateMap())->clearable()->size('md'), + amis('button')->label(__('admin.reset'))->actionType('clear-and-submit'), + amis('submit')->label(__('admin.search'))->level('primary'), + ])) ->columns([ TableColumn::make()->name('id')->label('ID')->sortable(true), TableColumn::make()->name('device.modes')->type('each')->items([ diff --git a/app/Filters/WarningNoticeFilter.php b/app/Filters/WarningNoticeFilter.php index d9ff568..d21c123 100644 --- a/app/Filters/WarningNoticeFilter.php +++ b/app/Filters/WarningNoticeFilter.php @@ -6,7 +6,8 @@ use EloquentFilter\ModelFilter; class WarningNoticeFilter extends ModelFilter { - public function lv($lv){ + public function lv($lv) + { return $this->where('lv', $lv); } diff --git a/app/Services/Admin/WarningNoticeService.php b/app/Services/Admin/WarningNoticeService.php index 15b1e1e..9dbff77 100644 --- a/app/Services/Admin/WarningNoticeService.php +++ b/app/Services/Admin/WarningNoticeService.php @@ -3,6 +3,7 @@ namespace App\Services\Admin; use App\Models\WarningNotice; +use App\Filters\WarningNoticeFilter; /** * @method WarningNotice getModel() @@ -13,4 +14,6 @@ class WarningNoticeService extends BaseService protected string $modelName = WarningNotice::class; protected array $withRelationships = ['device.modes']; + + protected string $modelFilterName = WarningNoticeFilter::class; }