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

apps/web-antd/src/api/property/inspectionManagement/inspectionDetail/index.ts

@@ -0,0 +1,61 @@
+import type { TaskDetailVO, TaskDetailForm, TaskDetailQuery } 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 taskDetailList(params?: TaskDetailQuery) {
+  return requestClient.get<PageResult<TaskDetailVO>>('/property/taskDetail/list', { params });
+}
+
+/**
+ * 导出巡检明细列表
+ * @param params
+ * @returns 巡检明细列表
+ */
+export function taskDetailExport(params?: TaskDetailQuery) {
+  return commonExport('/property/taskDetail/export', params ?? {});
+}
+
+/**
+ * 查询巡检明细详情
+ * @param id id
+ * @returns 巡检明细详情
+ */
+export function taskDetailInfo(id: ID) {
+  return requestClient.get<TaskDetailVO>(`/property/taskDetail/${id}`);
+}
+
+/**
+ * 新增巡检明细
+ * @param data
+ * @returns void
+ */
+export function taskDetailAdd(data: TaskDetailForm) {
+  return requestClient.postWithMsg<void>('/property/taskDetail', data);
+}
+
+/**
+ * 更新巡检明细
+ * @param data
+ * @returns void
+ */
+export function taskDetailUpdate(data: TaskDetailForm) {
+  return requestClient.putWithMsg<void>('/property/taskDetail', data);
+}
+
+/**
+ * 删除巡检明细
+ * @param id id
+ * @returns void
+ */
+export function taskDetailRemove(id: ID | IDS) {
+  return requestClient.deleteWithMsg<void>(`/property/taskDetail/${id}`);
+}

apps/web-antd/src/api/property/inspectionManagement/inspectionDetail/model.d.ts

@@ -0,0 +1,201 @@
+import type { PageQuery, BaseEntity } from '#/api/common';
+
+export interface TaskDetailVO {
+  /**
+   * 主键id
+   */
+  id: string | number;
+
+  /**
+   * 任务id
+   */
+  taskId: string | number;
+
+  /**
+   * 路线id
+   */
+  routeId: string | number;
+
+  /**
+   * 巡检计划id
+   */
+  planId: string | number;
+
+  /**
+   * 巡检点id
+   */
+  pointId: string | number;
+
+  /**
+   * 巡检方式
+   */
+  patrolType: string;
+
+  /**
+   * 签到类型
+   */
+  signType: string;
+
+  /**
+   * 巡检状态(0未完成,1已完成)
+   */
+  inspectionState: string;
+
+  /**
+   * 巡检照片
+   */
+  inspectionImag
+e: string;
+
+  /**
+   * 实际巡检时间
+   */
+  inspectionTime: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+  /**
+   * 点开始时间
+   */
+  pointStartTime: string;
+
+  /**
+   * 点结束时间
+   */
+  pointEndTime: string;
+
+}
+
+export interface TaskDetailForm extends BaseEntity {
+  /**
+   * 主键id
+   */
+  id?: string | number;
+
+  /**
+   * 任务id
+   */
+  taskId?: string | number;
+
+  /**
+   * 路线id
+   */
+  routeId?: string | number;
+
+  /**
+   * 巡检计划id
+   */
+  planId?: string | number;
+
+  /**
+   * 巡检点id
+   */
+  pointId?: string | number;
+
+  /**
+   * 巡检方式
+   */
+  patrolType?: string;
+
+  /**
+   * 签到类型
+   */
+  signType?: string;
+
+  /**
+   * 巡检状态(0未完成,1已完成)
+   */
+  inspectionState?: string;
+
+  /**
+   * 巡检照片
+   */
+  inspectionImage?: string;
+
+  /**
+   * 实际巡检时间
+   */
+  inspectionTime?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+  /**
+   * 点开始时间
+   */
+  pointStartTime?: string;
+
+  /**
+   * 点结束时间
+   */
+  pointEndTime?: string;
+
+}
+
+export interface TaskDetailQuery extends PageQuery {
+  /**
+   * 任务id
+   */
+  taskId?: string | number;
+
+  /**
+   * 路线id
+   */
+  routeId?: string | number;
+
+  /**
+   * 巡检计划id
+   */
+  planId?: string | number;
+
+  /**
+   * 巡检点id
+   */
+  pointId?: string | number;
+
+  /**
+   * 巡检方式
+   */
+  patrolType?: string;
+
+  /**
+   * 签到类型
+   */
+  signType?: string;
+
+  /**
+   * 巡检状态(0未完成,1已完成)
+   */
+  inspectionState?: string;
+
+  /**
+   * 巡检照片
+   */
+  inspectionImag
+e?: string;
+
+  /**
+   * 实际巡检时间
+   */
+  inspectionTime?: string;
+
+  /**
+   * 点开始时间
+   */
+  pointStartTime?: string;
+
+  /**
+   * 点结束时间
+   */
+  pointEndTime?: string;
+
+  /**
+    * 日期范围参数
+    */
+  params?: any;
+}

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',
+    },
+  );
+}

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;
+}

apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/attendance-group-detail.vue

@@ -45,7 +45,28 @@ async function handleOpenChange(open: boolean) {
   }
   modalApi.modalLoading(true);
   const {id,attendanceType} = modalApi.getData() as { id?: number | string,attendanceType?:string };
-  groupDetail.value = await groupInfo(id,attendanceType);
+  const res = await groupInfo(id,attendanceType);
+  groupDetail.value=res;
+  if(res.attendanceType==0){
+    unCheckInData.value=res.clockDateList.filter(item=>item.mustNoCheck==0)
+    checkInData.value=res.clockDateList.filter(item=>item.mustNoCheck==1)
+    weekdayData.value=res.weekList
+    weekdayData.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
+      }
+    })
+    groupDetail.value.isAutomatic=true
+  }else {
+    cycleData.value=res;
+  }
   modalApi.modalLoading(false);
 }
 
@@ -94,6 +115,15 @@ async function showHoliday() {
               size="small"
               :pagination="false"
             >
+              <template #bodyCell="{ column, record, index }">
+                <template v-if="column.dataIndex === 'dayOfWeek'">
+                 <component :is="renderDict(record.dayOfWeek,'wy_kqgzr')"></component>
+                </template>
+                <template v-if="column.dataIndex === 'shiftId'">
+                  <span v-if="record.shiftId">{{record.shiftValue }}</span>
+                  <span v-else>休息</span>
+                </template>
+              </template>
             </Table>
             <Checkbox
               class="item-padding-top"
@@ -112,13 +142,14 @@ async function showHoliday() {
               size="small"
               :pagination="false"
             >
-              <template #bodyCell="{ column, record, index }">
+              <template #bodyCell="{ column, record }">
                 <template v-if="column.dataIndex === 'dateTime'">
                   <span v-if="record.dateType == 0">{{
-                    record.startDate
+                      dayjs(record.startDate).format('YYYY-MM-DD')
                     }}</span>
                   <span v-else>{{
-                    record.startDate + '~' + record.endDate
+                      dayjs(record.startDate).format('YYYY-MM-DD')
+                      + '~' + dayjs(record.endDate).format('YYYY-MM-DD')
                     }}</span>
                 </template>
               </template>
@@ -132,13 +163,14 @@ async function showHoliday() {
               size="small"
               :pagination="false"
             >
-              <template #bodyCell="{ column, record, index }">
+              <template #bodyCell="{ column, record }">
                 <template v-if="column.dataIndex === 'dateTime'">
                   <span v-if="record.dateType == 0">{{
-                    record.startDate
+                    dayjs(record.startDate).format('YYYY-MM-DD')
                   }}</span>
                   <span v-else>{{
-                    record.startDate + '~' + record.endDate
+                      dayjs(record.startDate).format('YYYY-MM-DD')
+                       + '~' + dayjs(record.endDate).format('YYYY-MM-DD')
                   }}</span>
                 </template>
               </template>
@@ -169,9 +201,7 @@ async function showHoliday() {
                 <span>{{ '第' + (index + 1) + '天' }}</span>
               </template>
               <template v-if="column.dataIndex === 'shiftId'">
-                <!--                    {{item.name+'\xa0'}}-->
+                {{record.shiftId}}
-                <!--                    <span v-if="item.isRest">{{item.startTime+'~'+item.restStartTime+'\xa0'+item.restEndTime+'~'+item.endTime}}</span>-->
-                <!--                    <span v-else>{{item.startTime+'~'+item.endTime}}</span>-->
               </template>
             </template>
           </Table>

apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/data.ts

@@ -82,6 +82,10 @@ export const modalSchema: FormSchemaGetter = () => [
       buttonStyle: 'solid',
       options: getDictOptions('wy_kqlx'),
     },
+    dependencies:{
+      disabled: (formValue) => formValue.id,
+      triggerFields: ['id'],
+    },
     rules: 'selectRequired',
     defaultValue: '0',
   },
@@ -168,17 +172,17 @@ export const modalSchema: FormSchemaGetter = () => [
 export const weekdayColumns: TableColumnsType = [
   {
     title: '工作日',
-    key: 'label',
+    key: 'dayOfWeek',
     width: 120,
     align: 'center',
-    dataIndex: 'label'
+    dataIndex: 'dayOfWeek'
   },
   {
     title: '班次',
-    key: 'shiftValue',
+    key: 'shiftId',
     minWidth: 180,
     align: 'center',
-    dataIndex: 'shiftValue'
+    dataIndex: 'shiftId'
   },
   {
     title: '操作',
@@ -320,17 +324,17 @@ export const clockInModalSchema: FormSchemaGetter = () => [
 export const infoWeekdayColumns: TableColumnsType = [
   {
     title: '工作日',
-    key: 'label',
+    key: 'dayOfWeek',
     width: 120,
     align: 'center',
-    dataIndex: 'label'
+    dataIndex: 'dayOfWeek'
   },
   {
     title: '班次',
-    key: 'shiftValue',
+    key: 'shiftId',
     minWidth: 180,
     align: 'center',
-    dataIndex: 'shiftValue'
+    dataIndex: 'shiftId'
   },
 ]
 

apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/group-modal.vue

@@ -28,6 +28,8 @@ import checkInDate from './check-in-date.vue'
 import {h} from 'vue';
 import {PlusOutlined, MinusOutlined} from '@ant-design/icons-vue';
 import type {ShiftVO} from "#/api/property/attendanceManagement/shiftSetting/model";
+import {renderDict} from "#/utils/render";
+import dayjs from "dayjs";
 
 const emit = defineEmits<{ reload: [] }>();
 const isUpdate = ref(false);
@@ -88,6 +90,26 @@ const [BasicModal, modalApi] = useVbenModal({
     isUpdate.value = !!id;
     if (isUpdate.value && id) {
       const record = await groupInfo(id, attendanceType);
+      record.attendanceType = record.attendanceType.toString()
+      if (record.attendanceType == '0') {
+        settingData.unCheckInData = record.clockDateList.filter(item => item.mustNoCheck == 0)
+        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 {
+
+      }
       await formApi.setValues(record);
     } else {
       getDictOptions('wy_kqgzr').forEach(item => {
@@ -119,7 +141,7 @@ async function handleConfirm() {
       let hasError = true;
       settingData.cycleData.some((item, index) => {
         if (!item.scheduleId) {
-          hasError=false
+          hasError = false
           message.warning('请选择周期天数对应班次。');
           return;
         }
@@ -331,6 +353,13 @@ function getUnCheckInData(val: any) {
                  :data-source="settingData.weekdayData"
                  size="small" :pagination="false">
             <template #bodyCell="{ column, record,index }">
+              <template v-if="column.dataIndex==='dayOfWeek'">
+                <component :is="renderDict(record.dayOfWeek,'wy_kqgzr')"></component>
+              </template>
+              <template v-if="column.dataIndex==='shiftId'">
+                <span v-if="record.shiftId">{{ record.shiftValue }}</span>
+                <span v-else>休息</span>
+              </template>
               <template v-if="column.dataIndex==='action'">
                 <Button type="link" size="small" @click="changeShiftHandle(3,index)">更改班次
                 </Button>
@@ -364,8 +393,13 @@ function getUnCheckInData(val: any) {
                 </Button>
               </template>
               <template v-if="column.dataIndex==='dateTime'">
-                <span v-if="record.dateType==0">{{ record.startDate }}</span>
+               <span v-if="record.dateType == 0">{{
-                <span v-else>{{ record.startDate + '~' + record.endDate }}</span>
+                   dayjs(record.startDate).format('YYYY-MM-DD')
+                 }}</span>
+                <span v-else>{{
+                    dayjs(record.startDate).format('YYYY-MM-DD')
+                    + '~' + dayjs(record.endDate).format('YYYY-MM-DD')
+                  }}</span>
               </template>
             </template>
           </Table>
@@ -383,8 +417,13 @@ function getUnCheckInData(val: any) {
             </template>
             <template #bodyCell="{ column,record,index }">
               <template v-if="column.dataIndex==='dateTime'">
-                <span v-if="record.dateType==0">{{ record.startDate }}</span>
+                 <span v-if="record.dateType == 0">{{
-                <span v-else>{{ record.startDate + '~' + record.endDate }}</span>
+                     dayjs(record.startDate).format('YYYY-MM-DD')
+                   }}</span>
+                <span v-else>{{
+                    dayjs(record.startDate).format('YYYY-MM-DD')
+                    + '~' + dayjs(record.endDate).format('YYYY-MM-DD')
+                  }}</span>
               </template>
               <template v-if="column.dataIndex==='action'">
                 <Button size="small" type="primary" shape="circle"

apps/web-antd/src/views/property/building/data.tsx

@@ -73,14 +73,6 @@ export const columns: VxeGridProps['columns'] = [
     title: '地址',
     field: 'addr',
   },
-  {
-    title: '经度',
-    field: 'lon',
-  },
-  {
-    title: '维度',
-    field: 'lat',
-  },
   {
     field: 'action',
     fixed: 'right',
@@ -150,14 +142,4 @@ export const modalSchema: FormSchemaGetter = () => [
     component: 'Input',
     rules: 'required',
   },
-  {
-    label: '经度',
-    fieldName: 'lon',
-    component: 'Input',
-  },
-  {
-    label: '维度',
-    fieldName: 'lat',
-    component: 'Input',
-  },
 ];

apps/web-antd/src/views/property/community/data.ts

@@ -1,8 +1,9 @@
-import type { FormSchemaGetter } from '#/adapter/form';
+import type {FormSchemaGetter} from '#/adapter/form';
-import type { VxeGridProps } from '#/adapter/vxe-table';
+import type {VxeGridProps} from '#/adapter/vxe-table';
-import { getPopupContainer } from '@vben/utils';
+import {getPopupContainer} from '@vben/utils';
-import { getDictOptions } from '#/utils/dict';
+import {getDictOptions} from '#/utils/dict';
-import { DictEnum } from '@vben/constants';
+import {DictEnum} from '@vben/constants';
+import {renderDict} from "#/utils/render";
 
 export const querySchema: FormSchemaGetter = () => [
   {
@@ -24,7 +25,7 @@ export const querySchema: FormSchemaGetter = () => [
 // 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
 // export const columns: () => VxeGridProps['columns'] = () => [
 export const columns: VxeGridProps['columns'] = [
-  { type: 'checkbox', width: 60 },
+  {type: 'checkbox', width: 60},
   {
     title: '社区名称',
     field: 'communityName',
@@ -32,7 +33,11 @@ export const columns: VxeGridProps['columns'] = [
   {
     title: '社区类型',
     field: 'communityType',
-    slots: { default: 'communityType' },
+    slots: {
+      default: ({row}) => {
+        return renderDict(row.communityType, DictEnum.wy_sqlx)
+      }
+    },
   },
   {
     title: '城市',
@@ -73,7 +78,7 @@ export const columns: VxeGridProps['columns'] = [
   {
     field: 'action',
     fixed: 'right',
-    slots: { default: 'action' },
+    slots: {default: 'action'},
     title: '操作',
     width: 180,
   },

apps/web-antd/src/views/property/community/index.vue

@@ -177,11 +177,6 @@ function handleDownloadExcel() {
         </Space>
       </template>
 
-      <template #communityType="{ row }">
-        <Tag v-if="row.community_type == 1" color="#108ee9">园区</Tag>
-        <Tag v-else color="#2db7f5">小区</Tag>
-      </template>
-
     </BasicTable>
     <CommunityModal @reload="tableApi.query()" />
   </Page>

apps/web-antd/src/views/property/inspectionManagement/inspectionDetails/data.ts

@@ -7,10 +7,18 @@ import {getDictOptions} from "#/utils/dict";
 
 
 export const querySchema: FormSchemaGetter = () => [
+  // {
+  //   component: 'Input',
+  //   fieldName: 'actUserId',
+  //   label: '当前巡检人',
+  // },
   {
-    component: 'Input',
+    label: '签到类型',
-    fieldName: 'actUserId',
+    fieldName: 'signType',
-    label: '当前巡检人',
+    component: 'Select',
+    componentProps: {
+      options:getDictOptions('wy_xjqdfs')
+    },
   },
   {
     component: 'Select',
@@ -24,64 +32,94 @@ export const querySchema: FormSchemaGetter = () => [
 
 export const columns: VxeGridProps['columns'] = [
   { type: 'checkbox', width: 60 },
-  {
-    title: '任务编号',
-    field: 'id',
-    width:'auto'
-  },
-    {
-    title: '巡检计划',
-    field: 'planName',
-    minWidth:200
-  },
-    {
-    title: '巡检时间范围',
-    field: 'planInsTime',
-    width:'auto'
-
-  },
   // {
-  //   title: '实际巡检时间',
+  //   title: '任务编号',
-  //   field: 'endDate',
+  //   field: 'id',
-  //   width:180
+  //   width:'auto'
+  // },
+  //   {
+  //   title: '巡检计划',
+  //   field: 'planName',
+  //   minWidth:200
+  // },
+  //   {
+  //   title: '巡检时间范围',
+  //   field: 'planInsTime',
+  //   width:'auto'
   //
   // },
+  // //   {
+  // //   title: '实际巡检时间',
+  // //   field: 'endDate',
+  // //   width:180
+  // //
+  // // },
+  // {
+  //   title: '签到状态',
+  //   field: 'actInsTime',
+  //   width:150,
+  // },
+  // {
+  //   title: '巡检人',
+  //   field: 'planUserName',
+  //   width:'auto'
+  //
+  // },
+  // {
+  //   title: '巡检方式',
+  //   field: 'taskType',
+  //   width:'auto',
+  //   slots: {
+  //     default: ({ row }) => {
+  //       return renderDict(row.taskType, 'wy_xjqdfs');
+  //     },
+  //   },
+  // },
   {
-    title: '签到状态',
+    title: '签到类型',
-    field: 'actInsTime',
+    field: 'signType',
     width:150,
-  },
-  {
-    title: '巡检人',
-    field: 'planUserName',
-    width:'auto'
-
-  },
-  {
-    title: '巡检方式',
-    field: 'taskType',
-    width:'auto',
     slots: {
       default: ({ row }) => {
-        return renderDict(row.taskType, 'wy_xjqdfs');
+        return renderDict(row.signType, 'wy_xjqdfs');
       },
     },
   },
   {
     title: '巡检状态',
     field: 'status',
-    width:100,
+    width:150,
     slots: {
       default: ({ row }) => {
-        return renderDict(row.taskType, 'wy_xjzt');
+        return renderDict(row.inspectionState, 'wy_xjzt');
       },
     },
   },
   {
     title: '巡检照片',
-    field: 'remark',
+    field: 'inspectionImage',
     width:120
   },
+  {
+    title: '开始时间',
+    field: 'pointStartTime',
+    width:150
+  },
+  {
+    title: '结束时间',
+    field: 'pointEndTime',
+    width:150
+  },
+  {
+    title: '实际巡检时间',
+    field: 'inspectionTime',
+    width:150
+  },
+  {
+    title: '备注',
+    field: 'remark',
+    minWidth:120
+  },
   // {
   //   field: 'action',
   //   fixed: 'right',

apps/web-antd/src/views/property/inspectionManagement/inspectionDetails/index.vue

@@ -8,15 +8,15 @@ import {
   type VxeGridProps
 } from '#/adapter/vxe-table';
 
-import {
-  inspectionTaskExport,
-  inspectionTaskList,
-} from '#/api/property/inspectionManagement/inspectionTask';
 import type {InspectionTaskForm} from '#/api/property/inspectionManagement/inspectionTask/model';
 import {commonDownloadExcel} from '#/utils/file/download';
 
 import inspectionDetailsModal from './inspectionDetails-modal.vue';
 import {columns, querySchema} from './data';
+import {
+  taskDetailExport,
+  taskDetailList
+} from "#/api/property/inspectionManagement/inspectionDetail";
 
 const formOptions: VbenFormProps = {
   commonConfig: {
@@ -46,7 +46,7 @@ const gridOptions: VxeGridProps = {
   proxyConfig: {
     ajax: {
       query: async ({page}, formValues = {}) => {
-        return await inspectionTaskList({
+        return await taskDetailList({
           pageNum: page.currentPage,
           pageSize: page.pageSize,
           ...formValues,
@@ -77,7 +77,7 @@ async function handInfo(row: Required<InspectionTaskForm>) {
 }
 
 function handleDownloadExcel() {
-  commonDownloadExcel(inspectionTaskExport, '巡检任务数据', tableApi.formApi.form.values, {
+  commonDownloadExcel(taskDetailExport, '巡检明细数据', tableApi.formApi.form.values, {
     fieldMappingTime: formOptions.fieldMappingTime,
   });
 }
@@ -97,7 +97,7 @@ function handleDownloadExcel() {
 
         </Space>
       </template>
-      <template #action="{ row }">
+<!--      <template #action="{ row }">-->
 <!--        <Space>-->
 <!--          <ghost-button-->
 <!--            v-access:code="['property:inspectionTask:info']"-->
@@ -106,7 +106,7 @@ function handleDownloadExcel() {
 <!--            {{ $t('pages.common.info') }}-->
 <!--          </ghost-button>-->
 <!--        </Space>-->
-      </template>
+<!--      </template>-->
     </BasicTable>
     <InspectionDetailsModal @reload="tableApi.query()"/>
   </Page>

apps/web-antd/src/views/property/resident/person/data.ts

@@ -181,15 +181,6 @@ export const modalSchema: FormSchemaGetter = () => [
     rules: 'selectRequired',
     formItemClass: 'col-span-2',
   },
-  {
-    label: '人员类型',
-    fieldName: 'type',
-    component: 'Select',
-    componentProps: {
-      options: getDictOptions('wy_rzrylx'),
-    },
-    rules: 'selectRequired',
-  },
   // {
   //   label: '入住员工',
   //   fieldName: 'userId',

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>

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 { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui'
-import { getVxePopupContainer } from '@vben/utils';
+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';
+} from '#/api/property/resident/person'
-import type { PersonForm } from '#/api/property/resident/person/model';
+import type { PersonForm } from '#/api/property/resident/person/model'
-import { commonDownloadExcel } from '#/utils/file/download';
+import { commonDownloadExcel } from '#/utils/file/download'
 
-import personModal from './person-modal.vue';
+import personModal from './person-modal.vue'
-import personDetail from './person-detail.vue';
+import personDetail from './person-detail.vue'
-import { columns, querySchema } from './data';
+import personImportModal from './person-import-modal.vue'
-import {useAccess} from "@vben/access";
+import faceImportModal from './face-import-modal.vue'
-import {TableSwitch} from "#/components/table";
+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.setData({})
-  modalApi.open();
+  modalApi.open()
+}
+
+function handleImport() {
+  personImportModalApi.open()
+}
+
+function handleFaceImport() {
+  faceImportModalApi.open()
 }
 
 async function handleEdit(row: Required<PersonForm>) {
-  modalApi.setData({ id: row.id });
+  modalApi.setData({ id: row.id })
-  modalApi.open();
+  modalApi.open()
 }
 
 async function handleDelete(row: Required<PersonForm>) {
-  await personRemove(row.id);
+  await personRemove(row.id)
-  await tableApi.query();
+  await tableApi.query()
 }
 
 function handleMultiDelete() {
-  const rows = tableApi.grid.getCheckboxRecords();
+  const rows = tableApi.grid.getCheckboxRecords()
-  const ids = rows.map((row: Required<PersonForm>) => row.id);
+  const ids = rows.map((row: Required<PersonForm>) => row.id)
   Modal.confirm({
     title: '提示',
     okType: 'danger',
     content: `确认删除选中的${ids.length}条记录吗？`,
     onOk: async () => {
-      await personRemove(ids);
+      await personRemove(ids)
-      await tableApi.query();
+      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.setData({ id: row.id })
-  personDetailApi.open();
+  personDetailApi.open()
 }
 </script>
 
@@ -127,68 +143,44 @@ function handleInfo(row: Required<PersonForm>) {
     <BasicTable table-title="入驻员工列表">
       <template #toolbar-tools>
         <Space>
-          <a-button
+          <a-button v-access:code="['property:person:export']" @click="handleDownloadExcel">
-            v-access:code="['property:person:export']"
-            @click="handleDownloadExcel"
-          >
             {{ $t('pages.common.export') }}
           </a-button>
-          <a-button
+          <a-button v-access:code="['system:user:import']" @click="handleImport">
-            :disabled="!vxeCheckboxChecked(tableApi)"
+            {{ $t('pages.common.import') }}
-            danger
+          </a-button>
-            type="primary"
+          <a-button @click="handleFaceImport">
-            v-access:code="['property:person:remove']"
+            人脸导入
-            @click="handleMultiDelete">
+          </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
+          <a-button type="primary" v-access:code="['property:person:add']" @click="handleAdd">
-            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
+        <TableSwitch :checkedValue="1" :unCheckedValue="0" v-model:value="row.state" :api="() => personUpdate(row)"
-          :checkedValue="1"
+          :disabled="!hasAccessByCodes(['property:person:edit'])" @reload="() => tableApi.query()" />
-          :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
+          <ghost-button @click.stop="handleInfo(row)">
-            @click.stop="handleInfo(row)"
-          >
             {{ $t('pages.common.info') }}
           </ghost-button>
-          <ghost-button
+          <ghost-button v-access:code="['property:person:edit']" @click.stop="handleEdit(row)">
-            v-access:code="['property:person:edit']"
-            @click.stop="handleEdit(row)"
-          >
             {{ $t('pages.common.edit') }}
           </ghost-button>
-          <Popconfirm
+          <Popconfirm :get-popup-container="getVxePopupContainer" placement="left" title="确认删除？"
-            :get-popup-container="getVxePopupContainer"
+            @confirm="handleDelete(row)">
-            placement="left"
+            <ghost-button danger v-access:code="['property:person:remove']" @click.stop="">
-            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>

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>

packages/@core/preferences/src/types.ts

@@ -267,6 +267,8 @@ interface WidgetPreferences {
   sidebarToggle: boolean;
   /** 是否显示主题切换部件 */
   themeToggle: boolean;
+  /** 是否显示返回导航部件 */
+  backNavigation: boolean;
 }
 
 interface Preferences {

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>

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>

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