From 9cf89cea89ab7457ecda67e648a18eb21ae8041e Mon Sep 17 00:00:00 2001
From: FLL <2162874245@qq.com>
Date: Wed, 27 Aug 2025 17:47:37 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E7=BC=B4=E8=B4=B9=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/property/costManagement/costMeterWater/data.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/apps/web-antd/src/views/property/costManagement/costMeterWater/data.ts b/apps/web-antd/src/views/property/costManagement/costMeterWater/data.ts
index d0a52f2c..a73e049e 100644
--- a/apps/web-antd/src/views/property/costManagement/costMeterWater/data.ts
+++ b/apps/web-antd/src/views/property/costManagement/costMeterWater/data.ts
@@ -5,9 +5,12 @@ import {renderDict} from "#/utils/render";
 
 export const querySchema: FormSchemaGetter = () => [
   {
-    component: 'Input',
-    fieldName: 'searchValue',
-    label: '搜索值',
+    label: '费用类型',
+    fieldName: 'costType',
+    component: 'Select',
+    componentProps: () => ({
+      options: getDictOptions('wy_cbfylx'),
+    }),
   },
 ];
 

From 2de44541fa8181765f205382fa6e96d31519ebf0 Mon Sep 17 00:00:00 2001
From: dev_ljl <2590379346@qq.com>
Date: Thu, 4 Sep 2025 09:29:53 +0800
Subject: [PATCH 2/5] =?UTF-8?q?feat:=E4=BC=9A=E8=AE=AE=E5=8F=82=E4=BC=9A?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roomBooking/participants/index.ts         |  61 ++++++
 .../roomBooking/participants/model.d.ts       |  54 ++++++
 .../property/roomBooking/participants/data.ts |  65 +++++++
 .../roomBooking/participants/index.vue        | 178 ++++++++++++++++++
 .../participants/participants-modal.vue       | 101 ++++++++++
 5 files changed, 459 insertions(+)
 create mode 100644 apps/web-antd/src/api/property/roomBooking/participants/index.ts
 create mode 100644 apps/web-antd/src/api/property/roomBooking/participants/model.d.ts
 create mode 100644 apps/web-antd/src/views/property/roomBooking/participants/data.ts
 create mode 100644 apps/web-antd/src/views/property/roomBooking/participants/index.vue
 create mode 100644 apps/web-antd/src/views/property/roomBooking/participants/participants-modal.vue

diff --git a/apps/web-antd/src/api/property/roomBooking/participants/index.ts b/apps/web-antd/src/api/property/roomBooking/participants/index.ts
new file mode 100644
index 00000000..e69e5d19
--- /dev/null
+++ b/apps/web-antd/src/api/property/roomBooking/participants/index.ts
@@ -0,0 +1,61 @@
+import type { ParticipantsVO, ParticipantsForm, ParticipantsQuery } from './model';
+
+import type { ID, IDS } from '#/api/common';
+import type { PageResult } from '#/api/common';
+
+import { commonExport } from '#/api/helper';
+import { requestClient } from '#/api/request';
+
+/**
+* 查询会议室参会记录列表
+* @param params
+* @returns 会议室参会记录列表
+*/
+export function participantsList(params?: ParticipantsQuery) {
+  return requestClient.get<PageResult<ParticipantsVO>>('/property/participants/list', { params });
+}
+
+/**
+ * 导出会议室参会记录列表
+ * @param params
+ * @returns 会议室参会记录列表
+ */
+export function participantsExport(params?: ParticipantsQuery) {
+  return commonExport('/property/participants/export', params ?? {});
+}
+
+/**
+ * 查询会议室参会记录详情
+ * @param id id
+ * @returns 会议室参会记录详情
+ */
+export function participantsInfo(id: ID) {
+  return requestClient.get<ParticipantsVO>(`/property/participants/${id}`);
+}
+
+/**
+ * 新增会议室参会记录
+ * @param data
+ * @returns void
+ */
+export function participantsAdd(data: ParticipantsForm) {
+  return requestClient.postWithMsg<void>('/property/participants', data);
+}
+
+/**
+ * 更新会议室参会记录
+ * @param data
+ * @returns void
+ */
+export function participantsUpdate(data: ParticipantsForm) {
+  return requestClient.putWithMsg<void>('/property/participants', data);
+}
+
+/**
+ * 删除会议室参会记录
+ * @param id id
+ * @returns void
+ */
+export function participantsRemove(id: ID | IDS) {
+  return requestClient.deleteWithMsg<void>(`/property/participants/${id}`);
+}
diff --git a/apps/web-antd/src/api/property/roomBooking/participants/model.d.ts b/apps/web-antd/src/api/property/roomBooking/participants/model.d.ts
new file mode 100644
index 00000000..15bb4773
--- /dev/null
+++ b/apps/web-antd/src/api/property/roomBooking/participants/model.d.ts
@@ -0,0 +1,54 @@
+import type { PageQuery, BaseEntity } from '#/api/common';
+
+export interface ParticipantsVO {
+  /**
+   * 主键id
+   */
+  id: string | number;
+
+  /**
+   * 会议室id
+   */
+  meetId: string | number;
+
+  /**
+   * 入驻人员id
+   */
+  residentPersonId: string | number;
+
+}
+
+export interface ParticipantsForm extends BaseEntity {
+  /**
+   * 主键id
+   */
+  id?: string | number;
+
+  /**
+   * 会议室id
+   */
+  meetId?: string | number;
+
+  /**
+   * 入驻人员id
+   */
+  residentPersonId?: string | number;
+
+}
+
+export interface ParticipantsQuery extends PageQuery {
+  /**
+   * 会议室id
+   */
+  meetId?: string | number;
+
+  /**
+   * 入驻人员id
+   */
+  residentPersonId?: string | number;
+
+  /**
+    * 日期范围参数
+    */
+  params?: any;
+}
diff --git a/apps/web-antd/src/views/property/roomBooking/participants/data.ts b/apps/web-antd/src/views/property/roomBooking/participants/data.ts
new file mode 100644
index 00000000..4400d58b
--- /dev/null
+++ b/apps/web-antd/src/views/property/roomBooking/participants/data.ts
@@ -0,0 +1,65 @@
+import type { FormSchemaGetter } from '#/adapter/form';
+import type { VxeGridProps } from '#/adapter/vxe-table';
+
+
+export const querySchema: FormSchemaGetter = () => [
+  {
+    component: 'Input',
+    fieldName: 'meetId',
+    label: '会议室id',
+  },
+  {
+    component: 'Input',
+    fieldName: 'residentPersonId',
+    label: '入驻人员id',
+  },
+];
+
+// 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
+// export const columns: () => VxeGridProps['columns'] = () => [
+export const columns: VxeGridProps['columns'] = [
+  { type: 'checkbox', width: 60 },
+  {
+    title: '主键id',
+    field: 'id',
+  },
+  {
+    title: '会议室id',
+    field: 'meetId',
+  },
+  {
+    title: '入驻人员id',
+    field: 'residentPersonId',
+  },
+  {
+    field: 'action',
+    fixed: 'right',
+    slots: { default: 'action' },
+    title: '操作',
+    width: 180,
+  },
+];
+
+export const modalSchema: FormSchemaGetter = () => [
+  {
+    label: '主键id',
+    fieldName: 'id',
+    component: 'Input',
+    dependencies: {
+      show: () => false,
+      triggerFields: [''],
+    },
+  },
+  {
+    label: '会议室id',
+    fieldName: 'meetId',
+    component: 'Input',
+    rules: 'required',
+  },
+  {
+    label: '入驻人员id',
+    fieldName: 'residentPersonId',
+    component: 'Input',
+    rules: 'required',
+  },
+];
diff --git a/apps/web-antd/src/views/property/roomBooking/participants/index.vue b/apps/web-antd/src/views/property/roomBooking/participants/index.vue
new file mode 100644
index 00000000..2fbd3def
--- /dev/null
+++ b/apps/web-antd/src/views/property/roomBooking/participants/index.vue
@@ -0,0 +1,178 @@
+<script setup lang="ts">
+
+import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui';
+import { getVxePopupContainer } from '@vben/utils';
+
+import { Modal, Popconfirm, Space } from 'ant-design-vue';
+
+import {
+  useVbenVxeGrid,
+  vxeCheckboxChecked,
+  type VxeGridProps
+} from '#/adapter/vxe-table';
+
+import {
+  participantsExport,
+  participantsList,
+  participantsRemove,
+} from '#/api/property/roomBooking/participants';
+import type { ParticipantsForm } from '#/api/property/roomBooking/participants/model';
+import { commonDownloadExcel } from '#/utils/file/download';
+
+import participantsModal from './participants-modal.vue';
+import { columns, querySchema } from './data';
+
+const formOptions: VbenFormProps = {
+  commonConfig: {
+    labelWidth: 80,
+    componentProps: {
+      allowClear: true,
+    },
+  },
+  schema: querySchema(),
+  wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4',
+  // 处理区间选择器RangePicker时间格式 将一个字段映射为两个字段 搜索/导出会用到
+  // 不需要直接删除
+  // fieldMappingTime: [
+  //  [
+  //    'createTime',
+  //    ['params[beginTime]', 'params[endTime]'],
+  //    ['YYYY-MM-DD 00:00:00', 'YYYY-MM-DD 23:59:59'],
+  //  ],
+  // ],
+};
+
+const gridOptions: VxeGridProps = {
+  checkboxConfig: {
+    // 高亮
+    highlight: true,
+    // 翻页时保留选中状态
+    reserve: true,
+    // 点击行选中
+    // trigger: 'row',
+  },
+  // 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
+  // columns: columns(),
+  columns,
+  height: 'auto',
+  keepSource: true,
+  pagerConfig: {},
+  proxyConfig: {
+    ajax: {
+      query: async ({ page }, formValues = {}) => {
+        return await participantsList({
+          pageNum: page.currentPage,
+          pageSize: page.pageSize,
+          ...formValues,
+        });
+      },
+    },
+  },
+  rowConfig: {
+    keyField: 'id',
+  },
+  // 表格全局唯一表示 保存列配置需要用到
+  id: 'property-participants-index'
+};
+
+const [BasicTable, tableApi] = useVbenVxeGrid({
+  formOptions,
+  gridOptions,
+});
+
+const [ParticipantsModal, modalApi] = useVbenModal({
+  connectedComponent: participantsModal,
+});
+
+function handleAdd() {
+  modalApi.setData({});
+  modalApi.open();
+}
+
+async function handleEdit(row: Required<ParticipantsForm>) {
+  modalApi.setData({ id: row.id });
+  modalApi.open();
+}
+
+async function handleDelete(row: Required<ParticipantsForm>) {
+  await participantsRemove(row.id);
+  await tableApi.query();
+}
+
+function handleMultiDelete() {
+  const rows = tableApi.grid.getCheckboxRecords();
+  const ids = rows.map((row: Required<ParticipantsForm>) => row.id);
+  Modal.confirm({
+    title: '提示',
+    okType: 'danger',
+    content: `确认删除选中的${ids.length}条记录吗？`,
+    onOk: async () => {
+      await participantsRemove(ids);
+      await tableApi.query();
+    },
+  });
+}
+
+function handleDownloadExcel() {
+  commonDownloadExcel(participantsExport, '会议室参会记录数据', tableApi.formApi.form.values, {
+    fieldMappingTime: formOptions.fieldMappingTime,
+  });
+}
+</script>
+
+<template>
+  <Page :auto-content-height="true">
+    <BasicTable table-title="会议室参会记录列表">
+      <template #toolbar-tools>
+        <Space>
+          <a-button
+            v-access:code="['property:participants:export']"
+            @click="handleDownloadExcel"
+          >
+            {{ $t('pages.common.export') }}
+          </a-button>
+          <a-button
+            :disabled="!vxeCheckboxChecked(tableApi)"
+            danger
+            type="primary"
+            v-access:code="['property:participants:remove']"
+            @click="handleMultiDelete">
+            {{ $t('pages.common.delete') }}
+          </a-button>
+          <a-button
+            type="primary"
+            v-access:code="['property:participants:add']"
+            @click="handleAdd"
+          >
+            {{ $t('pages.common.add') }}
+          </a-button>
+        </Space>
+      </template>
+      <template #action="{ row }">
+        <Space>
+          <ghost-button
+            v-access:code="['property:participants:edit']"
+            @click.stop="handleEdit(row)"
+          >
+            {{ $t('pages.common.edit') }}
+          </ghost-button>
+          <Popconfirm
+            :get-popup-container="getVxePopupContainer"
+            placement="left"
+            title="确认删除？"
+            @confirm="handleDelete(row)"
+          >
+            <ghost-button
+              danger
+              v-access:code="['property:participants:remove']"
+              @click.stop=""
+            >
+              {{ $t('pages.common.delete') }}
+            </ghost-button>
+          </Popconfirm>
+        </Space>
+      </template>
+    </BasicTable>
+    <ParticipantsModal @reload="tableApi.query()" />
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/property/roomBooking/participants/participants-modal.vue b/apps/web-antd/src/views/property/roomBooking/participants/participants-modal.vue
new file mode 100644
index 00000000..4972eaa2
--- /dev/null
+++ b/apps/web-antd/src/views/property/roomBooking/participants/participants-modal.vue
@@ -0,0 +1,101 @@
+<script setup lang="ts">
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+import { $t } from '@vben/locales';
+import { cloneDeep } from '@vben/utils';
+
+import { useVbenForm } from '#/adapter/form';
+import { participantsAdd, participantsInfo, participantsUpdate } from '#/api/property/roomBooking/participants';
+import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
+
+import { modalSchema } from './data';
+
+const emit = defineEmits<{ reload: [] }>();
+
+const isUpdate = ref(false);
+const title = computed(() => {
+  return isUpdate.value ? $t('pages.common.edit') : $t('pages.common.add');
+});
+
+const [BasicForm, formApi] = useVbenForm({
+  commonConfig: {
+    // 默认占满两列
+    formItemClass: 'col-span-2',
+    // 默认label宽度 px
+    labelWidth: 80,
+    // 通用配置项 会影响到所有表单项
+    componentProps: {
+      class: 'w-full',
+    }
+  },
+  schema: modalSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-2',
+});
+
+const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
+  {
+    initializedGetter: defaultFormValueGetter(formApi),
+    currentGetter: defaultFormValueGetter(formApi),
+  },
+);
+
+const [BasicModal, modalApi] = useVbenModal({
+  // 在这里更改宽度
+  class: 'w-[550px]',
+  fullscreenButton: false,
+  onBeforeClose,
+  onClosed: handleClosed,
+  onConfirm: handleConfirm,
+  onOpenChange: async (isOpen) => {
+    if (!isOpen) {
+      return null;
+    }
+    modalApi.modalLoading(true);
+
+    const { id } = modalApi.getData() as { id?: number | string };
+    isUpdate.value = !!id;
+
+    if (isUpdate.value && id) {
+      const record = await participantsInfo(id);
+      await formApi.setValues(record);
+    }
+    await markInitialized();
+
+    modalApi.modalLoading(false);
+  },
+});
+
+async function handleConfirm() {
+  try {
+    modalApi.lock(true);
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    // getValues获取为一个readonly的对象 需要修改必须先深拷贝一次
+    const data = cloneDeep(await formApi.getValues());
+    await (isUpdate.value ? participantsUpdate(data) : participantsAdd(data));
+    resetInitialized();
+    emit('reload');
+    modalApi.close();
+  } catch (error) {
+    console.error(error);
+  } finally {
+    modalApi.lock(false);
+  }
+}
+
+async function handleClosed() {
+  await formApi.resetForm();
+  resetInitialized();
+}
+</script>
+
+<template>
+  <BasicModal :title="title">
+    <BasicForm />
+  </BasicModal>
+</template>
+

From b0d48d0425467f70552dcbb36c980938f9eaf6b4 Mon Sep 17 00:00:00 2001
From: FLL <2162874245@qq.com>
Date: Thu, 4 Sep 2025 16:12:11 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E7=BC=B4=E8=B4=B9=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roomBooking/participants/index.ts         |   2 -
 .../inspectionPoint/data.ts                   |   6 +
 .../src/views/property/room/floor-tree.vue    | 122 +++++++++++++++++
 .../src/views/property/room/index.vue         | 126 +++++++++---------
 .../property/roomBooking/participants/data.ts | 101 ++++++++------
 .../roomBooking/participants/index.vue        |  97 ++------------
 .../participants/participants-detail.vue      |  82 ++++++++++++
 .../participants/participants-modal.vue       | 101 --------------
 apps/web-antd/vite.config.mts                 |   2 +-
 9 files changed, 347 insertions(+), 292 deletions(-)
 create mode 100644 apps/web-antd/src/views/property/room/floor-tree.vue
 create mode 100644 apps/web-antd/src/views/property/roomBooking/participants/participants-detail.vue
 delete mode 100644 apps/web-antd/src/views/property/roomBooking/participants/participants-modal.vue

diff --git a/apps/web-antd/src/api/property/roomBooking/participants/index.ts b/apps/web-antd/src/api/property/roomBooking/participants/index.ts
index e69e5d19..53a994a9 100644
--- a/apps/web-antd/src/api/property/roomBooking/participants/index.ts
+++ b/apps/web-antd/src/api/property/roomBooking/participants/index.ts
@@ -1,8 +1,6 @@
 import type { ParticipantsVO, ParticipantsForm, ParticipantsQuery } from './model';
-
 import type { ID, IDS } from '#/api/common';
 import type { PageResult } from '#/api/common';
-
 import { commonExport } from '#/api/helper';
 import { requestClient } from '#/api/request';
 
diff --git a/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/data.ts b/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/data.ts
index b6d51485..79c90c9b 100644
--- a/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/data.ts
+++ b/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/data.ts
@@ -112,6 +112,12 @@ export const modalSchema: FormSchemaGetter = () => [
     fieldName: 'nfcCode',
     component: 'Input',
   },
+  {
+    label: '巡检位置',
+    fieldName: 'inspectionLocation',
+    component: 'Input',
+    rules: 'required',
+  },
   {
     label: '备注',
     fieldName: 'remark',
diff --git a/apps/web-antd/src/views/property/room/floor-tree.vue b/apps/web-antd/src/views/property/room/floor-tree.vue
new file mode 100644
index 00000000..5eca1902
--- /dev/null
+++ b/apps/web-antd/src/views/property/room/floor-tree.vue
@@ -0,0 +1,122 @@
+<script setup lang="ts">
+import type { PropType } from 'vue';
+import type { DeptTree } from '#/api/system/user/model';
+import { onMounted, ref } from 'vue';
+import { SyncOutlined } from '@ant-design/icons-vue';
+import { Empty, InputSearch, Skeleton, Tree } from 'ant-design-vue';
+import { getDeptTree } from '#/api/system/user';
+
+defineOptions({ inheritAttrs: false });
+
+withDefaults(defineProps<{ showSearch?: boolean }>(), { showSearch: true });
+
+const emit = defineEmits<{
+  /**
+   * 点击刷新按钮的事件
+   */
+  reload: [];
+  /**
+   * 点击节点的事件
+   */
+  select: [];
+}>();
+
+const selectDeptId = defineModel('selectDeptId', {
+  required: true,
+  type: Array as PropType<string[]>,
+});
+
+const searchValue = defineModel('searchValue', {
+  type: String,
+  default: '',
+});
+
+/** 部门数据源 */
+type DeptTreeArray = DeptTree[];
+const deptTreeArray = ref<DeptTreeArray>([]);
+/** 骨架屏加载 */
+const showTreeSkeleton = ref<boolean>(true);
+
+async function loadTree() {
+  showTreeSkeleton.value = true;
+  searchValue.value = '';
+  selectDeptId.value = [];
+  const ret = await getDeptTree();
+  deptTreeArray.value = ret;
+  showTreeSkeleton.value = false;
+}
+
+async function handleReload() {
+  await loadTree();
+  emit('reload');
+}
+
+onMounted(loadTree);
+</script>
+
+<template>
+  <div :class="$attrs.class">
+    <Skeleton
+      :loading="showTreeSkeleton"
+      :paragraph="{ rows: 8 }"
+      active
+      class="p-[8px]"
+    >
+      <div
+        class="bg-background flex h-full flex-col overflow-y-auto rounded-lg"
+      >
+        <!-- 固定在顶部 必须加上bg-background背景色 否则会产生'穿透'效果 -->
+        <div
+          v-if="showSearch"
+          class="bg-background z-100 sticky left-0 top-0 p-[8px]"
+        >
+          <InputSearch
+            v-model:value="searchValue"
+            :placeholder="$t('pages.common.search')"
+            size="small"
+          >
+            <template #enterButton>
+              <a-button @click="handleReload">
+                <SyncOutlined class="text-primary" />
+              </a-button>
+            </template>
+          </InputSearch>
+        </div>
+        <div class="h-full overflow-x-hidden px-[8px]">
+          <Tree
+            v-bind="$attrs"
+            v-if="deptTreeArray.length > 0"
+            v-model:selected-keys="selectDeptId"
+            :class="$attrs.class"
+            :field-names="{ title: 'label', key: 'id' }"
+            :show-line="{ showLeafIcon: false }"
+            :tree-data="deptTreeArray"
+            :virtual="false"
+            default-expand-all
+            @select="$emit('select')"
+          >
+            <template #title="{ label }">
+              <span v-if="label.indexOf(searchValue) > -1">
+                {{ label.substring(0, label.indexOf(searchValue)) }}
+                <span style="color: #f50">{{ searchValue }}</span>
+                {{
+                  label.substring(
+                    label.indexOf(searchValue) + searchValue.length,
+                  )
+                }}
+              </span>
+              <span v-else>{{ label }}</span>
+            </template>
+          </Tree>
+          <!-- 仅本人数据权限 可以考虑直接不显示 -->
+          <div v-else class="mt-5">
+            <Empty
+              :image="Empty.PRESENTED_IMAGE_SIMPLE"
+              description="无部门数据"
+            />
+          </div>
+        </div>
+      </div>
+    </Skeleton>
+  </div>
+</template>
diff --git a/apps/web-antd/src/views/property/room/index.vue b/apps/web-antd/src/views/property/room/index.vue
index 89e8efaa..6cf9d254 100644
--- a/apps/web-antd/src/views/property/room/index.vue
+++ b/apps/web-antd/src/views/property/room/index.vue
@@ -1,18 +1,13 @@
 <script setup lang="ts">
-import type { Recordable } from '@vben/types';
-
-import { ref } from 'vue';
-
 import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui';
 import { getVxePopupContainer } from '@vben/utils';
-
 import { Modal, Popconfirm, Space } from 'ant-design-vue';
-import dayjs from 'dayjs';
+import FloorTree from "./floor-tree.vue"
 
-import {   
+import {
   useVbenVxeGrid,
   vxeCheckboxChecked,
-  type VxeGridProps 
+  type VxeGridProps
 } from '#/adapter/vxe-table';
 
 import {
@@ -125,58 +120,65 @@ function handleDownloadExcel() {
 </script>
 
 <template>
-  <Page :auto-content-height="true">
-    <BasicTable table-title="房间信息列表">
-      <template #toolbar-tools>
-        <Space>
-          <a-button
-            v-access:code="['property:room:export']"
-            @click="handleDownloadExcel"
-          >
-            {{ $t('pages.common.export') }}
-          </a-button>
-          <a-button
-            :disabled="!vxeCheckboxChecked(tableApi)"
-            danger
-            type="primary" 
-            v-access:code="['property:room:remove']" 
-            @click="handleMultiDelete">
-            {{ $t('pages.common.delete') }}
-          </a-button>
-          <a-button
-            type="primary"
-            v-access:code="['property:room:add']"
-            @click="handleAdd"
-          >
-            {{ $t('pages.common.add') }}
-          </a-button>
-        </Space>
-      </template>
-      <template #action="{ row }">
-        <Space>
-          <ghost-button
-            v-access:code="['property:room:edit']"
-            @click.stop="handleEdit(row)"
-          >
-            {{ $t('pages.common.edit') }}
-          </ghost-button>
-          <Popconfirm
-            :get-popup-container="getVxePopupContainer"
-            placement="left"
-            title="确认删除？"
-            @confirm="handleDelete(row)"
-          >
-            <ghost-button
-              danger
-              v-access:code="['property:room:remove']"
-              @click.stop=""
-            >
-              {{ $t('pages.common.delete') }}
-            </ghost-button>
-          </Popconfirm>
-        </Space>
-      </template>
-    </BasicTable>
-    <RoomModal @reload="tableApi.query()" />
-  </Page>
+  <div style="display: grid;grid-template-columns: 1fr 5fr;">
+    <div style="padding: 15px 0 15px 15px;background-color: red">
+      <FloorTree></FloorTree>
+    </div>
+    <div>
+      <Page :auto-content-height="true">
+        <BasicTable table-title="房间信息列表">
+          <template #toolbar-tools>
+            <Space>
+              <a-button
+                v-access:code="['property:room:export']"
+                @click="handleDownloadExcel"
+              >
+                {{ $t('pages.common.export') }}
+              </a-button>
+              <a-button
+                :disabled="!vxeCheckboxChecked(tableApi)"
+                danger
+                type="primary"
+                v-access:code="['property:room:remove']"
+                @click="handleMultiDelete">
+                {{ $t('pages.common.delete') }}
+              </a-button>
+              <a-button
+                type="primary"
+                v-access:code="['property:room:add']"
+                @click="handleAdd"
+              >
+                {{ $t('pages.common.add') }}
+              </a-button>
+            </Space>
+          </template>
+          <template #action="{ row }">
+            <Space>
+              <ghost-button
+                v-access:code="['property:room:edit']"
+                @click.stop="handleEdit(row)"
+              >
+                {{ $t('pages.common.edit') }}
+              </ghost-button>
+              <Popconfirm
+                :get-popup-container="getVxePopupContainer"
+                placement="left"
+                title="确认删除？"
+                @confirm="handleDelete(row)"
+              >
+                <ghost-button
+                  danger
+                  v-access:code="['property:room:remove']"
+                  @click.stop=""
+                >
+                  {{ $t('pages.common.delete') }}
+                </ghost-button>
+              </Popconfirm>
+            </Space>
+          </template>
+        </BasicTable>
+        <RoomModal @reload="tableApi.query()" />
+      </Page>
+    </div>
+  </div>
 </template>
diff --git a/apps/web-antd/src/views/property/roomBooking/participants/data.ts b/apps/web-antd/src/views/property/roomBooking/participants/data.ts
index 4400d58b..d6c2d548 100644
--- a/apps/web-antd/src/views/property/roomBooking/participants/data.ts
+++ b/apps/web-antd/src/views/property/roomBooking/participants/data.ts
@@ -1,35 +1,82 @@
 import type { FormSchemaGetter } from '#/adapter/form';
 import type { VxeGridProps } from '#/adapter/vxe-table';
-
+import { personList } from '#/api/property/resident/person';
+import {participantsList} from '#/api/property/roomBooking/participants';
 
 export const querySchema: FormSchemaGetter = () => [
   {
-    component: 'Input',
-    fieldName: 'meetId',
-    label: '会议室id',
+    label: '会议室名称',
+    fieldName: 'meetBookId',
+    component: 'ApiSelect',
+    componentProps: {
+      api: async () => {
+        const rows = await participantsList({ pageSize: 1000000000, pageNum: 1 });
+        return rows;
+      },
+      resultField: 'rows',
+      labelField: 'meetBookingVo.name',
+      valueField: 'meetBookId',
+    },
   },
   {
-    component: 'Input',
+    label: '发起人',
     fieldName: 'residentPersonId',
-    label: '入驻人员id',
+    component: 'ApiSelect',
+    componentProps: {
+      api: async () => {
+        const rows = await personList({ pageSize: 1000000000, pageNum: 1 });
+        return rows;
+      },
+      resultField: 'rows',
+      labelField: 'userName',
+      valueField: 'id',
+    },
   },
 ];
 
-// 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
-// export const columns: () => VxeGridProps['columns'] = () => [
 export const columns: VxeGridProps['columns'] = [
-  { type: 'checkbox', width: 60 },
   {
-    title: '主键id',
-    field: 'id',
+    title: '会议室名称',
+    field: 'meetBookingVo.name',
   },
   {
-    title: '会议室id',
-    field: 'meetId',
+    title: '会议主题',
+    field: 'meetBookingVo.meetTheme',
   },
   {
-    title: '入驻人员id',
-    field: 'residentPersonId',
+    title: '会议时间',
+    field: 'meetBookingVo.meetingTime',
+    slots: {
+      default: ({row}) => {
+        return row.meetBookingVo.scheduledStarttime+'~'+row.meetBookingVo.scheduledEndtime;
+      },
+    },
+    width:300
+  },
+  {
+    title: '发起人',
+    field: 'meetBookingVo.personName',
+  },
+  {
+    title: '发起单位',
+    field: 'meetBookingVo.unitName',
+  },
+  {
+    title: '会议室地点',
+    field: 'meetBookingVo.meetLocation',
+  },
+  {
+    title: '签到状态',
+    field: 'signState',
+    slots: {
+      default: ({row}) => {
+        return row.signState === '0' ? '未签到' : '已签到';
+      },
+    },
+  },
+  {
+    title: '签到时间',
+    field: 'signTime',
   },
   {
     field: 'action',
@@ -39,27 +86,3 @@ export const columns: VxeGridProps['columns'] = [
     width: 180,
   },
 ];
-
-export const modalSchema: FormSchemaGetter = () => [
-  {
-    label: '主键id',
-    fieldName: 'id',
-    component: 'Input',
-    dependencies: {
-      show: () => false,
-      triggerFields: [''],
-    },
-  },
-  {
-    label: '会议室id',
-    fieldName: 'meetId',
-    component: 'Input',
-    rules: 'required',
-  },
-  {
-    label: '入驻人员id',
-    fieldName: 'residentPersonId',
-    component: 'Input',
-    rules: 'required',
-  },
-];
diff --git a/apps/web-antd/src/views/property/roomBooking/participants/index.vue b/apps/web-antd/src/views/property/roomBooking/participants/index.vue
index 2fbd3def..92a0e8d1 100644
--- a/apps/web-antd/src/views/property/roomBooking/participants/index.vue
+++ b/apps/web-antd/src/views/property/roomBooking/participants/index.vue
@@ -1,25 +1,17 @@
 <script setup lang="ts">
-
 import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui';
-import { getVxePopupContainer } from '@vben/utils';
-
-import { Modal, Popconfirm, Space } from 'ant-design-vue';
-
+import { Space } from 'ant-design-vue';
 import {
   useVbenVxeGrid,
-  vxeCheckboxChecked,
   type VxeGridProps
 } from '#/adapter/vxe-table';
-
 import {
   participantsExport,
   participantsList,
-  participantsRemove,
 } from '#/api/property/roomBooking/participants';
 import type { ParticipantsForm } from '#/api/property/roomBooking/participants/model';
 import { commonDownloadExcel } from '#/utils/file/download';
-
-import participantsModal from './participants-modal.vue';
+import participantsDetail from './participants-detail.vue';
 import { columns, querySchema } from './data';
 
 const formOptions: VbenFormProps = {
@@ -31,28 +23,13 @@ const formOptions: VbenFormProps = {
   },
   schema: querySchema(),
   wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4',
-  // 处理区间选择器RangePicker时间格式 将一个字段映射为两个字段 搜索/导出会用到
-  // 不需要直接删除
-  // fieldMappingTime: [
-  //  [
-  //    'createTime',
-  //    ['params[beginTime]', 'params[endTime]'],
-  //    ['YYYY-MM-DD 00:00:00', 'YYYY-MM-DD 23:59:59'],
-  //  ],
-  // ],
 };
 
 const gridOptions: VxeGridProps = {
   checkboxConfig: {
-    // 高亮
     highlight: true,
-    // 翻页时保留选中状态
     reserve: true,
-    // 点击行选中
-    // trigger: 'row',
   },
-  // 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
-  // columns: columns(),
   columns,
   height: 'auto',
   keepSource: true,
@@ -80,37 +57,13 @@ const [BasicTable, tableApi] = useVbenVxeGrid({
   gridOptions,
 });
 
-const [ParticipantsModal, modalApi] = useVbenModal({
-  connectedComponent: participantsModal,
+const [ParticipantsDetail, participantsDetailApi] = useVbenModal({
+  connectedComponent: participantsDetail,
 });
 
-function handleAdd() {
-  modalApi.setData({});
-  modalApi.open();
-}
-
-async function handleEdit(row: Required<ParticipantsForm>) {
-  modalApi.setData({ id: row.id });
-  modalApi.open();
-}
-
-async function handleDelete(row: Required<ParticipantsForm>) {
-  await participantsRemove(row.id);
-  await tableApi.query();
-}
-
-function handleMultiDelete() {
-  const rows = tableApi.grid.getCheckboxRecords();
-  const ids = rows.map((row: Required<ParticipantsForm>) => row.id);
-  Modal.confirm({
-    title: '提示',
-    okType: 'danger',
-    content: `确认删除选中的${ids.length}条记录吗？`,
-    onOk: async () => {
-      await participantsRemove(ids);
-      await tableApi.query();
-    },
-  });
+async function handleInfo(row: Required<ParticipantsForm>) {
+  participantsDetailApi.setData({ id: row.id });
+  participantsDetailApi.open();
 }
 
 function handleDownloadExcel() {
@@ -131,48 +84,18 @@ function handleDownloadExcel() {
           >
             {{ $t('pages.common.export') }}
           </a-button>
-          <a-button
-            :disabled="!vxeCheckboxChecked(tableApi)"
-            danger
-            type="primary"
-            v-access:code="['property:participants:remove']"
-            @click="handleMultiDelete">
-            {{ $t('pages.common.delete') }}
-          </a-button>
-          <a-button
-            type="primary"
-            v-access:code="['property:participants:add']"
-            @click="handleAdd"
-          >
-            {{ $t('pages.common.add') }}
-          </a-button>
         </Space>
       </template>
       <template #action="{ row }">
         <Space>
           <ghost-button
-            v-access:code="['property:participants:edit']"
-            @click.stop="handleEdit(row)"
+            @click.stop="handleInfo(row)"
           >
-            {{ $t('pages.common.edit') }}
+            {{ $t('pages.common.info') }}
           </ghost-button>
-          <Popconfirm
-            :get-popup-container="getVxePopupContainer"
-            placement="left"
-            title="确认删除？"
-            @confirm="handleDelete(row)"
-          >
-            <ghost-button
-              danger
-              v-access:code="['property:participants:remove']"
-              @click.stop=""
-            >
-              {{ $t('pages.common.delete') }}
-            </ghost-button>
-          </Popconfirm>
         </Space>
       </template>
     </BasicTable>
-    <ParticipantsModal @reload="tableApi.query()" />
+    <ParticipantsDetail/>
   </Page>
 </template>
diff --git a/apps/web-antd/src/views/property/roomBooking/participants/participants-detail.vue b/apps/web-antd/src/views/property/roomBooking/participants/participants-detail.vue
new file mode 100644
index 00000000..2a0ff20c
--- /dev/null
+++ b/apps/web-antd/src/views/property/roomBooking/participants/participants-detail.vue
@@ -0,0 +1,82 @@
+<script setup lang="ts">
+import type {ParticipantsVO} from '#/api/property/roomBooking/participants/model';
+import {shallowRef} from 'vue';
+import {useVbenModal} from '@vben/common-ui';
+import {Descriptions, DescriptionsItem} from 'ant-design-vue';
+import {participantsInfo} from '#/api/property/roomBooking/participants';
+import {ossInfo} from "#/api/system/oss";
+
+const [BasicModal, modalApi] = useVbenModal({
+  onOpenChange: handleOpenChange,
+  onClosed() {
+    ParticipantsDetail.value = null;
+  },
+});
+
+const ParticipantsDetail = shallowRef<null | ParticipantsVO>(null);
+
+async function handleOpenChange(open: boolean) {
+  if (!open) {
+    return null;
+  }
+  modalApi.modalLoading(true);
+  const {id} = modalApi.getData() as { id: number | string };
+  ParticipantsDetail.value = await participantsInfo(id);
+  try {
+    if (ParticipantsDetail.value.residentPersonVo.img) {
+      const res = await ossInfo([ParticipantsDetail.value.residentPersonVo.img]);
+      ParticipantsDetail.value.residentPersonVo.img = res?.[0]?.url
+    }
+  } catch (e) {}
+
+  modalApi.modalLoading(false);
+}
+</script>
+
+<template>
+  <BasicModal :footer="false" :fullscreen-button="false" title="会议室详情" class="w-[70%]">
+    <Descriptions v-if="ParticipantsDetail" size="small" :column="2" bordered
+                  :labelStyle="{width:'120px'}">
+      <DescriptionsItem label="会议室名称">
+        {{ ParticipantsDetail.meetBookingVo.name }}
+      </DescriptionsItem>
+      <DescriptionsItem label="会议主题">
+        {{ ParticipantsDetail.meetBookingVo.meetTheme }}
+      </DescriptionsItem>
+      <DescriptionsItem label="会议时间">
+        {{ ParticipantsDetail.meetBookingVo.scheduledStarttime }}
+      </DescriptionsItem>
+      <DescriptionsItem label="发起人">
+        {{ ParticipantsDetail.meetBookingVo.personName }}
+      </DescriptionsItem>
+      <DescriptionsItem label="发起单位">
+        {{ ParticipantsDetail.meetBookingVo.unitName }}
+      </DescriptionsItem>
+      <DescriptionsItem label="会议室地点">
+        {{ ParticipantsDetail.meetBookingVo.meetLocation }}
+      </DescriptionsItem>
+
+      <DescriptionsItem label="参会姓名">
+        {{ ParticipantsDetail.residentPersonVo.userName }}
+      </DescriptionsItem>
+      <DescriptionsItem label="证件号">
+        {{ ParticipantsDetail.residentPersonVo.idCard }}
+      </DescriptionsItem>
+      <DescriptionsItem label="所属公司">
+        {{ ParticipantsDetail.residentPersonVo.unitName }}
+      </DescriptionsItem>
+      <DescriptionsItem label="联系电话">
+        {{ ParticipantsDetail.residentPersonVo.phone }}
+      </DescriptionsItem>
+      <DescriptionsItem label="人脸图片" v-if="ParticipantsDetail.residentPersonVo.img" :span="2">
+        <img :src="ParticipantsDetail.residentPersonVo.img" alt="图片加载失败"  class="w-[100px] h-[100px]"/>
+      </DescriptionsItem>
+      <DescriptionsItem label="签到状态">
+        {{ ParticipantsDetail.signState === '0' ? '未签到' : '已签到'}}
+      </DescriptionsItem>
+      <DescriptionsItem label="签到时间">
+        {{ ParticipantsDetail.signTime }}
+      </DescriptionsItem>
+    </Descriptions>
+  </BasicModal>
+</template>
diff --git a/apps/web-antd/src/views/property/roomBooking/participants/participants-modal.vue b/apps/web-antd/src/views/property/roomBooking/participants/participants-modal.vue
deleted file mode 100644
index 4972eaa2..00000000
--- a/apps/web-antd/src/views/property/roomBooking/participants/participants-modal.vue
+++ /dev/null
@@ -1,101 +0,0 @@
-<script setup lang="ts">
-import { computed, ref } from 'vue';
-
-import { useVbenModal } from '@vben/common-ui';
-import { $t } from '@vben/locales';
-import { cloneDeep } from '@vben/utils';
-
-import { useVbenForm } from '#/adapter/form';
-import { participantsAdd, participantsInfo, participantsUpdate } from '#/api/property/roomBooking/participants';
-import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup';
-
-import { modalSchema } from './data';
-
-const emit = defineEmits<{ reload: [] }>();
-
-const isUpdate = ref(false);
-const title = computed(() => {
-  return isUpdate.value ? $t('pages.common.edit') : $t('pages.common.add');
-});
-
-const [BasicForm, formApi] = useVbenForm({
-  commonConfig: {
-    // 默认占满两列
-    formItemClass: 'col-span-2',
-    // 默认label宽度 px
-    labelWidth: 80,
-    // 通用配置项 会影响到所有表单项
-    componentProps: {
-      class: 'w-full',
-    }
-  },
-  schema: modalSchema(),
-  showDefaultActions: false,
-  wrapperClass: 'grid-cols-2',
-});
-
-const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
-  {
-    initializedGetter: defaultFormValueGetter(formApi),
-    currentGetter: defaultFormValueGetter(formApi),
-  },
-);
-
-const [BasicModal, modalApi] = useVbenModal({
-  // 在这里更改宽度
-  class: 'w-[550px]',
-  fullscreenButton: false,
-  onBeforeClose,
-  onClosed: handleClosed,
-  onConfirm: handleConfirm,
-  onOpenChange: async (isOpen) => {
-    if (!isOpen) {
-      return null;
-    }
-    modalApi.modalLoading(true);
-
-    const { id } = modalApi.getData() as { id?: number | string };
-    isUpdate.value = !!id;
-
-    if (isUpdate.value && id) {
-      const record = await participantsInfo(id);
-      await formApi.setValues(record);
-    }
-    await markInitialized();
-
-    modalApi.modalLoading(false);
-  },
-});
-
-async function handleConfirm() {
-  try {
-    modalApi.lock(true);
-    const { valid } = await formApi.validate();
-    if (!valid) {
-      return;
-    }
-    // getValues获取为一个readonly的对象 需要修改必须先深拷贝一次
-    const data = cloneDeep(await formApi.getValues());
-    await (isUpdate.value ? participantsUpdate(data) : participantsAdd(data));
-    resetInitialized();
-    emit('reload');
-    modalApi.close();
-  } catch (error) {
-    console.error(error);
-  } finally {
-    modalApi.lock(false);
-  }
-}
-
-async function handleClosed() {
-  await formApi.resetForm();
-  resetInitialized();
-}
-</script>
-
-<template>
-  <BasicModal :title="title">
-    <BasicForm />
-  </BasicModal>
-</template>
-
diff --git a/apps/web-antd/vite.config.mts b/apps/web-antd/vite.config.mts
index fcce105a..ded7ff75 100644
--- a/apps/web-antd/vite.config.mts
+++ b/apps/web-antd/vite.config.mts
@@ -27,7 +27,7 @@ export default defineConfig(async () => {
             changeOrigin: true,
             rewrite: (path) => path.replace(/^\/api/, ''),
             // mock代理目标地址
-            target: 'http://183.230.235.66:11010/api/',
+            target: 'http://192.168.1.110:8080',
             ws: true,
           },
         },

From 0ffe547df84df8776e28aa26efc226a56f937367 Mon Sep 17 00:00:00 2001
From: dev_ljl <2590379346@qq.com>
Date: Thu, 4 Sep 2025 16:19:47 +0800
Subject: [PATCH 4/5] =?UTF-8?q?feat:=E8=A7=86=E9=A2=91=E9=A2=84=E8=AD=A6?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=AD=97=E6=AE=B5=E6=8F=8F=E8=BF=B0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../videoWarning/videoWarningHasDone/data.ts  | 12 ++---
 .../videoWarningHasDone/warning-detail.vue    | 39 ++++++++--------
 .../videoWarningProcessing/data.ts            | 12 ++---
 .../videoWarningProcessing/warning-detail.vue | 44 +++++++++----------
 .../videoWarning/videoWarningToDone/data.ts   | 38 ++++++++--------
 .../videoWarningToDone/warning-detail.vue     | 41 +++++++----------
 6 files changed, 86 insertions(+), 100 deletions(-)

diff --git a/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningHasDone/data.ts b/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningHasDone/data.ts
index 2f2e89a3..e939bf2b 100644
--- a/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningHasDone/data.ts
+++ b/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningHasDone/data.ts
@@ -21,7 +21,7 @@ export const querySchema: FormSchemaGetter = () => [
       options: getDictOptions(DictEnum.alarm_level, true),
     },
     fieldName: 'level',
-    label: '级别',
+    label: '预警级别',
   },
   /*{
     component: 'Select',
@@ -45,7 +45,7 @@ export const columns: VxeGridProps['columns'] = [
     field: 'reportTime',
   },
   {
-    title: '设备ip',
+    title: '设备IP',
     field: 'deviceIp',
   },
   {
@@ -53,7 +53,7 @@ export const columns: VxeGridProps['columns'] = [
     field: 'deviceName',
   },
   {
-    title: '级别',
+    title: '预警级别',
     field: 'level',
     slots: {
       default: ({ row }: any) => {
@@ -138,7 +138,7 @@ export const modalSchema: FormSchemaGetter = () => [
     disabled: true,
   },
   {
-    label: '设备名称',
+    label: '设备IP',
     fieldName: 'deviceIp',
     component: 'Input',
     disabled: true,
@@ -152,7 +152,7 @@ export const modalSchema: FormSchemaGetter = () => [
     rules: 'required',
   },
   {
-    label: '重要级别',
+    label: '预警级别',
     fieldName: 'level',
     component: 'Select',
     disabled: true,
@@ -185,7 +185,7 @@ export const modalSchema: FormSchemaGetter = () => [
     rules: 'selectRequired',
   },
   {
-    label: '描述',
+    label: '预警描述',
     disabled: true,
     fieldName: 'description',
     component: 'Textarea',
diff --git a/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningHasDone/warning-detail.vue b/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningHasDone/warning-detail.vue
index 755d9fcc..2e0dd845 100644
--- a/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningHasDone/warning-detail.vue
+++ b/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningHasDone/warning-detail.vue
@@ -72,15 +72,24 @@ function loadProcessList() {
       :labelStyle="{ width: '120px' }"
       style="margin-bottom: 30px"
     >
-      <DescriptionsItem label="预警编号">
+      <DescriptionsItem label="预警编码">
         {{ warningDetail.id }}
       </DescriptionsItem>
-
-      <DescriptionsItem label="预警时间">
-        {{ warningDetail.reportTime }}
+      <DescriptionsItem label="预警类型">
+        {{ warningDetail.bigTypeName + ' - ' + warningDetail.smallTypeName }}
       </DescriptionsItem>
 
-      <DescriptionsItem label="级别">
+      <DescriptionsItem label="设备IP"
+      >{{ warningDetail.deviceIp }}
+      </DescriptionsItem>
+
+      <DescriptionsItem label="设备名称"
+      >{{ warningDetail.deviceName }}
+      </DescriptionsItem>
+      <DescriptionsItem label="预警位置" :span="2">
+        {{ warningDetail.deviceName }}
+      </DescriptionsItem>
+      <DescriptionsItem label="预警级别">
         <Tag
           :color="
             warningDetail.level === '特大'
@@ -93,27 +102,15 @@ function loadProcessList() {
           {{ warningDetail.levelName }}
         </Tag>
       </DescriptionsItem>
-
-      <DescriptionsItem label="预警类型">
-        {{ warningDetail.bigTypeName + ' - ' + warningDetail.smallTypeName }}
+      <DescriptionsItem label="预警时间">
+        {{ warningDetail.reportTime }}
       </DescriptionsItem>
 
-      <DescriptionsItem label="设备ip"
-        >{{ warningDetail.deviceIp }}
-      </DescriptionsItem>
-
-      <DescriptionsItem label="设备ip"
-        >{{ warningDetail.deviceName }}
-      </DescriptionsItem>
-
-      <DescriptionsItem label="描述" :span="2">
+      <DescriptionsItem label="预警描述" :span="2">
         {{ warningDetail.description }}
       </DescriptionsItem>
 
-      <DescriptionsItem label="所在位置" :span="2">
-        {{ warningDetail.deviceName }}
-      </DescriptionsItem>
-      <DescriptionsItem :span="2" label="附件信息">
+      <DescriptionsItem :span="2" label="相关图片">
         <div class="file-box">
           <div class="img-box" v-for="item in currFiles">
             <Image
diff --git a/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningProcessing/data.ts b/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningProcessing/data.ts
index 2f2e89a3..e939bf2b 100644
--- a/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningProcessing/data.ts
+++ b/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningProcessing/data.ts
@@ -21,7 +21,7 @@ export const querySchema: FormSchemaGetter = () => [
       options: getDictOptions(DictEnum.alarm_level, true),
     },
     fieldName: 'level',
-    label: '级别',
+    label: '预警级别',
   },
   /*{
     component: 'Select',
@@ -45,7 +45,7 @@ export const columns: VxeGridProps['columns'] = [
     field: 'reportTime',
   },
   {
-    title: '设备ip',
+    title: '设备IP',
     field: 'deviceIp',
   },
   {
@@ -53,7 +53,7 @@ export const columns: VxeGridProps['columns'] = [
     field: 'deviceName',
   },
   {
-    title: '级别',
+    title: '预警级别',
     field: 'level',
     slots: {
       default: ({ row }: any) => {
@@ -138,7 +138,7 @@ export const modalSchema: FormSchemaGetter = () => [
     disabled: true,
   },
   {
-    label: '设备名称',
+    label: '设备IP',
     fieldName: 'deviceIp',
     component: 'Input',
     disabled: true,
@@ -152,7 +152,7 @@ export const modalSchema: FormSchemaGetter = () => [
     rules: 'required',
   },
   {
-    label: '重要级别',
+    label: '预警级别',
     fieldName: 'level',
     component: 'Select',
     disabled: true,
@@ -185,7 +185,7 @@ export const modalSchema: FormSchemaGetter = () => [
     rules: 'selectRequired',
   },
   {
-    label: '描述',
+    label: '预警描述',
     disabled: true,
     fieldName: 'description',
     component: 'Textarea',
diff --git a/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningProcessing/warning-detail.vue b/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningProcessing/warning-detail.vue
index eb5f613f..fea8dd66 100644
--- a/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningProcessing/warning-detail.vue
+++ b/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningProcessing/warning-detail.vue
@@ -70,15 +70,23 @@ function loadProcessList() {
       :labelStyle="{ width: '120px' }"
       style="margin-bottom: 30px"
     >
-      <DescriptionsItem label="预警编号">
+      <DescriptionsItem label="预警编码">
         {{ warningDetail.id }}
       </DescriptionsItem>
-
-      <DescriptionsItem label="预警时间">
-        {{ warningDetail.reportTime }}
+      <DescriptionsItem label="预警类型">
+        {{ warningDetail.bigTypeName + ' - ' + warningDetail.smallTypeName }}
+      </DescriptionsItem>
+      <DescriptionsItem label="设备IP"
+      >{{ warningDetail.deviceIp }}
       </DescriptionsItem>
 
-      <DescriptionsItem label="级别">
+      <DescriptionsItem label="设备名称"
+      >{{ warningDetail.deviceName }}
+      </DescriptionsItem>
+      <DescriptionsItem label="预警位置" :span="2">
+        {{ warningDetail.deviceName }}
+      </DescriptionsItem>
+      <DescriptionsItem label="预警级别">
         <Tag
           :color="
             warningDetail.level === '特大'
@@ -91,28 +99,16 @@ function loadProcessList() {
           {{ warningDetail.levelName }}
         </Tag>
       </DescriptionsItem>
-
-      <DescriptionsItem label="预警类型">
-        {{ warningDetail.bigTypeName + ' - ' + warningDetail.smallTypeName }}
+      <DescriptionsItem label="预警时间">
+        {{ warningDetail.reportTime }}
       </DescriptionsItem>
-
-      <DescriptionsItem label="设备ip"
-        >{{ warningDetail.deviceIp }}
-      </DescriptionsItem>
-
-      <DescriptionsItem label="设备ip"
-        >{{ warningDetail.deviceName }}
-      </DescriptionsItem>
-
-      <DescriptionsItem label="描述" :span="2">
+      <DescriptionsItem label="预警描述" :span="2">
         {{ warningDetail.description }}
       </DescriptionsItem>
 
-      <DescriptionsItem label="所在位置">
-        {{ warningDetail.deviceName }}
-      </DescriptionsItem>
 
-      <DescriptionsItem label="处理状态">
+
+      <DescriptionsItem label="处理状态" :span="2">
         <Tag color="processing">
           {{ warningDetail.stateName }}
         </Tag>
@@ -126,7 +122,7 @@ function loadProcessList() {
         {{ warningDetail.processingTime || '-' }}
       </DescriptionsItem>-->
 
-      <DescriptionsItem :span="1" label="附件信息">
+      <DescriptionsItem :span="2" label="相关图片">
         <div class="file-box">
           <div class="img-box" v-for="item in currFiles">
             <Image
@@ -138,7 +134,7 @@ function loadProcessList() {
         </div>
       </DescriptionsItem>
 
-      <DescriptionsItem :span="1" label="报警视频"></DescriptionsItem>
+      <DescriptionsItem :span="2" label="报警视频"></DescriptionsItem>
     </Descriptions>
   </BasicModal>
 </template>
diff --git a/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningToDone/data.ts b/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningToDone/data.ts
index d9a81d28..b6513a58 100644
--- a/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningToDone/data.ts
+++ b/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningToDone/data.ts
@@ -22,7 +22,7 @@ export const querySchema: FormSchemaGetter = () => [
       options: getDictOptions(DictEnum.alarm_level, true),
     },
     fieldName: 'level',
-    label: '级别',
+    label: '预警级别',
   },
   /*{
     component: 'Select',
@@ -46,7 +46,7 @@ export const columns: VxeGridProps['columns'] = [
     field: 'reportTime',
   },
   {
-    title: '设备ip',
+    title: '设备IP',
     field: 'deviceIp',
   },
   {
@@ -54,7 +54,7 @@ export const columns: VxeGridProps['columns'] = [
     field: 'deviceName',
   },
   {
-    title: '级别',
+    title: '预警级别',
     field: 'level',
     slots: {
       default: ({ row }: any) => {
@@ -139,7 +139,7 @@ export const modalSchema: FormSchemaGetter = () => [
     disabled: true,
   },
   {
-    label: '设备名称',
+    label: '设备IP',
     fieldName: 'deviceIp',
     component: 'Input',
     disabled: true,
@@ -153,7 +153,7 @@ export const modalSchema: FormSchemaGetter = () => [
     rules: 'required',
   },
   {
-    label: '重要级别',
+    label: '预警级别',
     fieldName: 'level',
     component: 'Select',
     disabled: true,
@@ -186,7 +186,7 @@ export const modalSchema: FormSchemaGetter = () => [
     rules: 'selectRequired',
   },
   {
-    label: '描述',
+    label: '预警描述',
     disabled: true,
     fieldName: 'description',
     component: 'Textarea',
@@ -196,6 +196,19 @@ export const modalSchema: FormSchemaGetter = () => [
     },
   },
 
+
+  // 插入分割线
+  {
+    component: 'Divider',
+    fieldName: '_divider',
+    formItemClass: 'col-span-2',
+    hideLabel: true,
+    renderComponentContent: () => {
+      return {
+        default: () => h('div', '处理'),
+      };
+    },
+  },
   {
     label: '处理人',
     fieldName: 'solveName',
@@ -212,19 +225,6 @@ export const modalSchema: FormSchemaGetter = () => [
     fieldName: 'solveEmail',
     component: 'Input',
   },
-  // 插入分割线
-  {
-    component: 'Divider',
-    fieldName: '_divider',
-    formItemClass: 'col-span-2',
-    hideLabel: true,
-    renderComponentContent: () => {
-      return {
-        default: () => h('div', '处理'),
-      };
-    },
-  },
-
   {
     label: '备注',
     fieldName: 'remark',
diff --git a/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningToDone/warning-detail.vue b/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningToDone/warning-detail.vue
index dc0fa3eb..112bd749 100644
--- a/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningToDone/warning-detail.vue
+++ b/apps/web-antd/src/views/videoSystem/videoWarning/videoWarningToDone/warning-detail.vue
@@ -70,15 +70,23 @@ function loadProcessList() {
       :labelStyle="{ width: '120px' }"
       style="margin-bottom: 30px"
     >
-      <DescriptionsItem label="预警编号">
+      <DescriptionsItem label="预警编码">
         {{ warningDetail.id }}
       </DescriptionsItem>
-
-      <DescriptionsItem label="预警时间">
-        {{ warningDetail.reportTime }}
+      <DescriptionsItem label="预警类型">
+        {{ warningDetail.bigTypeName + ' - ' + warningDetail.smallTypeName }}
+      </DescriptionsItem>
+      <DescriptionsItem label="设备IP"
+      >{{ warningDetail.deviceIp }}
       </DescriptionsItem>
 
-      <DescriptionsItem label="级别">
+      <DescriptionsItem label="设备名称"
+      >{{ warningDetail.deviceName }}
+      </DescriptionsItem>
+      <DescriptionsItem label="预警位置" :span="2">
+        {{ warningDetail.deviceName }}
+      </DescriptionsItem>
+      <DescriptionsItem label="预警级别">
         <Tag
           :color="
             warningDetail.level === '特大'
@@ -91,28 +99,13 @@ function loadProcessList() {
           {{ warningDetail.levelName }}
         </Tag>
       </DescriptionsItem>
-
-      <DescriptionsItem label="预警类型">
-        {{ warningDetail.bigTypeName + ' - ' + warningDetail.smallTypeName }}
+      <DescriptionsItem label="预警时间">
+        {{ warningDetail.reportTime }}
       </DescriptionsItem>
-
-      <DescriptionsItem label="设备ip"
-      >{{ warningDetail.deviceIp }}
-      </DescriptionsItem>
-
-      <DescriptionsItem label="设备ip"
-      >{{ warningDetail.deviceName }}
-      </DescriptionsItem>
-
-      <DescriptionsItem label="描述" :span="2">
+      <DescriptionsItem label="预警描述" :span="2">
         {{ warningDetail.description }}
       </DescriptionsItem>
-
-      <DescriptionsItem label="所在位置" :span="2">
-        {{ warningDetail.deviceName }}
-      </DescriptionsItem>
-
-      <DescriptionsItem label="附件信息"  :span="2">
+      <DescriptionsItem label="相关图片"  :span="2">
         <div class="file-box">
           <div class="img-box" v-for="item in currFiles">
             <Image

From 9cefe1847ebe7810e158b290b945976dd272ab83 Mon Sep 17 00:00:00 2001
From: FLL <2162874245@qq.com>
Date: Thu, 4 Sep 2025 17:02:24 +0800
Subject: [PATCH 5/5] feat

---
 .../property/building/building-modal.vue      |   2 +-
 .../src/views/property/building/data.tsx      |  46 ++++++++
 .../web-antd/src/views/property/floor/data.ts |  50 ++++++++
 .../src/views/property/floor/floor-modal.vue  |   6 +-
 .../src/views/property/room/floor-tree.vue    |   4 +-
 .../src/views/property/room/index.vue         | 108 +++++++++---------
 6 files changed, 154 insertions(+), 62 deletions(-)

diff --git a/apps/web-antd/src/views/property/building/building-modal.vue b/apps/web-antd/src/views/property/building/building-modal.vue
index 0f56dc1a..366bd7c5 100644
--- a/apps/web-antd/src/views/property/building/building-modal.vue
+++ b/apps/web-antd/src/views/property/building/building-modal.vue
@@ -23,7 +23,7 @@ const [BasicForm, formApi] = useVbenForm({
     // 默认占满两列
     formItemClass: 'col-span-1',
     // 默认label宽度 px
-    labelWidth: 80,
+    labelWidth: 90,
     // 通用配置项 会影响到所有表单项
     componentProps: {
       class: 'w-full',
diff --git a/apps/web-antd/src/views/property/building/data.tsx b/apps/web-antd/src/views/property/building/data.tsx
index 289e1d1b..cd610bad 100644
--- a/apps/web-antd/src/views/property/building/data.tsx
+++ b/apps/web-antd/src/views/property/building/data.tsx
@@ -49,6 +49,10 @@ export const columns: VxeGridProps['columns'] = [
     title: '建筑名称',
     field: 'buildingName',
   },
+  {
+    title: '社区',
+    field: 'communityText',
+  },
   {
     title: '总层数',
     field: 'floorCount',
@@ -73,6 +77,18 @@ export const columns: VxeGridProps['columns'] = [
     title: '地址',
     field: 'addr',
   },
+  {
+    title: '建筑面积(㎡)',
+    field: 'area',
+  },
+  {
+    title: '套内面积(㎡)',
+    field: 'insideInArea',
+  },
+  {
+    title: '公摊面积(㎡)',
+    field: 'sharedArea',
+  },
   {
     field: 'action',
     fixed: 'right',
@@ -153,4 +169,34 @@ export const modalSchema: FormSchemaGetter = () => [
     component: 'Input',
     rules: 'required',
   },
+  {
+    label: '建筑面积(㎡)',
+    fieldName: 'area',
+    component: 'InputNumber',
+    componentProps: {
+      min:0,
+      precision:2,
+    },
+    rules: 'required',
+  },
+  {
+    label: '套内面积(㎡)',
+    fieldName: 'insideInArea',
+    component: 'InputNumber',
+    componentProps: {
+      min:0,
+      precision:2,
+    },
+    rules: 'required',
+  },
+  {
+    label: '公摊面积(㎡)',
+    fieldName: 'sharedArea',
+    component: 'InputNumber',
+    componentProps: {
+      min:0,
+      precision:2,
+    },
+    rules: 'required',
+  },
 ];
diff --git a/apps/web-antd/src/views/property/floor/data.ts b/apps/web-antd/src/views/property/floor/data.ts
index 59ba46b7..aa09282a 100644
--- a/apps/web-antd/src/views/property/floor/data.ts
+++ b/apps/web-antd/src/views/property/floor/data.ts
@@ -13,6 +13,14 @@ export const querySchema: FormSchemaGetter = () => [
 // export const columns: () => VxeGridProps['columns'] = () => [
 export const columns: VxeGridProps['columns'] = [
   { type: 'checkbox', width: 60 },
+  {
+    title: '社区',
+    field: 'communityText',
+  },
+  {
+    title: '建筑',
+    field: 'buildingText',
+  },
   {
     title: '楼层名称',
     field: 'floorName',
@@ -33,6 +41,18 @@ export const columns: VxeGridProps['columns'] = [
     title: '层高',
     field: 'floorHeight',
   },
+  {
+    title: '建筑面积(㎡)',
+    field: 'area',
+  },
+  {
+    title: '套内面积(㎡)',
+    field: 'insideInArea',
+  },
+  {
+    title: '公摊面积(㎡)',
+    field: 'sharedArea',
+  },
   {
     field: 'action',
     fixed: 'right',
@@ -95,4 +115,34 @@ export const modalSchema: FormSchemaGetter = () => [
       precision:0,
     },
   },
+  {
+    label: '建筑面积(㎡)',
+    fieldName: 'area',
+    component: 'InputNumber',
+    componentProps: {
+      min:0,
+      precision:2,
+    },
+    rules: 'required',
+  },
+  {
+    label: '套内面积(㎡)',
+    fieldName: 'insideInArea',
+    component: 'InputNumber',
+    componentProps: {
+      min:0,
+      precision:2,
+    },
+    rules: 'required',
+  },
+  {
+    label: '公摊面积(㎡)',
+    fieldName: 'sharedArea',
+    component: 'InputNumber',
+    componentProps: {
+      min:0,
+      precision:2,
+    },
+    rules: 'required',
+  },
 ];
diff --git a/apps/web-antd/src/views/property/floor/floor-modal.vue b/apps/web-antd/src/views/property/floor/floor-modal.vue
index 5fc17d33..072bec45 100644
--- a/apps/web-antd/src/views/property/floor/floor-modal.vue
+++ b/apps/web-antd/src/views/property/floor/floor-modal.vue
@@ -22,9 +22,9 @@ const title = computed(() => {
 const [BasicForm, formApi] = useVbenForm({
   commonConfig: {
     // 默认占满两列
-    formItemClass: 'col-span-2',
+    formItemClass: 'col-span-1',
     // 默认label宽度 px
-    labelWidth: 80,
+    labelWidth: 90,
     // 通用配置项 会影响到所有表单项
     componentProps: {
       class: 'w-full',
@@ -44,7 +44,7 @@ const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff(
 
 const [BasicModal, modalApi] = useVbenModal({
   // 在这里更改宽度
-  class: 'w-[550px]',
+  class: 'w-[60%]',
   fullscreenButton: false,
   onBeforeClose,
   onClosed: handleClosed,
diff --git a/apps/web-antd/src/views/property/room/floor-tree.vue b/apps/web-antd/src/views/property/room/floor-tree.vue
index 5eca1902..75982f16 100644
--- a/apps/web-antd/src/views/property/room/floor-tree.vue
+++ b/apps/web-antd/src/views/property/room/floor-tree.vue
@@ -4,7 +4,7 @@ import type { DeptTree } from '#/api/system/user/model';
 import { onMounted, ref } from 'vue';
 import { SyncOutlined } from '@ant-design/icons-vue';
 import { Empty, InputSearch, Skeleton, Tree } from 'ant-design-vue';
-import { getDeptTree } from '#/api/system/user';
+import { communityTree } from '#/api/property/community';
 
 defineOptions({ inheritAttrs: false });
 
@@ -41,7 +41,7 @@ async function loadTree() {
   showTreeSkeleton.value = true;
   searchValue.value = '';
   selectDeptId.value = [];
-  const ret = await getDeptTree();
+  const ret = await communityTree(3);
   deptTreeArray.value = ret;
   showTreeSkeleton.value = false;
 }
diff --git a/apps/web-antd/src/views/property/room/index.vue b/apps/web-antd/src/views/property/room/index.vue
index 6cf9d254..6d62e994 100644
--- a/apps/web-antd/src/views/property/room/index.vue
+++ b/apps/web-antd/src/views/property/room/index.vue
@@ -120,65 +120,61 @@ function handleDownloadExcel() {
 </script>
 
 <template>
-  <div style="display: grid;grid-template-columns: 1fr 5fr;">
-    <div style="padding: 15px 0 15px 15px;background-color: red">
+  <Page :auto-content-height="true" style="width: 100%">
+    <div class="flex h-full gap-[15px]">
       <FloorTree></FloorTree>
-    </div>
-    <div>
-      <Page :auto-content-height="true">
-        <BasicTable table-title="房间信息列表">
-          <template #toolbar-tools>
-            <Space>
-              <a-button
-                v-access:code="['property:room:export']"
-                @click="handleDownloadExcel"
-              >
-                {{ $t('pages.common.export') }}
-              </a-button>
-              <a-button
-                :disabled="!vxeCheckboxChecked(tableApi)"
-                danger
-                type="primary"
-                v-access:code="['property:room:remove']"
-                @click="handleMultiDelete">
-                {{ $t('pages.common.delete') }}
-              </a-button>
-              <a-button
-                type="primary"
-                v-access:code="['property:room:add']"
-                @click="handleAdd"
-              >
-                {{ $t('pages.common.add') }}
-              </a-button>
-            </Space>
-          </template>
-          <template #action="{ row }">
-            <Space>
+      <BasicTable class="flex-1 overflow-hidden" table-title="房间信息列表">
+        <template #toolbar-tools>
+          <Space>
+            <a-button
+              v-access:code="['property:room:export']"
+              @click="handleDownloadExcel"
+            >
+              {{ $t('pages.common.export') }}
+            </a-button>
+            <a-button
+              :disabled="!vxeCheckboxChecked(tableApi)"
+              danger
+              type="primary"
+              v-access:code="['property:room:remove']"
+              @click="handleMultiDelete">
+              {{ $t('pages.common.delete') }}
+            </a-button>
+            <a-button
+              type="primary"
+              v-access:code="['property:room:add']"
+              @click="handleAdd"
+            >
+              {{ $t('pages.common.add') }}
+            </a-button>
+          </Space>
+        </template>
+        <template #action="{ row }">
+          <Space>
+            <ghost-button
+              v-access:code="['property:room:edit']"
+              @click.stop="handleEdit(row)"
+            >
+              {{ $t('pages.common.edit') }}
+            </ghost-button>
+            <Popconfirm
+              :get-popup-container="getVxePopupContainer"
+              placement="left"
+              title="确认删除？"
+              @confirm="handleDelete(row)"
+            >
               <ghost-button
-                v-access:code="['property:room:edit']"
-                @click.stop="handleEdit(row)"
+                danger
+                v-access:code="['property:room:remove']"
+                @click.stop=""
               >
-                {{ $t('pages.common.edit') }}
+                {{ $t('pages.common.delete') }}
               </ghost-button>
-              <Popconfirm
-                :get-popup-container="getVxePopupContainer"
-                placement="left"
-                title="确认删除？"
-                @confirm="handleDelete(row)"
-              >
-                <ghost-button
-                  danger
-                  v-access:code="['property:room:remove']"
-                  @click.stop=""
-                >
-                  {{ $t('pages.common.delete') }}
-                </ghost-button>
-              </Popconfirm>
-            </Space>
-          </template>
-        </BasicTable>
-        <RoomModal @reload="tableApi.query()" />
-      </Page>
+            </Popconfirm>
+          </Space>
+        </template>
+      </BasicTable>
     </div>
-  </div>
+    <RoomModal @reload="tableApi.query()" />
+  </Page>
 </template>