feat: 问卷分析

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

@@ -1,13 +1,12 @@
 import type { FormSchemaGetter } from '#/adapter/form';
 import type { VxeGridProps } from '#/adapter/vxe-table';
-
-
+import { deviceManageList } from '#/api/sis/deviceManage';
 export const querySchema: FormSchemaGetter = () => [
   {
     component: 'Input',
     fieldName: 'area',
     label: '区域',
-  }
+  },
 ];
 
 // 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
@@ -54,10 +53,22 @@ export const modalSchema: FormSchemaGetter = () => [
     component: 'Input',
   },
   {
-    label: '摄像机id',
+    label: '摄像机',
     fieldName: 'deviceManageId',
-    component: 'Select',
+    component: 'ApiSelect',
     componentProps: {
+      api: async () => {
+        const res = await deviceManageList({
+          pageNum: 1,
+          pageSize: 10000,
+          deviceType: 1,
+        });
+        return res;
+      },
+      resultField: 'rows',
+      labelField: 'deviceName',
+      valueField: 'id',
+      mode: 'multiple',
     },
   },
   {

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

@@ -82,13 +82,13 @@ export const columns: VxeGridProps['columns'] = [
   },
   {
     title: '人员',
-    field: 'sysUser.userName',
+    field: 'remoteUserVo.userName',
     width: 120,
     // width: 'auto',
   },
   {
     title: '单位',
-    field: 'sysUser.deptName',
+    field: 'deptName',
     width: 'auto',
   },
   // {
@@ -120,7 +120,7 @@ export const columns: VxeGridProps['columns'] = [
     minWidth: 200,
     slots: {
       default: ({ row }) => {
-        if(!row.attendanceShift) return '/';
+        if (!row.attendanceShift) return '/';
         if (row.attendanceShift.startTime && row.attendanceShift.endTime) {
           if (
             row.attendanceShift.restEndTime &&

apps/web-antd/src/views/property/attendanceManagement/workforceManagement/workforce-day-detail.vue

@@ -87,7 +87,7 @@ async function handleClosed() {
               :key="item.id"
               class="wrap-cell"
             >
-              {{ item.sysUser.userName }}
+              {{ item.remoteUserVo.userName }}
               <span v-if="index !== row.userGroupList.length - 1">、</span>
             </span>
           </template>

apps/web-antd/src/views/property/attendanceManagement/workforceManagement/workforce-detail.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { reactive, onMounted,computed } from 'vue';
+import { reactive, onMounted, computed } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
 import {
@@ -178,8 +178,8 @@ const [BasicModal, modalApi] = useVbenModal({
         const deptMap = new Map();
 
         for (const item of record.userGroupList) {
-          const deptId = item.sysUser.deptId;
-          const deptName = item.sysUser.deptName;
+          const deptId = item.remoteUserVo.deptId;
+          const deptName = item.deptName;
 
           if (!deptMap.has(deptId)) {
             deptMap.set(deptId, {
@@ -188,8 +188,8 @@ const [BasicModal, modalApi] = useVbenModal({
             });
           }
           deptMap.get(deptId).users.push({
-            userId: item.sysUser.userId,
-            userName: item.sysUser.userName,
+            userId: item.remoteUserVo.userId,
+            userName: item.remoteUserVo.userName,
           });
         }
         // 转换为 tableData 格式