From fb537fdc00755cc2f50878f3b89dd64d7ff1ccb5 Mon Sep 17 00:00:00 2001
From: zcxlsm <patrickstarlsm@163.com>
Date: Tue, 29 Jul 2025 02:05:02 +0800
Subject: [PATCH 1/7] =?UTF-8?q?feat(property):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AF=BC=E5=85=A5=E5=92=8C=E4=BA=BA=E8=84=B8?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/property/resident/person/index.ts |  55 ++++++-
 .../api/property/resident/person/model.d.ts   |  12 ++
 .../resident/person/face-import-modal.vue     | 115 ++++++++++++++
 .../views/property/resident/person/index.vue  | 148 +++++++++---------
 .../resident/person/person-import-modal.vue   | 131 ++++++++++++++++
 5 files changed, 382 insertions(+), 79 deletions(-)
 create mode 100644 apps/web-antd/src/views/property/resident/person/face-import-modal.vue
 create mode 100644 apps/web-antd/src/views/property/resident/person/person-import-modal.vue

diff --git a/apps/web-antd/src/api/property/resident/person/index.ts b/apps/web-antd/src/api/property/resident/person/index.ts
index f3593634..43f57891 100644
--- a/apps/web-antd/src/api/property/resident/person/index.ts
+++ b/apps/web-antd/src/api/property/resident/person/index.ts
@@ -1,9 +1,9 @@
-import type { PersonVO, PersonForm, PersonQuery } from './model';
+import type { PersonVO, PersonForm, PersonQuery, PerssonImportParam } from './model';
 
 import type { ID, IDS } from '#/api/common';
 import type { PageResult } from '#/api/common';
 
-import { commonExport } from '#/api/helper';
+import { commonExport, ContentTypeEnum } from '#/api/helper';
 import { requestClient } from '#/api/request';
 
 /**
@@ -59,3 +59,54 @@ export function personUpdate(data: PersonForm) {
 export function personRemove(id: ID | IDS) {
   return requestClient.deleteWithMsg<void>(`/property/person/${id}`);
 }
+
+/**
+ * 从excel导入用户
+ * @param data
+ * @returns void
+ */
+export function personImportData(data: PerssonImportParam) {
+  return requestClient.post<{ code: number; msg: string }>(
+    '/property/person/importData',
+    data,
+    {
+      headers: {
+        'Content-Type': ContentTypeEnum.FORM_DATA,
+      },
+      isTransformResponse: false,
+    },
+  );
+}
+
+/**
+ * 导入人脸
+ * @param data
+ * @returns void
+ */
+export function personImportFace(data: PerssonImportParam) {
+  return requestClient.post<{ code: number; msg: string }>(
+    '/property/person/importFace',
+    data,
+    {
+      headers: {
+        'Content-Type': ContentTypeEnum.FORM_DATA,
+      },
+      isTransformResponse: false,
+    },
+  );
+}
+
+/**
+ * 下载用户导入模板
+ * @returns blob
+ */
+export function downloadImportTemplate() {
+  return requestClient.post<Blob>(
+    '/property/person/importTemplate',
+    {},
+    {
+      isTransformResponse: false,
+      responseType: 'blob',
+    },
+  );
+}
diff --git a/apps/web-antd/src/api/property/resident/person/model.d.ts b/apps/web-antd/src/api/property/resident/person/model.d.ts
index 83b2c7a5..57f03f6b 100644
--- a/apps/web-antd/src/api/property/resident/person/model.d.ts
+++ b/apps/web-antd/src/api/property/resident/person/model.d.ts
@@ -285,3 +285,15 @@ export interface Person extends BaseEntity {
 
   email: string
 }
+
+/**
+ * @description: 用户导入
+ * @param updateSupport 是否覆盖数据
+ * @param unitId 单位Id
+ * @param file excel文件
+ */
+export interface PerssonImportParam {
+  updateSupport: boolean;
+  unitId: number;
+  file: Blob | File;
+}
diff --git a/apps/web-antd/src/views/property/resident/person/face-import-modal.vue b/apps/web-antd/src/views/property/resident/person/face-import-modal.vue
new file mode 100644
index 00000000..3fd90094
--- /dev/null
+++ b/apps/web-antd/src/views/property/resident/person/face-import-modal.vue
@@ -0,0 +1,115 @@
+<script setup lang="ts">
+import type { UploadFile } from 'ant-design-vue/es/upload/interface'
+
+import { h, ref } from 'vue'
+
+import { useVbenModal } from '@vben/common-ui'
+import { InBoxIcon } from '@vben/icons'
+
+import { Modal, Upload, Select, message } from 'ant-design-vue'
+
+import type { Resident_unitQuery } from '#/api/property/resident/unit/model'
+import { resident_unitList } from '#/api/property/resident/unit'
+import { personImportFace } from '#/api/property/resident/person'
+
+const emit = defineEmits<{ reload: [] }>()
+
+const UploadDragger = Upload.Dragger
+
+const [BasicModal, modalApi] = useVbenModal({
+  onCancel: handleCancel,
+  onConfirm: handleSubmit,
+  onOpenChange: async (isOpen) => {
+    if (!isOpen) {
+      return null
+    }
+
+    const params: Resident_unitQuery = {
+      pageNum: 1,
+      pageSize: 500,
+    }
+
+    const res = await resident_unitList(params)
+    unitOptions.value = res.rows
+  }
+})
+
+const unitOptions = ref<any[]>([])
+const fileList = ref<UploadFile[]>([])
+const unitId = ref<number>()
+const fieldNames = {
+  value: 'id',
+  label: 'name',
+}
+
+async function handleSubmit() {
+  try {
+    modalApi.modalLoading(true)
+    if (fileList.value.length !== 1) {
+      handleCancel()
+      return
+    }
+    if (!unitId.value) {
+      message.error('请选择单位！')
+      return
+    }
+    const data = {
+      file: fileList.value[0]!.originFileObj as Blob,
+      unitId: unitId.value,
+    }
+    // console.log(data)
+    // const code = 200
+    // const msg = '成功'
+    const { code, msg } = await personImportFace(data)
+    let modal = Modal.success
+    if (code === 200) {
+      emit('reload')
+    } else {
+      modal = Modal.error
+    }
+    handleCancel()
+    modal({
+      content: h('div', {
+        class: 'max-h-[260px] overflow-y-auto',
+        innerHTML: msg, // 后台已经处理xss问题
+      }),
+      title: '提示',
+    })
+  } catch (error) {
+    console.warn(error)
+    modalApi.close()
+  } finally {
+    modalApi.modalLoading(false)
+  }
+}
+
+function handleCancel() {
+  modalApi.close()
+  fileList.value = []
+}
+</script>
+
+<template>
+  <BasicModal :close-on-click-modal="false" :fullscreen-button="false" title="用户人脸导入">
+    <!-- z-index不设置会遮挡模板下载loading -->
+    <!-- 手动处理 而不是放入文件就上传 -->
+    <UploadDragger v-model:file-list="fileList" :before-upload="() => false" :max-count="1" :show-upload-list="true"
+      accept=".zip">
+      <p class="ant-upload-drag-icon flex items-center justify-center">
+        <InBoxIcon class="text-primary size-[48px]" />
+      </p>
+      <p class="ant-upload-text">点击或者拖拽到此处上传文件</p>
+    </UploadDragger>
+    <div class="mt-2 flex flex-col gap-2">
+      <div class="flex items-center gap-2">
+        <span>允许导入.zip文件</span>
+      </div>
+      <div class="flex items-center gap-2">
+        <span>
+          选择单位：
+        </span>
+        <Select :options="unitOptions" :fieldNames="fieldNames" v-model:value="unitId" style="width: 250px;" />
+      </div>
+    </div>
+  </BasicModal>
+</template>
diff --git a/apps/web-antd/src/views/property/resident/person/index.vue b/apps/web-antd/src/views/property/resident/person/index.vue
index 50d4af5a..2166815f 100644
--- a/apps/web-antd/src/views/property/resident/person/index.vue
+++ b/apps/web-antd/src/views/property/resident/person/index.vue
@@ -1,29 +1,31 @@
 <script setup lang="ts">
 
-import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui';
-import { getVxePopupContainer } from '@vben/utils';
+import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui'
+import { getVxePopupContainer } from '@vben/utils'
 
-import {Avatar, Modal, Popconfirm, Space} from 'ant-design-vue';
+import { Avatar, Modal, Popconfirm, Space } from 'ant-design-vue'
 
 import {
   useVbenVxeGrid,
   vxeCheckboxChecked,
   type VxeGridProps
-} from '#/adapter/vxe-table';
+} from '#/adapter/vxe-table'
 
 import {
   personExport,
   personList,
   personRemove, personUpdate,
-} from '#/api/property/resident/person';
-import type { PersonForm } from '#/api/property/resident/person/model';
-import { commonDownloadExcel } from '#/utils/file/download';
+} from '#/api/property/resident/person'
+import type { PersonForm } from '#/api/property/resident/person/model'
+import { commonDownloadExcel } from '#/utils/file/download'
 
-import personModal from './person-modal.vue';
-import personDetail from './person-detail.vue';
-import { columns, querySchema } from './data';
-import {useAccess} from "@vben/access";
-import {TableSwitch} from "#/components/table";
+import personModal from './person-modal.vue'
+import personDetail from './person-detail.vue'
+import personImportModal from './person-import-modal.vue'
+import faceImportModal from './face-import-modal.vue'
+import { columns, querySchema } from './data'
+import { useAccess } from "@vben/access"
+import { TableSwitch } from "#/components/table"
 
 const formOptions: VbenFormProps = {
   commonConfig: {
@@ -34,7 +36,7 @@ const formOptions: VbenFormProps = {
   },
   schema: querySchema(),
   wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4',
-};
+}
 
 const gridOptions: VxeGridProps = {
   checkboxConfig: {
@@ -56,7 +58,7 @@ const gridOptions: VxeGridProps = {
           pageNum: page.currentPage,
           pageSize: page.pageSize,
           ...formValues,
-        });
+        })
       },
     },
   },
@@ -65,60 +67,74 @@ const gridOptions: VxeGridProps = {
   },
   // 表格全局唯一表示 保存列配置需要用到
   id: 'property-person-index'
-};
+}
 
 const [BasicTable, tableApi] = useVbenVxeGrid({
   formOptions,
   gridOptions,
-});
+})
 
 const [PersonModal, modalApi] = useVbenModal({
   connectedComponent: personModal,
-});
+})
 const [PersonDetail, personDetailApi] = useVbenModal({
   connectedComponent: personDetail,
-});
+})
+const [PersonImportModal, personImportModalApi] = useVbenModal({
+  connectedComponent: personImportModal,
+})
+const [FaceImportModal, faceImportModalApi] = useVbenModal({
+  connectedComponent: faceImportModal,
+})
 
-const { hasAccessByCodes } = useAccess();
+const { hasAccessByCodes } = useAccess()
 
 function handleAdd() {
-  modalApi.setData({});
-  modalApi.open();
+  modalApi.setData({})
+  modalApi.open()
+}
+
+function handleImport() {
+  personImportModalApi.open()
+}
+
+function handleFaceImport() {
+  faceImportModalApi.open()
 }
 
 async function handleEdit(row: Required<PersonForm>) {
-  modalApi.setData({ id: row.id });
-  modalApi.open();
+  modalApi.setData({ id: row.id })
+  modalApi.open()
 }
 
 async function handleDelete(row: Required<PersonForm>) {
-  await personRemove(row.id);
-  await tableApi.query();
+  await personRemove(row.id)
+  await tableApi.query()
 }
 
 function handleMultiDelete() {
-  const rows = tableApi.grid.getCheckboxRecords();
-  const ids = rows.map((row: Required<PersonForm>) => row.id);
+  const rows = tableApi.grid.getCheckboxRecords()
+  const ids = rows.map((row: Required<PersonForm>) => row.id)
   Modal.confirm({
     title: '提示',
     okType: 'danger',
     content: `确认删除选中的${ids.length}条记录吗？`,
     onOk: async () => {
-      await personRemove(ids);
-      await tableApi.query();
+      await personRemove(ids)
+      await tableApi.query()
     },
-  });
+  })
 }
 
 function handleDownloadExcel() {
   commonDownloadExcel(personExport, '入驻员工数据', tableApi.formApi.form.values, {
     fieldMappingTime: formOptions.fieldMappingTime,
-  });
+  })
 }
 
 function handleInfo(row: Required<PersonForm>) {
-  personDetailApi.setData({ id: row.id });
-  personDetailApi.open();
+  personDetailApi.setData({ id: row.id })
+  personDetailApi.open()
 }
 </script>
 
@@ -127,68 +143,44 @@ function handleInfo(row: Required<PersonForm>) {
     <BasicTable table-title="入驻员工列表">
       <template #toolbar-tools>
         <Space>
-          <a-button
-            v-access:code="['property:person:export']"
-            @click="handleDownloadExcel"
-          >
+          <a-button v-access:code="['property:person:export']" @click="handleDownloadExcel">
             {{ $t('pages.common.export') }}
           </a-button>
-          <a-button
-            :disabled="!vxeCheckboxChecked(tableApi)"
-            danger
-            type="primary"
-            v-access:code="['property:person:remove']"
-            @click="handleMultiDelete">
+          <a-button v-access:code="['system:user:import']" @click="handleImport">
+            {{ $t('pages.common.import') }}
+          </a-button>
+          <a-button @click="handleFaceImport">
+            人脸导入
+          </a-button>
+          <a-button :disabled="!vxeCheckboxChecked(tableApi)" danger type="primary"
+            v-access:code="['property:person:remove']" @click="handleMultiDelete">
             {{ $t('pages.common.delete') }}
           </a-button>
-          <a-button
-            type="primary"
-            v-access:code="['property:person:add']"
-            @click="handleAdd"
-          >
+          <a-button type="primary" v-access:code="['property:person:add']" @click="handleAdd">
             {{ $t('pages.common.add') }}
           </a-button>
         </Space>
       </template>
       <template #img="{ row }">
         <Avatar :src="row.img" v-if="row.img" />
-        <span v-else >无</span>
+        <span v-else>无</span>
       </template>
       <template #state="{ row }">
-
-        <TableSwitch
-          :checkedValue="1"
-          :unCheckedValue="0"
-          v-model:value="row.state"
-          :api="() => personUpdate(row)"
-          :disabled="!hasAccessByCodes(['property:person:edit'])"
-          @reload="() => tableApi.query()"
-        />
+  
+        <TableSwitch :checkedValue="1" :unCheckedValue="0" v-model:value="row.state" :api="() => personUpdate(row)"
+          :disabled="!hasAccessByCodes(['property:person:edit'])" @reload="() => tableApi.query()" />
       </template>
       <template #action="{ row }">
         <Space>
-          <ghost-button
-            @click.stop="handleInfo(row)"
-          >
+          <ghost-button @click.stop="handleInfo(row)">
             {{ $t('pages.common.info') }}
           </ghost-button>
-          <ghost-button
-            v-access:code="['property:person:edit']"
-            @click.stop="handleEdit(row)"
-          >
+          <ghost-button v-access:code="['property:person: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:person:remove']"
-              @click.stop=""
-            >
+          <Popconfirm :get-popup-container="getVxePopupContainer" placement="left" title="确认删除？"
+            @confirm="handleDelete(row)">
+            <ghost-button danger v-access:code="['property:person:remove']" @click.stop="">
               {{ $t('pages.common.delete') }}
             </ghost-button>
           </Popconfirm>
@@ -197,10 +189,12 @@ function handleInfo(row: Required<PersonForm>) {
     </BasicTable>
     <PersonModal @reload="tableApi.query()" />
     <PersonDetail></PersonDetail>
+    <PersonImportModal />
+    <FaceImportModal />
   </Page>
 </template>
 <style scoped>
-:where(.css-dev-only-do-not-override-aza1th).ant-avatar{
+:where(.css-dev-only-do-not-override-aza1th).ant-avatar {
   border-radius: 0;
 }
 </style>
diff --git a/apps/web-antd/src/views/property/resident/person/person-import-modal.vue b/apps/web-antd/src/views/property/resident/person/person-import-modal.vue
new file mode 100644
index 00000000..03d085da
--- /dev/null
+++ b/apps/web-antd/src/views/property/resident/person/person-import-modal.vue
@@ -0,0 +1,131 @@
+<script setup lang="ts">
+import type { UploadFile } from 'ant-design-vue/es/upload/interface'
+
+import { h, ref, unref } from 'vue'
+
+import { useVbenModal } from '@vben/common-ui'
+import { ExcelIcon, InBoxIcon } from '@vben/icons'
+
+import { Modal, Switch, Upload, Select, message } from 'ant-design-vue'
+
+import type { Resident_unitQuery } from '#/api/property/resident/unit/model'
+import { resident_unitList } from '#/api/property/resident/unit'
+import { downloadImportTemplate, personImportData } from '#/api/property/resident/person'
+import { commonDownloadExcel } from '#/utils/file/download'
+
+const emit = defineEmits<{ reload: [] }>()
+
+const UploadDragger = Upload.Dragger
+
+const [BasicModal, modalApi] = useVbenModal({
+  onCancel: handleCancel,
+  onConfirm: handleSubmit,
+  onOpenChange: async (isOpen) => {
+    if (!isOpen) {
+      return null
+    }
+
+    const params: Resident_unitQuery = {
+      pageNum: 1,
+      pageSize: 500,
+    }
+
+    const res = await resident_unitList(params)
+    unitOptions.value = res.rows
+  }
+})
+
+const unitOptions = ref<any[]>([])
+const fileList = ref<UploadFile[]>([])
+const checked = ref(false)
+const unitId = ref<number>()
+const fieldNames = {
+  value: 'id',
+  label: 'name',
+}
+
+async function handleSubmit() {
+  try {
+    modalApi.modalLoading(true)
+    if (fileList.value.length !== 1) {
+      handleCancel()
+      return
+    }
+    if (!unitId.value) {
+      message.error('请选择单位！')
+      return
+    }
+    const data = {
+      file: fileList.value[0]!.originFileObj as Blob,
+      updateSupport: unref(checked),
+      unitId: unitId.value,
+    }
+    // console.log(data)
+    // const code = 200
+    // const msg = '成功'
+    const { code, msg } = await personImportData(data)
+    let modal = Modal.success
+    if (code === 200) {
+      emit('reload')
+    } else {
+      modal = Modal.error
+    }
+    handleCancel()
+    modal({
+      content: h('div', {
+        class: 'max-h-[260px] overflow-y-auto',
+        innerHTML: msg, // 后台已经处理xss问题
+      }),
+      title: '提示',
+    })
+  } catch (error) {
+    console.warn(error)
+    modalApi.close()
+  } finally {
+    modalApi.modalLoading(false)
+  }
+}
+
+function handleCancel() {
+  modalApi.close()
+  fileList.value = []
+  checked.value = false
+}
+</script>
+
+<template>
+  <BasicModal :close-on-click-modal="false" :fullscreen-button="false" title="用户导入">
+    <!-- z-index不设置会遮挡模板下载loading -->
+    <!-- 手动处理 而不是放入文件就上传 -->
+    <UploadDragger v-model:file-list="fileList" :before-upload="() => false" :max-count="1" :show-upload-list="true"
+      accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel">
+      <p class="ant-upload-drag-icon flex items-center justify-center">
+        <InBoxIcon class="text-primary size-[48px]" />
+      </p>
+      <p class="ant-upload-text">点击或者拖拽到此处上传文件</p>
+    </UploadDragger>
+    <div class="mt-2 flex flex-col gap-2">
+      <div class="flex items-center gap-2">
+        <span>允许导入xlsx, xls文件</span>
+        <a-button type="link" @click="commonDownloadExcel(downloadImportTemplate, '入驻员工导入模板')">
+          <div class="flex items-center gap-[4px]">
+            <ExcelIcon />
+            <span>下载模板</span>
+          </div>
+        </a-button>
+      </div>
+      <div class="flex items-center gap-2">
+        <span :class="{ 'text-red-500': checked }">
+          是否更新/覆盖已存在的用户数据
+        </span>
+        <Switch v-model:checked="checked" />
+      </div>
+      <div class="flex items-center gap-2">
+        <span :class="{ 'text-red-500': checked }">
+          选择单位：
+        </span>
+        <Select :options="unitOptions" :fieldNames="fieldNames" v-model:value="unitId" style="width: 250px;" />
+      </div>
+    </div>
+  </BasicModal>
+</template>

From ce445ae088e7e3ed9478976e3eff49e40980cc6f Mon Sep 17 00:00:00 2001
From: fyy <2717885210@qq.com>
Date: Tue, 29 Jul 2025 11:42:20 +0800
Subject: [PATCH 2/7] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=AF=BC=E8=88=AA=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/@core/preferences/src/types.ts            |  2 ++
 .../effects/layouts/src/basic/header/header.vue    | 13 ++++++++++++-
 .../layouts/src/widgets/back-navigation.vue        | 14 ++++++++++++++
 packages/effects/layouts/src/widgets/index.ts      |  1 +
 4 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 packages/effects/layouts/src/widgets/back-navigation.vue

diff --git a/packages/@core/preferences/src/types.ts b/packages/@core/preferences/src/types.ts
index e640edb5..f2094073 100644
--- a/packages/@core/preferences/src/types.ts
+++ b/packages/@core/preferences/src/types.ts
@@ -267,6 +267,8 @@ interface WidgetPreferences {
   sidebarToggle: boolean;
   /** 是否显示主题切换部件 */
   themeToggle: boolean;
+  /** 是否显示返回导航部件 */
+  backNavigation: boolean;
 }
 
 interface Preferences {
diff --git a/packages/effects/layouts/src/basic/header/header.vue b/packages/effects/layouts/src/basic/header/header.vue
index 97387460..59276af9 100644
--- a/packages/effects/layouts/src/basic/header/header.vue
+++ b/packages/effects/layouts/src/basic/header/header.vue
@@ -11,6 +11,7 @@ import {
   LanguageToggle,
   PreferencesButton,
   ThemeToggle,
+  BackNavigation,
 } from '../../widgets';
 
 interface Props {
@@ -43,7 +44,8 @@ const rightSlots = computed(() => {
     list.push({
       index: REFERENCE_VALUE,
       name: 'global-search',
-    });
+    }
+    );
   }
 
   if (preferencesButtonPosition.value.header) {
@@ -76,6 +78,12 @@ const rightSlots = computed(() => {
       name: 'notification',
     });
   }
+  if (preferences.widget.backNavigation) {
+    list.push({
+      index: REFERENCE_VALUE + 60,
+      name: 'back-navigation',
+    });
+  }
 
   Object.keys(slots).forEach((key) => {
     const name = key.split('-');
@@ -164,6 +172,9 @@ function clearPreferencesAndLogout() {
         <template v-else-if="slot.name === 'fullscreen'">
           <VbenFullScreen class="mr-1" />
         </template>
+        <template v-else-if="slot.name === 'back-navigation'">
+          <BackNavigation class="mr-1" />
+        </template>
       </slot>
     </template>
   </div>
diff --git a/packages/effects/layouts/src/widgets/back-navigation.vue b/packages/effects/layouts/src/widgets/back-navigation.vue
new file mode 100644
index 00000000..d2b51266
--- /dev/null
+++ b/packages/effects/layouts/src/widgets/back-navigation.vue
@@ -0,0 +1,14 @@
+<script setup lang="ts">
+import { ArrowLeft } from '@vben/icons';
+import { VbenIconButton } from '@vben-core/shadcn-ui';
+import { useRouter } from 'vue-router';
+const router = useRouter();
+const back = () => {
+    router.push('/navigation');
+}
+</script>
+<template>
+    <VbenIconButton @click="back">
+        <ArrowLeft></ArrowLeft>
+    </VbenIconButton>
+</template>
\ No newline at end of file
diff --git a/packages/effects/layouts/src/widgets/index.ts b/packages/effects/layouts/src/widgets/index.ts
index f6a4a7ba..9b0b9be7 100644
--- a/packages/effects/layouts/src/widgets/index.ts
+++ b/packages/effects/layouts/src/widgets/index.ts
@@ -9,3 +9,4 @@ export * from './notification';
 export * from './preferences';
 export * from './theme-toggle';
 export * from './user-dropdown';
+export { default as BackNavigation } from './back-navigation.vue';

From b912ca5aa51b3db838a4f8ee65663fb3de5b9fcd Mon Sep 17 00:00:00 2001
From: FLL <2162874245@qq.com>
Date: Tue, 29 Jul 2025 14:43:50 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E8=83=BD=E8=80=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../property/businessManagement/workOrdersType/data.ts    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/web-antd/src/views/property/businessManagement/workOrdersType/data.ts b/apps/web-antd/src/views/property/businessManagement/workOrdersType/data.ts
index 56133e2b..3c5f97ab 100644
--- a/apps/web-antd/src/views/property/businessManagement/workOrdersType/data.ts
+++ b/apps/web-antd/src/views/property/businessManagement/workOrdersType/data.ts
@@ -26,10 +26,10 @@ export const querySchema: FormSchemaGetter = () => [
 
 export const columns: VxeGridProps['columns'] = [
   { type: 'checkbox', width: 60 },
-  {
-    title: '工单类型编号',
-    field: 'orderTypeNo',
-  },
+  // {
+  //   title: '工单类型编号',
+  //   field: 'orderTypeNo',
+  // },
   {
     title: '类型名称',
     field: 'orderTypeName',

From 9cb6d99e9079feb0d6d97780865071b84328bf22 Mon Sep 17 00:00:00 2001
From: FLL <2162874245@qq.com>
Date: Tue, 29 Jul 2025 14:56:52 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E8=83=BD=E8=80=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../businessManagement/workOrders/orders-modal.vue   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/web-antd/src/views/property/businessManagement/workOrders/orders-modal.vue b/apps/web-antd/src/views/property/businessManagement/workOrders/orders-modal.vue
index df252f63..1cac71f2 100644
--- a/apps/web-antd/src/views/property/businessManagement/workOrders/orders-modal.vue
+++ b/apps/web-antd/src/views/property/businessManagement/workOrders/orders-modal.vue
@@ -8,10 +8,10 @@ import {
 } from '#/api/property/businessManagement/workOrders';
 import {defaultFormValueGetter, useBeforeCloseDiff} from '#/utils/popup';
 import {ordersModalSchema} from './data';
-import {personList} from "#/api/property/resident/person";
 import {renderDictValue} from "#/utils/render";
-import {onMounted, ref} from "vue";
-import { useUserStore } from '@vben/stores';
+import {ref} from "vue";
+import {useUserStore} from '@vben/stores';
+import {userList} from "#/api/system/user";
 
 const userStore = useUserStore();
 const emit = defineEmits<{ reload: [] }>();
@@ -109,10 +109,10 @@ async function queryPersonData() {
     pageSize: 1000,
     pageNum: 1,
   }
-  const res = await personList(params);
+  const res = await userList(params);
   const options = res.rows.map((user) => ({
-    label: user.userName + '-' + renderDictValue(user.gender, 'sys_user_sex') + '-' + user.phone,
-    value: user.id,
+    label: user.nickName + '-' + renderDictValue(user.sex, 'sys_user_sex') + '-' + user.phonenumber,
+    value: user.userId,
   }));
   formApi.updateSchema([
     {

From 84cade81df5fc27d62e7f4f3738d0603039a21ff Mon Sep 17 00:00:00 2001
From: dev_ljl <2590379346@qq.com>
Date: Tue, 29 Jul 2025 15:26:41 +0800
Subject: [PATCH 5/7] =?UTF-8?q?fix=EF=BC=9A=E5=B7=A1=E6=A3=80=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E7=BC=96=E8=BE=91=E3=80=81=E4=BF=9D=E5=85=BB=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../attendanceGroupSettings/model.d.ts             | 10 ++++++++--
 .../equipmentManagement/maintainPlan/model.d.ts    |  2 ++
 .../inspectionManagement/inspectionPlan/model.d.ts |  2 +-
 .../attendance-group-detail.vue                    |  6 +++---
 .../attendanceGroupSettings/group-modal.vue        |  2 +-
 .../equipmentManagement/maintainPlan/data.ts       |  2 +-
 .../maintainPlan/maintainPlan-modal.vue            | 14 +++++++-------
 .../maintainPlan/plan-detail.vue                   |  8 ++++++--
 .../inspectionPlan/inspectionPlan-modal.vue        | 12 ++++++------
 9 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/apps/web-antd/src/api/property/attendanceManagement/attendanceGroupSettings/model.d.ts b/apps/web-antd/src/api/property/attendanceManagement/attendanceGroupSettings/model.d.ts
index 0bc06bd2..21ade3dc 100644
--- a/apps/web-antd/src/api/property/attendanceManagement/attendanceGroupSettings/model.d.ts
+++ b/apps/web-antd/src/api/property/attendanceManagement/attendanceGroupSettings/model.d.ts
@@ -19,9 +19,15 @@ export interface GroupVO {
   /**
    * 考勤类型(0:固定班制,1:排班制)
    */
-  attendanceType: number;
+  attendanceType: number| string;
 
-  isAutomatic: number;
+  isAutomatic: boolean;
+
+  clockDateList: any[];
+
+  weekList: any[];
+
+  attendanceList:any[];
 
 }
 
diff --git a/apps/web-antd/src/api/property/equipmentManagement/maintainPlan/model.d.ts b/apps/web-antd/src/api/property/equipmentManagement/maintainPlan/model.d.ts
index 6350b7c2..4f89a0b2 100644
--- a/apps/web-antd/src/api/property/equipmentManagement/maintainPlan/model.d.ts
+++ b/apps/web-antd/src/api/property/equipmentManagement/maintainPlan/model.d.ts
@@ -61,6 +61,8 @@ export interface MaintainPlanVO {
   userId: string[];
 
   machineMaintainPlanStaffBoList:any[];
+
+  machineMaintainPlanStaffVos:any[];
 }
 
 export interface MaintainPlanForm extends BaseEntity {
diff --git a/apps/web-antd/src/api/property/inspectionManagement/inspectionPlan/model.d.ts b/apps/web-antd/src/api/property/inspectionManagement/inspectionPlan/model.d.ts
index 56008843..7467c144 100644
--- a/apps/web-antd/src/api/property/inspectionManagement/inspectionPlan/model.d.ts
+++ b/apps/web-antd/src/api/property/inspectionManagement/inspectionPlan/model.d.ts
@@ -19,7 +19,7 @@ export interface InspectionPlanVO {
   /**
    * 巡检周期
    */
-  inspectionPlanPeriod: number;
+  inspectionPlanPeriod: string;
 
   /**
    * 任务提前分组
diff --git a/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/attendance-group-detail.vue b/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/attendance-group-detail.vue
index def438ed..95c1db8e 100644
--- a/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/attendance-group-detail.vue
+++ b/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/attendance-group-detail.vue
@@ -45,7 +45,7 @@ async function handleOpenChange(open: boolean) {
   }
   modalApi.modalLoading(true);
   const {id,attendanceType} = modalApi.getData() as { id?: number | string,attendanceType?:string };
-  const res = await groupInfo(id,attendanceType);
+  const res = await groupInfo(id as string,attendanceType as string);
   groupDetail.value=res;
   if(res.attendanceType==0){
     unCheckInData.value=res.clockDateList.filter(item=>item.mustNoCheck==0)
@@ -65,7 +65,7 @@ async function handleOpenChange(open: boolean) {
     })
     groupDetail.value.isAutomatic=true
   }else {
-    cycleData.value=res;
+    cycleData.value=[];
   }
   modalApi.modalLoading(false);
 }
@@ -115,7 +115,7 @@ async function showHoliday() {
               size="small"
               :pagination="false"
             >
-              <template #bodyCell="{ column, record, index }">
+              <template #bodyCell="{ column, record }">
                 <template v-if="column.dataIndex === 'dayOfWeek'">
                  <component :is="renderDict(record.dayOfWeek,'wy_kqgzr')"></component>
                 </template>
diff --git a/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/group-modal.vue b/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/group-modal.vue
index bce2bccb..25246edf 100644
--- a/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/group-modal.vue
+++ b/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/group-modal.vue
@@ -89,7 +89,7 @@ const [BasicModal, modalApi] = useVbenModal({
     };
     isUpdate.value = !!id;
     if (isUpdate.value && id) {
-      const record = await groupInfo(id, attendanceType);
+      const record = await groupInfo(id, attendanceType as string);
       record.attendanceType = record.attendanceType.toString()
       if (record.attendanceType == '0') {
         settingData.unCheckInData = record.clockDateList.filter(item => item.mustNoCheck == 0)
diff --git a/apps/web-antd/src/views/property/equipmentManagement/maintainPlan/data.ts b/apps/web-antd/src/views/property/equipmentManagement/maintainPlan/data.ts
index a599cef5..0565d614 100644
--- a/apps/web-antd/src/views/property/equipmentManagement/maintainPlan/data.ts
+++ b/apps/web-antd/src/views/property/equipmentManagement/maintainPlan/data.ts
@@ -177,7 +177,7 @@ export const modalSchema: FormSchemaGetter = () => [
     rules:'required'
   },
   {
-    label: '巡检人员',
+    label: '保养人员',
     fieldName: 'userId',
     component: 'ApiSelect',
     componentProps:{
diff --git a/apps/web-antd/src/views/property/equipmentManagement/maintainPlan/maintainPlan-modal.vue b/apps/web-antd/src/views/property/equipmentManagement/maintainPlan/maintainPlan-modal.vue
index c2562fe5..3e1c1c07 100644
--- a/apps/web-antd/src/views/property/equipmentManagement/maintainPlan/maintainPlan-modal.vue
+++ b/apps/web-antd/src/views/property/equipmentManagement/maintainPlan/maintainPlan-modal.vue
@@ -15,8 +15,8 @@ import {defaultFormValueGetter, useBeforeCloseDiff} from '#/utils/popup';
 
 import {modalSchema} from './data';
 import {getMachineTypeTree} from "#/api/property/machineType";
-import {personList} from "#/api/property/resident/person";
 import {renderDictValue} from "#/utils/render";
+import {userList} from "#/api/system/user";
 
 const emit = defineEmits<{ reload: [] }>();
 
@@ -72,8 +72,8 @@ const [BasicModal, modalApi] = useVbenModal({
         record.maintainMonth = record.maintainMonth?.split(',')
         record.maintainDay = record.maintainDay?.split(',')
       }
-      if (record.machineMaintainPlanStaffBoList) {
-        record.userId =  record.machineMaintainPlanStaffBoList.map(item=>item.userId)
+      if (record.machineMaintainPlanStaffVos) {
+        record.userId =  record.machineMaintainPlanStaffVos.map(item=>item.userId.toString())
       }
       await formApi.setValues(record);
     }
@@ -161,11 +161,11 @@ async function queryPersonData() {
     pageSize: 1000,
     pageNum: 1,
   }
-  const res = await personList(params);
+  const res = await userList(params);
   const options = res.rows.map((user) => ({
-    label: user.userName + '-' + renderDictValue(user.gender, 'sys_user_sex')
-      + '-' + user.phone + '-' + user.unitName,
-    value: user.id,
+    label: user.nickName + '-' + renderDictValue(user.sex, 'sys_user_sex')
+      + '-' + user.phonenumber,
+    value: user.userId.toString(),
   }));
   formApi.updateSchema([{
     componentProps: () => ({
diff --git a/apps/web-antd/src/views/property/equipmentManagement/maintainPlan/plan-detail.vue b/apps/web-antd/src/views/property/equipmentManagement/maintainPlan/plan-detail.vue
index 895b6e20..150c3007 100644
--- a/apps/web-antd/src/views/property/equipmentManagement/maintainPlan/plan-detail.vue
+++ b/apps/web-antd/src/views/property/equipmentManagement/maintainPlan/plan-detail.vue
@@ -10,7 +10,6 @@ import {renderDict} from "#/utils/render";
 dayjs.extend(duration);
 dayjs.extend(relativeTime);
 import {CheckboxGroup} from 'ant-design-vue'
-import {getDictOptions} from "#/utils/dict";
 import {maintainPlanInfo} from "#/api/property/equipmentManagement/maintainPlan";
 import type {MaintainPlanVO} from "#/api/property/equipmentManagement/maintainPlan/model";
 
@@ -78,11 +77,16 @@ const monthArr=Array.from({ length: 12 }, (_, i) => ({
       <DescriptionsItem label="计划日期" :span="2">
         {{ maintainPlanDetail.startDate + '\xa0至\xa0' + maintainPlanDetail.endDate }}
       </DescriptionsItem>
-      <DescriptionsItem label="状态" v-if="maintainPlanDetail.state!=null">
+      <DescriptionsItem label="状态" v-if="maintainPlanDetail.state!=null" :span="2">
         <component
           :is="renderDict(maintainPlanDetail.state,'wy_state')"
         />
       </DescriptionsItem>
+      <DescriptionsItem label="保养人员" :span="2">
+        <span style="margin-right: 10px;" v-for="item in maintainPlanDetail.machineMaintainPlanStaffVos">
+          {{item.userName}}
+        </span>
+      </DescriptionsItem>
     </Descriptions>
   </BasicModal>
 </template>
diff --git a/apps/web-antd/src/views/property/inspectionManagement/inspectionPlan/inspectionPlan-modal.vue b/apps/web-antd/src/views/property/inspectionManagement/inspectionPlan/inspectionPlan-modal.vue
index bbd5bab6..870e35bc 100644
--- a/apps/web-antd/src/views/property/inspectionManagement/inspectionPlan/inspectionPlan-modal.vue
+++ b/apps/web-antd/src/views/property/inspectionManagement/inspectionPlan/inspectionPlan-modal.vue
@@ -14,10 +14,10 @@ import {
 import {defaultFormValueGetter, useBeforeCloseDiff} from '#/utils/popup';
 
 import {modalSchema} from './data';
-import {personList} from "#/api/property/resident/person";
 import {renderDictValue} from "#/utils/render";
 import {inspectionRouteList} from "#/api/property/inspectionManagement/inspectionRoute";
 import {InputNumber} from 'ant-design-vue'
+import {userList} from "#/api/system/user";
 
 const emit = defineEmits<{ reload: [] }>();
 
@@ -75,7 +75,7 @@ const [BasicModal, modalApi] = useVbenModal({
         record.inspectionWorkday = record.inspectionWorkday?.split(',')
       }
       if (record.inspectionPlanStaffVoList && record.inspectionPlanStaffVoList.length) {
-        record.userId = record.inspectionPlanStaffVoList.map(item => item.userId)
+        record.userId = record.inspectionPlanStaffVoList.map(item => item.userId.toString())
       }
       await formApi.setValues(record);
     }
@@ -140,11 +140,11 @@ async function queryPersonData() {
     pageSize: 1000,
     pageNum: 1,
   }
-  const res = await personList(params);
+  const res = await userList(params);
   const options = res.rows.map((user) => ({
-    label: user.userName + '-' + renderDictValue(user.gender, 'sys_user_sex')
-      + '-' + user.phone + '-' + user.unitName,
-    value: user.id,
+    label: user.nickName + '-' + renderDictValue(user.sex, 'sys_user_sex')
+      + '-' + user.phonenumber,
+    value: user.userId.toString(),
   }));
   formApi.updateSchema([{
     componentProps: () => ({

From 9acceacdf0e15ebaa256264dfc684f6e4b77b246 Mon Sep 17 00:00:00 2001
From: fyy <2717885210@qq.com>
Date: Tue, 29 Jul 2025 17:23:12 +0800
Subject: [PATCH 6/7] =?UTF-8?q?fix:=20=E5=9B=AD=E5=8C=BA=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=A4=BE=E5=8C=BA=E7=B1=BB=E5=9E=8B=E9=94=99?=
 =?UTF-8?q?=E8=AF=AFbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/property/community/community-modal.vue        | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/web-antd/src/views/property/community/community-modal.vue b/apps/web-antd/src/views/property/community/community-modal.vue
index a2ffc793..c35956bc 100644
--- a/apps/web-antd/src/views/property/community/community-modal.vue
+++ b/apps/web-antd/src/views/property/community/community-modal.vue
@@ -64,8 +64,10 @@ const [BasicModal, modalApi] = useVbenModal({
     isUpdate.value = !!id;
     if (isUpdate.value && id) {
       const record = await communityInfo(id);
-      await formApi.setValues(record);
-
+      await formApi.setValues({
+        ...record,
+        communityType: String(record.communityType),
+      });
     }
 
     setupDeptSelect();

From 62f1d43ac50d590595b00b4a0b3276aa94732e60 Mon Sep 17 00:00:00 2001
From: dev_ljl <2590379346@qq.com>
Date: Tue, 29 Jul 2025 17:26:45 +0800
Subject: [PATCH 7/7] =?UTF-8?q?fix:=E8=80=83=E5=8B=A4=E7=BB=84=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../attendanceGroupSettings/model.d.ts        |  2 ++
 .../attendance-group-detail.vue               | 14 ++++++++++++-
 .../attendanceGroupSettings/group-modal.vue   | 20 +++++++++++++++++--
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/apps/web-antd/src/api/property/attendanceManagement/attendanceGroupSettings/model.d.ts b/apps/web-antd/src/api/property/attendanceManagement/attendanceGroupSettings/model.d.ts
index 21ade3dc..940efe53 100644
--- a/apps/web-antd/src/api/property/attendanceManagement/attendanceGroupSettings/model.d.ts
+++ b/apps/web-antd/src/api/property/attendanceManagement/attendanceGroupSettings/model.d.ts
@@ -29,6 +29,8 @@ export interface GroupVO {
 
   attendanceList:any[];
 
+  scheduleCycleList:any[];
+
 }
 
 export interface GroupForm extends BaseEntity {
diff --git a/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/attendance-group-detail.vue b/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/attendance-group-detail.vue
index 95c1db8e..7037f95a 100644
--- a/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/attendance-group-detail.vue
+++ b/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/attendance-group-detail.vue
@@ -65,7 +65,19 @@ async function handleOpenChange(open: boolean) {
     })
     groupDetail.value.isAutomatic=true
   }else {
-    cycleData.value=[];
+    cycleData.value=res.scheduleCycleList;
+    cycleData.value.forEach(item => {
+      if(item.shiftId){
+        const shift = res.attendanceList.find(i => item.shiftId == i.id);
+        let str = ''
+        if (shift.isRest) {
+          str = `${shift.name}：${shift.startTime}~${shift.restStartTime} ${shift.restEndTime}~${shift.endTime}`;
+        } else {
+          str = `${shift.name}：${shift.startTime}~${shift.endTime}`;
+        }
+        item.shiftValue=str
+      }
+    })
   }
   modalApi.modalLoading(false);
 }
diff --git a/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/group-modal.vue b/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/group-modal.vue
index 25246edf..b5d4123f 100644
--- a/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/group-modal.vue
+++ b/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/group-modal.vue
@@ -96,7 +96,22 @@ const [BasicModal, modalApi] = useVbenModal({
         settingData.checkInData = record.clockDateList.filter(item => item.mustNoCheck == 1)
         settingData.weekdayData = record.weekList
         settingData.weekdayData.forEach(item => {
+          if (item.shiftId) {
+            const shift = record.attendanceList.find(i => item.shiftId == i.id);
+            let str = ''
+            if (shift.isRest) {
+              str = `${shift.name}：${shift.startTime}~${shift.restStartTime} ${shift.restEndTime}~${shift.endTime}`;
+            } else {
+              str = `${shift.name}：${shift.startTime}~${shift.endTime}`;
+            }
+            item.shiftValue = str
+          }
+        })
+      } else {
+        settingData.cycleData=record.scheduleCycleList
+        settingData.cycleData.forEach(item => {
           if(item.shiftId){
+            item.scheduleId=item.shiftId
             const shift = record.attendanceList.find(i => item.shiftId == i.id);
             let str = ''
             if (shift.isRest) {
@@ -107,8 +122,7 @@ const [BasicModal, modalApi] = useVbenModal({
             item.shiftValue=str
           }
         })
-      } else {
-
+        shiftList.value=record.attendanceList
       }
       await formApi.setValues(record);
     } else {
@@ -179,6 +193,8 @@ async function handleClosed() {
     checkInData: [],
     shiftId: '',
   });
+  shiftInfo.value = undefined
+  shiftList.value = []
 }
 
 const [HolidayCalendar, holidayApi] = useVbenModal({