3

lib/views/service/index/cubit/service_index_cubit.dart

@@ -7,6 +7,7 @@ import 'package:smart_hotel_app/models/bo/room_bo.dart';
 class ServiceIndexCubit extends Cubit<ServiceIndexState> {
   final RoomService _roomService;
   final Map<String, List<Map<String, dynamic>>> _roomCache = {};
+  List<FloorAreaBO> _floorAreasCache = [];
 
   ServiceIndexCubit()
       : _roomService = RoomService(repository: RoomRepository()),
@@ -18,21 +19,18 @@ class ServiceIndexCubit extends Cubit<ServiceIndexState> {
     await loadFloorAndAreas();
   }
 
-  /// 加载楼层和区域信息
+  /// 加载楼层和区域信息（仅进入页面时调用一次）
   Future<void> loadFloorAndAreas() async {
     emit(state.copyWith(isLoading: true, error: null));
     try {
       final floorAreas = await _roomService.getFloorAreas();
+      _floorAreasCache = floorAreas;
+
       final floors = floorAreas.map((f) => {f.floorId: f.floorId.toString()}).toList();
-      final areas = <String>{};
-      for (final f in floorAreas) {
-        areas.addAll(f.areas);
-      }
 
       emit(state.copyWith(
         isLoading: false,
         floors: floors,
-        areas: areas.toList(),
       ));
 
       // 默认选中第一个楼层，加载其房间数据
@@ -40,6 +38,7 @@ class ServiceIndexCubit extends Cubit<ServiceIndexState> {
         final firstFloor = floors.first;
         final firstFloorId = firstFloor.keys.first;
         final firstFloorLabel = firstFloor.values.first;
+        _updateAreasForFloor(firstFloorLabel);
         selectFloor(firstFloorLabel);
         await loadRooms(floorId: firstFloorId);
       }
@@ -48,6 +47,15 @@ class ServiceIndexCubit extends Cubit<ServiceIndexState> {
     }
   }
 
+  /// 根据选中的楼层更新 areas
+  void _updateAreasForFloor(String floorLabel) {
+    final matched = _floorAreasCache.where(
+      (f) => f.floorId.toString() == floorLabel,
+    );
+    final areas = matched.isNotEmpty ? matched.first.areas : <String>[];
+    emit(state.copyWith(areas: areas));
+  }
+
   /// 加载房间状态列表
   Future<void> loadRooms({
     int? floorId,
@@ -137,6 +145,9 @@ class ServiceIndexCubit extends Cubit<ServiceIndexState> {
 
   void selectFloor(String? floor) {
     emit(state.copyWith(selectedFloor: floor));
+    if (floor != null) {
+      _updateAreasForFloor(floor);
+    }
   }
 
   void selectType(String? type) {

lib/views/service/index/widget/room_management_block.dart

@@ -125,6 +125,7 @@ class _RoomManagementBlockState extends State<RoomManagementBlock> {
                   } else {
                     _selectedFloor = floorName;
                   }
+                  _selectedType = null;
                   _searchController.clear();
                   _searchText = '';
                 });