pdkj
/
lcly-data-admin
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整

dev
vine_liutk 2023-03-03 10:44:28 +08:00
parent 937b7c5ccf
commit e34073919b
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/AgriculturalBaseController.php
View File

@ -118,6 +118,9 @@ class AgriculturalBaseController extends Controller
$deviceType = $request->input('device_type', DeviceType::Monitor); $deviceType = $request->input('device_type', DeviceType::Monitor);
// $status = $request->input('status'); // $status = $request->input('status');
$list = AgriculturalBase::filter($request->all())->whereHas('devices', function ($q) use ($deviceType) { $list = AgriculturalBase::filter($request->all())->whereHas('devices', function ($q) use ($deviceType) {
if($deviceType == DeviceType::Monitor || $deviceType == 1){
$q->where('is_recommend', 1);
}
return $q->where('type', $deviceType); return $q->where('type', $deviceType);
})->sort()->get(); })->sort()->get();

2
database/seeders/SettingTableSeeder.php
View File

@ -110,7 +110,7 @@ class SettingTableSeeder extends Seeder
['name' => '全市数据-生猪年出栏', 'slug' => 'city_data_pig_output', 'value' => '{"value":"42.01", "unit":"万头"}'], ['name' => '全市数据-生猪年出栏', 'slug' => 'city_data_pig_output', 'value' => '{"value":"42.01", "unit":"万头"}'],
['name' => '警报规则-土壤设备', 'slug' => 'device_warning_rule_soil', 'value' => $soilRule], ['name' => '警报规则-土壤设备', 'slug' => 'device_warning_rule_soil', 'value' => $soilRule],
['name' => '警报规则-水质设备', 'slug' => 'device_warning_rule_waterquality', 'value' => $waterRule], ['name' => '警报规则-水质设备', 'slug' => 'device_warning_rule_waterquality', 'value' => $waterRule],
['name' => '监控设备-转流服务器', 'slug' => 'ffmpeg_websocket_ip', 'value' =>'{"ip":"127.0.0.1", "port":"80"}'], ['name' => '监控设备-转流服务器', 'slug' => 'ffmpeg_websocket_ip', 'value' =>'{"ip":"127.0.0.1", "port":"80", "change_time":"20"}'],
['name' => '统计数据-农业', 'slug' => 'city_data_chart_nongye', 'value'=>'{}'], ['name' => '统计数据-农业', 'slug' => 'city_data_chart_nongye', 'value'=>'{}'],
['name' => '统计数据-渔业', 'slug' => 'city_data_chart_yuye', 'value'=>'{}'], ['name' => '统计数据-渔业', 'slug' => 'city_data_chart_yuye', 'value'=>'{}'],
['name' => '统计数据-畜牧业', 'slug' => 'city_data_chart_xumuye', 'value'=>'{}'], ['name' => '统计数据-畜牧业', 'slug' => 'city_data_chart_xumuye', 'value'=>'{}'],