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

Compare commits

base: liutk:212d35d29bbb37b2cbdeb4337b3179d35c337792
Branches Tags
liutk:main
liutk:develop
..
compare: liutk:ee327764ecd2bc8d77a0b4a1afe06544b071e6d3
Branches Tags
liutk:main
liutk:develop

No commits in common. "212d35d29bbb37b2cbdeb4337b3179d35c337792" and "ee327764ecd2bc8d77a0b4a1afe06544b071e6d3" have entirely different histories.
212d35d29b ... ee327764ec

3 changed files with 41 additions and 36 deletions
Show Stats Expand all files Collapse all files

6
app/Admin/Controllers/WarningSettingController.php
View File

@ -28,6 +28,12 @@ class WarningSettingController extends AdminController
'tab'=>$this->modeForm(Device::TYPE_METEOROLOGICAL), 'tab'=>$this->modeForm(Device::TYPE_METEOROLOGICAL),
'unmountOnExit' => true//每次切换tab都要销毁 'unmountOnExit' => true//每次切换tab都要销毁
], ],
// [
// 'title' => '水质预警',
// 'value' => 'detail',
// 'tab'=>'',
// 'unmountOnExit' => true//每次切换tab都要销毁
// ],
[ [
'title' => '土壤预警', 'title' => '土壤预警',
'value' => 'detail', 'value' => 'detail',

1
app/Services/Admin/MonitorModeService.php
View File

@ -27,7 +27,6 @@ class MonitorModeService extends BaseService
case MonitorMode::TYPE_MONITOR: case MonitorMode::TYPE_MONITOR:
case MonitorMode::TYPE_AIR: case MonitorMode::TYPE_AIR:
case MonitorMode::TYPE_ATOMIZING: case MonitorMode::TYPE_ATOMIZING:
case MonitorMode::TYPE_INSECT:
$region->offsetSet('picker_devices', $region->devices->pluck('id')->toArray()); $region->offsetSet('picker_devices', $region->devices->pluck('id')->toArray());
break; break;
case MonitorMode::TYPE_SOIL: case MonitorMode::TYPE_SOIL: