From 78ff0f0c3d0a1d96488d1298fd7e00025b5f5c83 Mon Sep 17 00:00:00 2001
From: fyy <2717885210@qq.com>
Date: Thu, 14 Aug 2025 17:19:58 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=97=AE=E5=8D=B7=E5=88=86=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/api/sis/deviceManage/model.d.ts | 4 +-
.../attendanceArea/data.ts | 21 +-
.../workforceManagement/data.ts | 6 +-
.../workforce-day-detail.vue | 2 +-
.../workforceManagement/workforce-detail.vue | 10 +-
.../questionnaireAnalysis/data.ts | 0
.../questionnaireAnalysis/index.vue | 275 ++++++++++++++++++
.../questionnaire-table-modal.vue | 4 +
8 files changed, 306 insertions(+), 16 deletions(-)
create mode 100644 apps/web-antd/src/views/property/customerService/questionnaireAnalysis/data.ts
create mode 100644 apps/web-antd/src/views/property/customerService/questionnaireAnalysis/index.vue
create mode 100644 apps/web-antd/src/views/property/customerService/questionnaireAnalysis/questionnaire-table-modal.vue
diff --git a/apps/web-antd/src/api/sis/deviceManage/model.d.ts b/apps/web-antd/src/api/sis/deviceManage/model.d.ts
index c961d7f0..3e27e50f 100644
--- a/apps/web-antd/src/api/sis/deviceManage/model.d.ts
+++ b/apps/web-antd/src/api/sis/deviceManage/model.d.ts
@@ -178,9 +178,9 @@ export interface DeviceManageQuery extends PageQuery {
*/
deviceMac?: string;
- lon: number;
+ lon?: number;
- lat: number;
+ lat?: number;
/**
* 设备在线状态 0:离线 1:在线 2:未知
diff --git a/apps/web-antd/src/views/property/attendanceManagement/attendanceArea/data.ts b/apps/web-antd/src/views/property/attendanceManagement/attendanceArea/data.ts
index 35a9ec6f..9f0abf52 100644
--- a/apps/web-antd/src/views/property/attendanceManagement/attendanceArea/data.ts
+++ b/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',
},
},
{
diff --git a/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/data.ts b/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/data.ts
index ddf61fb8..331d649a 100644
--- a/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/data.ts
+++ b/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 &&
diff --git a/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/workforce-day-detail.vue b/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/workforce-day-detail.vue
index 23fb8b50..696610df 100644
--- a/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/workforce-day-detail.vue
+++ b/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 }}
、
diff --git a/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/workforce-detail.vue b/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/workforce-detail.vue
index 0fd19db4..b5e64776 100644
--- a/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/workforce-detail.vue
+++ b/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/workforce-detail.vue
@@ -1,5 +1,5 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
问题1:你对公司有什么建议?
+
多行文本
+
+
共收到156个回答
+
+
+
+
+
+
希望公司多一些团建
+
+ 2025-08-14 10:00:00
+
+
+
+
减少不必要会议
+
+ 2025-08-14 10:00:00
+
+
+
+
提升福利待遇
+
+ 2025-08-14 10:00:00
+
+
+
+
还有148条回复未显示
+
+
+
+
+
+
+
+
+
diff --git a/apps/web-antd/src/views/property/customerService/questionnaireAnalysis/questionnaire-table-modal.vue b/apps/web-antd/src/views/property/customerService/questionnaireAnalysis/questionnaire-table-modal.vue
new file mode 100644
index 00000000..9d13f383
--- /dev/null
+++ b/apps/web-antd/src/views/property/customerService/questionnaireAnalysis/questionnaire-table-modal.vue
@@ -0,0 +1,4 @@
+
+
+
+