From 831fcd98b2a49302d082d46c5148d5826655efbc Mon Sep 17 00:00:00 2001
From: lxj <15683799673@163.com>
Date: Fri, 12 Sep 2025 17:43:11 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=A2=84=E8=AD=A6?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8table=20title=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../videoSystem/videoWarning/videoWarningHasDone/index.vue    | 4 ++--
 .../videoSystem/videoWarning/videoWarningProcessing/index.vue | 2 +-
 .../videoSystem/videoWarning/videoWarningToDone/index.vue     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningHasDone/index.vue b/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningHasDone/index.vue
index 11e249be..b9d84d71 100644
--- a/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningHasDone/index.vue
+++ b/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningHasDone/index.vue
@@ -48,7 +48,7 @@ const gridOptions: VxeGridProps = {
         return await alarmEventsList({
           pageNum: page.currentPage,
           pageSize: page.pageSize,
-          states: [40,50],
+          states: [40, 50],
           ...formValues,
         });
       },
@@ -112,7 +112,7 @@ function handleMultiDelete() {
 </script>
 <template>
   <Page :auto-content-height="true">
-    <BasicTable class="flex-1 overflow-hidden" table-title="视频预警处理">
+    <BasicTable class="flex-1 overflow-hidden">
       <template #toolbar-tools>
         <Space>
           <a-button
diff --git a/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningProcessing/index.vue b/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningProcessing/index.vue
index 3af36f01..9ec7b086 100644
--- a/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningProcessing/index.vue
+++ b/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningProcessing/index.vue
@@ -112,7 +112,7 @@ function handleMultiDelete() {
 </script>
 <template>
   <Page :auto-content-height="true">
-    <BasicTable class="flex-1 overflow-hidden" table-title="视频预警处理">
+    <BasicTable class="flex-1 overflow-hidden">
       <template #toolbar-tools>
         <Space>
           <a-button
diff --git a/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningToDone/index.vue b/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningToDone/index.vue
index 621acb28..9ef093f5 100644
--- a/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningToDone/index.vue
+++ b/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningToDone/index.vue
@@ -112,7 +112,7 @@ function handleMultiDelete() {
 </script>
 <template>
   <Page :auto-content-height="true">
-    <BasicTable class="flex-1 overflow-hidden" table-title="视频预警处理">
+    <BasicTable class="flex-1 overflow-hidden">
       <template #toolbar-tools>
         <Space>
           <a-button

From 67cf5c766cb69ffe63c8dd65c2519ff90b545621 Mon Sep 17 00:00:00 2001
From: dev_ljl <2590379346@qq.com>
Date: Fri, 12 Sep 2025 17:49:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=E5=85=A5=E9=A9=BB=E5=8D=95=E4=BD=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=85=A5=E9=A9=BB=E6=88=BF=E9=97=B4=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web-antd/src/api/property/resident/unit/model.d.ts |  5 +++++
 apps/web-antd/src/views/property/resident/unit/data.ts | 10 ++++++++++
 .../src/views/property/resident/unit/unit-detail.vue   |  8 ++++----
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/apps/web-antd/src/api/property/resident/unit/model.d.ts b/apps/web-antd/src/api/property/resident/unit/model.d.ts
index dfe50c8a..ead328ed 100644
--- a/apps/web-antd/src/api/property/resident/unit/model.d.ts
+++ b/apps/web-antd/src/api/property/resident/unit/model.d.ts
@@ -246,4 +246,9 @@ export interface Unit extends BaseEntity {
    */
   area?: string;
 
+  /**
+   * 房间数量
+   */
+  roomNumber: number;
+
 }
diff --git a/apps/web-antd/src/views/property/resident/unit/data.ts b/apps/web-antd/src/views/property/resident/unit/data.ts
index ad305334..4de390ae 100644
--- a/apps/web-antd/src/views/property/resident/unit/data.ts
+++ b/apps/web-antd/src/views/property/resident/unit/data.ts
@@ -84,6 +84,16 @@ export const columns: VxeGridProps['columns'] = [
     field: 'time',
     width: 180,
   },
+  {
+    title: '入驻房间数',
+    field: 'roomNumber',
+    width: 100,
+  },
+  {
+    title: '入驻面积（㎡）',
+    field: 'area',
+    width: 180,
+  },
   {
     title: '状态',
     field: 'state',
diff --git a/apps/web-antd/src/views/property/resident/unit/unit-detail.vue b/apps/web-antd/src/views/property/resident/unit/unit-detail.vue
index 0d02a285..ada5cd27 100644
--- a/apps/web-antd/src/views/property/resident/unit/unit-detail.vue
+++ b/apps/web-antd/src/views/property/resident/unit/unit-detail.vue
@@ -56,7 +56,7 @@ const selectRoomId = ref<string[]>([]);
     <div class="flex  gap-[8px]">
       <div class="w-[260px]">
         <RoomTree
-          class="max-h-[calc(100vh-40vh)]"
+          class="max-h-[calc(100vh-38vh)]"
           v-model:select-room-id="selectRoomId"
         />
       </div>
@@ -75,9 +75,9 @@ const selectRoomId = ref<string[]>([]);
           <DescriptionsItem label="联系人">
             {{ unitDetail.contactPerson +'-'+unitDetail.phone}}
           </DescriptionsItem>
-<!--          <DescriptionsItem label="入驻位置" >-->
-<!--            {{ unitDetail.locationDetail }}-->
-<!--          </DescriptionsItem>-->
+          <DescriptionsItem label="入驻房间数" >
+            {{ unitDetail.roomNumber }}
+          </DescriptionsItem>
           <DescriptionsItem label="入驻面积">
            <span v-if="unitDetail.area">{{ unitDetail.area }}（㎡）</span>
           </DescriptionsItem>