diff --git a/app/Admin/Controllers/MonitorModeController.php b/app/Admin/Controllers/MonitorModeController.php index e6d7415..5f73b51 100644 --- a/app/Admin/Controllers/MonitorModeController.php +++ b/app/Admin/Controllers/MonitorModeController.php @@ -206,42 +206,42 @@ class MonitorModeController extends AdminController ] ] ), - amisMake()->PickerControl('picker_devices', '虫情监测')->visibleOn('data.type == '.MonitorMode::TYPE_INSECT) - ->valueField('id') - ->labelField('name') - ->multiple(true) - ->size('lg') - ->source([ - 'method' => 'get', - 'url' => admin_url('devices?_action=getData&type='.Device::TYPE_INSECT), - 'data' => [ - 'name'=>'${device_name}', - ] - ]) - ->pickerSchema( - [ - 'mode' => 'table', - 'name' => 'monitor_list', - 'headerToolbar' => amisMake()->form() - ->wrapWithPanel(false) - ->className('text-right') - ->target('monitor_list') - ->mode('inline') - ->body([ - amisMake()->TextControl('device_name', '名称')->addOn( - amis('submit')->label(__('admin.search'))->level('primary') - ) - ]), - 'columns' => [ - TableColumn::make()->name('id')->label('ID')->sortable(true), - TableColumn::make()->name('name')->label('名称'), - TableColumn::make()->name('sn')->label('编号'), - TableColumn::make()->name('created_at')->label('创建时间')->type('datetime')->sortable(true), - TableColumn::make()->name('updated_at')->label('更新时间')->type('datetime')->sortable(true), - ] + amisMake()->PickerControl('picker_devices', '虫情监测')->visibleOn('data.type == '.MonitorMode::TYPE_INSECT) + ->valueField('id') + ->labelField('name') + ->multiple(true) + ->size('lg') + ->source([ + 'method' => 'get', + 'url' => admin_url('devices?_action=getData&type='.Device::TYPE_INSECT), + 'data' => [ + 'name'=>'${device_name}', ] - ), - ]), + ]) + ->pickerSchema( + [ + 'mode' => 'table', + 'name' => 'monitor_list', + 'headerToolbar' => amisMake()->form() + ->wrapWithPanel(false) + ->className('text-right') + ->target('monitor_list') + ->mode('inline') + ->body([ + amisMake()->TextControl('device_name', '名称')->addOn( + amis('submit')->label(__('admin.search'))->level('primary') + ) + ]), + 'columns' => [ + TableColumn::make()->name('id')->label('ID')->sortable(true), + TableColumn::make()->name('name')->label('名称'), + TableColumn::make()->name('sn')->label('编号'), + TableColumn::make()->name('created_at')->label('创建时间')->type('datetime')->sortable(true), + TableColumn::make()->name('updated_at')->label('更新时间')->type('datetime')->sortable(true), + ] + ] + ), + ]), ])->footer([ amisMake()->Button()->label('保存')->type('submit')->level('primary'), ]) diff --git a/app/Services/Admin/MonitorModeService.php b/app/Services/Admin/MonitorModeService.php index 1ec9e21..95d8fee 100644 --- a/app/Services/Admin/MonitorModeService.php +++ b/app/Services/Admin/MonitorModeService.php @@ -27,6 +27,7 @@ class MonitorModeService extends BaseService case MonitorMode::TYPE_MONITOR: case MonitorMode::TYPE_AIR: case MonitorMode::TYPE_ATOMIZING: + case MonitorMode::TYPE_INSECT: $region->offsetSet('picker_devices', $region->devices->pluck('id')->toArray()); break; case MonitorMode::TYPE_SOIL: