diff --git a/app/Http/Controllers/DeviceController.php b/app/Http/Controllers/DeviceController.php
index d217e77..dae32a2 100644
--- a/app/Http/Controllers/DeviceController.php
+++ b/app/Http/Controllers/DeviceController.php
@@ -14,6 +14,7 @@ use App\Models\SoilMonitoringLog;
 use App\Models\SoilMonitoringDailyLog;
 use App\Models\WaterQualityMonitoringLog;
 use App\Models\WaterQualityMonitoringDailyLog;
+use App\Models\AgriculturalBase;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Carbon\Carbon;
@@ -80,8 +81,18 @@ class DeviceController extends Controller
     public function typeStatusNum(Request $request)
     {
         $baseId = $request->input('base_id', 0);
+        $parent = $request->input('parent', 0);
+
         $query = Device::query();
-        if($baseId){
+        
+        if($parent){
+            $baseIds = AgriculturalBase::where('parent_id', $parent)->pluck('id')->toArray();
+            if(count($baseIds) > 0){
+                $query->whereIn('agricultural_base_id', $baseIds);
+            }
+        }
+        //如果查了镇街就不查指定基地了
+        if(!$parent && $baseId){
             $query->where('agricultural_base_id', $baseId);
         }