楼栋增删改查完成， 接着房屋

src/store/modules/house.ts

@@ -1,7 +1,7 @@
 import { getCommunitylistAPI } from '@/api/system/community';
 import { communitylist_rows_type } from '@/api/system/community/type';
 import { getBuildinglistAPI, getHouselistAPI } from '@/api/system/house';
-import { BuildingUnit, BuildingVo } from '@/api/system/house/type';
+import type { addBuildingType, BuildingUnit, BuildingVo } from '@/api/system/house/type';
 import { defineStore } from 'pinia';
 // 数字排序
 function sortNumberStr(a: string, b: string) {
@@ -20,6 +20,8 @@ export const useHouseStore = defineStore('house', () => {
   // 当前小区信息
   const currentVilageInfo = ref<communitylist_rows_type>();
 
+  const buildingtype = ref<number>(0);
+
   // 当前小区 所有楼栋信息
   const currentBuildingInfoList = ref<BuildingVo[]>([]);
   // 当前楼栋信息
@@ -38,14 +40,15 @@ export const useHouseStore = defineStore('house', () => {
   });
 
   // 当前楼栋 所有房屋信息
-  const currentHouseInfoList = ref<BuildingUnit[]>([]);
+  const currentHouseInfoList = ref<BuildingUnit>();
 
   // 当前楼栋 所有楼层数据
-  const currentFloorInfoList = ref<string[]>([]);
-  // 最大楼层
-  const maxFloors = ref(0);
+  const currentFloorInfoList = computed(() => {
+    return (Array.from(floorslist.value) as string[]).sort(sortNumberStr);
+  });
   // 楼层列表 set
   const floorslist = ref<Set<string>>(new Set());
+
   // 初始化
   const initHouse = async (buildingtype: number) => {
     // 查找当前小区
@@ -55,42 +58,96 @@ export const useHouseStore = defineStore('house', () => {
     // 获取当前小区 所有楼栋信息
     const res2 = await getBuildinglistAPI(currentVilage.villageId, buildingtype);
     currentBuildingInfoList.value = res2.data;
-    // 获取当前小区 楼栋信息
-    currentBuildingInfo.value = res2.data[0];
-    console.log(currentBuildingInfo.value);
+    if (!currentBuildingInfo.value) {
+      // 获取当前小区 第一个楼栋信息
+      currentBuildingInfo.value = res2.data[0];
+      console.log(currentBuildingInfo.value);
+    }
 
-    // 获取当前楼栋 所有房屋信息
+    // 获取当前 第一个楼栋的所有信息
     const res3 = await getHouselistAPI(currentBuildingInfo.value.id);
     currentHouseInfoList.value = res3.data;
-    currentHouseInfoList.value.forEach((item) => {
-      maxFloors.value = Math.max(maxFloors.value, item.actualFloorCount);
-      item.floors_Json = JSON.parse(`[${item.floors.replaceAll('\\', '')}]`);
-      item.floors_Json.forEach((floor) => {
+    console.log(currentHouseInfoList.value);
+    floorslist.value = new Set();
+    // 得到所有的有房屋的 楼层 数组
+    currentHouseInfoList.value.units.forEach((item) => {
+      item.floors.forEach((floor) => {
         floorslist.value.add(floor.floorNo);
       });
     });
-    // 对当前小区的 楼层进行排序
-    currentFloorInfoList.value = (Array.from(floorslist.value) as string[]).sort(sortNumberStr);
   };
 
-  // 选中房屋
+  // 选中的房屋
   const checkoutHouses = ref<string[]>([]);
+  // 选中的房屋方法
   const checkoutHousesFun = (data: string[]) => {
     checkoutHouses.value = data;
   };
 
   // 切换住宅类型
-  const switchHouseType = (housetype: 0 | 1 | 2 | 3) => {
+  const switchHouseType = (housetype: number) => {
     getBuildinglistAPI(currentVilageInfo.value.villageId, housetype)
-      .then(() => ElMessage.success('切换成功'))
+      .then(() => {
+        buildingtype.value = housetype;
+        initHouse(housetype);
+        ElMessage.success('切换成功');
+      })
       .catch(() => ElMessage.error('切换失败'));
   };
 
   // 切换楼栋
   const switchBuilding = (buildingId: number) => {
-    getHouselistAPI(buildingId).then(() => ElMessage.success('切换成功'));
+    // 切换之前 清空当前楼栋信息
+    currentBuildingInfo.value = {
+      'id': null,
+      'villageId': null,
+      'villageName': '',
+      'buildingName': '',
+      'buildingUse': null,
+      'buildToward': '',
+      'buildTall': '',
+      'buildStructure': '',
+      'unitCount': null,
+      'floorCount': null,
+      'remark': ''
+    };
+    getHouselistAPI(buildingId).then((res) => {
+      currentHouseInfoList.value = res.data;
+      // 获取当前楼栋信息并 赋值
+      currentBuildingInfo.value = currentBuildingInfoList.value.find((item) => item.id === buildingId);
+
+      // 清空 楼层信息
+      floorslist.value = new Set();
+      // 重新获取楼层信息
+      currentHouseInfoList.value.units.forEach((item) => {
+        item.floors.forEach((floor) => {
+          floorslist.value.add(floor.floorNo);
+        });
+      });
+      ElMessage.success('切换成功');
+      return;
+    });
   };
 
+  // 更新数据
+  const updateHouse = () => {
+    initHouse(buildingtype.value);
+  };
+  // 删除指定楼栋
+  const deleteBuildingFun = (buildingId: number) => {
+    console.log('删除楼栋');
+    // 手动 从 楼栋列表中删除 指定楼栋
+    currentBuildingInfoList.value = currentBuildingInfoList.value.filter((item) => item.id !== buildingId);
+    // 判断指定楼栋是 当前楼栋
+    if (currentBuildingInfo.value.id === buildingId) {
+      // 获取楼栋列表中的第一个楼栋,并切换到第一个楼栋
+      if (currentBuildingInfoList.value[0]) {
+        currentBuildingInfo.value = currentBuildingInfoList.value[0];
+        switchBuilding(currentBuildingInfo.value.id);
+      }
+    }
+  };
+  //  删除指定房屋
   const deleteHouseFun = (houseId: string | string[]) => {
     console.log('删除房屋');
     if (typeof houseId === 'string') {
@@ -107,10 +164,13 @@ export const useHouseStore = defineStore('house', () => {
     currentHouseInfoList,
     currentFloorInfoList,
     checkoutHouses,
+    buildingtype,
     checkoutHousesFun,
     initHouse,
     switchHouseType,
     switchBuilding,
-    deleteHouseFun
+    deleteHouseFun,
+    updateHouse,
+    deleteBuildingFun
   };
 });