Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5

apps/web-antd/src/api/property/resident/unit/model.d.ts

@@ -246,4 +246,9 @@ export interface Unit extends BaseEntity {
    */
   area?: string;
 
+  /**
+   * 房间数量
+   */
+  roomNumber: number;
+
 }

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',

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="入驻位置" >-->
+          <DescriptionsItem label="入驻房间数" >
-<!--            {{ unitDetail.locationDetail }}-->
+            {{ unitDetail.roomNumber }}
-<!--          </DescriptionsItem>-->
+          </DescriptionsItem>
           <DescriptionsItem label="入驻面积">
            <span v-if="unitDetail.area">{{ unitDetail.area }}（㎡）</span>
           </DescriptionsItem>

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

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

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