diff --git a/apps/web-antd/src/api/property/roomBooking/participants/index.ts b/apps/web-antd/src/api/property/roomBooking/participants/index.ts
index e69e5d19..53a994a9 100644
--- a/apps/web-antd/src/api/property/roomBooking/participants/index.ts
+++ b/apps/web-antd/src/api/property/roomBooking/participants/index.ts
@@ -1,8 +1,6 @@
import type { ParticipantsVO, ParticipantsForm, ParticipantsQuery } from './model';
-
import type { ID, IDS } from '#/api/common';
import type { PageResult } from '#/api/common';
-
import { commonExport } from '#/api/helper';
import { requestClient } from '#/api/request';
diff --git a/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/data.ts b/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/data.ts
index b6d51485..79c90c9b 100644
--- a/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/data.ts
+++ b/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/data.ts
@@ -112,6 +112,12 @@ export const modalSchema: FormSchemaGetter = () => [
fieldName: 'nfcCode',
component: 'Input',
},
+ {
+ label: '巡检位置',
+ fieldName: 'inspectionLocation',
+ component: 'Input',
+ rules: 'required',
+ },
{
label: '备注',
fieldName: 'remark',
diff --git a/apps/web-antd/src/views/property/room/floor-tree.vue b/apps/web-antd/src/views/property/room/floor-tree.vue
new file mode 100644
index 00000000..5eca1902
--- /dev/null
+++ b/apps/web-antd/src/views/property/room/floor-tree.vue
@@ -0,0 +1,122 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ label.substring(0, label.indexOf(searchValue)) }}
+ {{ searchValue }}
+ {{
+ label.substring(
+ label.indexOf(searchValue) + searchValue.length,
+ )
+ }}
+
+ {{ label }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/web-antd/src/views/property/room/index.vue b/apps/web-antd/src/views/property/room/index.vue
index 89e8efaa..6cf9d254 100644
--- a/apps/web-antd/src/views/property/room/index.vue
+++ b/apps/web-antd/src/views/property/room/index.vue
@@ -1,18 +1,13 @@
-
-
-
-
-
- {{ $t('pages.common.export') }}
-
-
- {{ $t('pages.common.delete') }}
-
-
- {{ $t('pages.common.add') }}
-
-
-
-
-
-
- {{ $t('pages.common.edit') }}
-
-
-
- {{ $t('pages.common.delete') }}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ {{ $t('pages.common.export') }}
+
+
+ {{ $t('pages.common.delete') }}
+
+
+ {{ $t('pages.common.add') }}
+
+
+
+
+
+
+ {{ $t('pages.common.edit') }}
+
+
+
+ {{ $t('pages.common.delete') }}
+
+
+
+
+
+
+
+
+
diff --git a/apps/web-antd/src/views/property/roomBooking/participants/data.ts b/apps/web-antd/src/views/property/roomBooking/participants/data.ts
index 4400d58b..d6c2d548 100644
--- a/apps/web-antd/src/views/property/roomBooking/participants/data.ts
+++ b/apps/web-antd/src/views/property/roomBooking/participants/data.ts
@@ -1,35 +1,82 @@
import type { FormSchemaGetter } from '#/adapter/form';
import type { VxeGridProps } from '#/adapter/vxe-table';
-
+import { personList } from '#/api/property/resident/person';
+import {participantsList} from '#/api/property/roomBooking/participants';
export const querySchema: FormSchemaGetter = () => [
{
- component: 'Input',
- fieldName: 'meetId',
- label: '会议室id',
+ label: '会议室名称',
+ fieldName: 'meetBookId',
+ component: 'ApiSelect',
+ componentProps: {
+ api: async () => {
+ const rows = await participantsList({ pageSize: 1000000000, pageNum: 1 });
+ return rows;
+ },
+ resultField: 'rows',
+ labelField: 'meetBookingVo.name',
+ valueField: 'meetBookId',
+ },
},
{
- component: 'Input',
+ label: '发起人',
fieldName: 'residentPersonId',
- label: '入驻人员id',
+ component: 'ApiSelect',
+ componentProps: {
+ api: async () => {
+ const rows = await personList({ pageSize: 1000000000, pageNum: 1 });
+ return rows;
+ },
+ resultField: 'rows',
+ labelField: 'userName',
+ valueField: 'id',
+ },
},
];
-// 需要使用i18n注意这里要改成getter形式 否则切换语言不会刷新
-// export const columns: () => VxeGridProps['columns'] = () => [
export const columns: VxeGridProps['columns'] = [
- { type: 'checkbox', width: 60 },
{
- title: '主键id',
- field: 'id',
+ title: '会议室名称',
+ field: 'meetBookingVo.name',
},
{
- title: '会议室id',
- field: 'meetId',
+ title: '会议主题',
+ field: 'meetBookingVo.meetTheme',
},
{
- title: '入驻人员id',
- field: 'residentPersonId',
+ title: '会议时间',
+ field: 'meetBookingVo.meetingTime',
+ slots: {
+ default: ({row}) => {
+ return row.meetBookingVo.scheduledStarttime+'~'+row.meetBookingVo.scheduledEndtime;
+ },
+ },
+ width:300
+ },
+ {
+ title: '发起人',
+ field: 'meetBookingVo.personName',
+ },
+ {
+ title: '发起单位',
+ field: 'meetBookingVo.unitName',
+ },
+ {
+ title: '会议室地点',
+ field: 'meetBookingVo.meetLocation',
+ },
+ {
+ title: '签到状态',
+ field: 'signState',
+ slots: {
+ default: ({row}) => {
+ return row.signState === '0' ? '未签到' : '已签到';
+ },
+ },
+ },
+ {
+ title: '签到时间',
+ field: 'signTime',
},
{
field: 'action',
@@ -39,27 +86,3 @@ export const columns: VxeGridProps['columns'] = [
width: 180,
},
];
-
-export const modalSchema: FormSchemaGetter = () => [
- {
- label: '主键id',
- fieldName: 'id',
- component: 'Input',
- dependencies: {
- show: () => false,
- triggerFields: [''],
- },
- },
- {
- label: '会议室id',
- fieldName: 'meetId',
- component: 'Input',
- rules: 'required',
- },
- {
- label: '入驻人员id',
- fieldName: 'residentPersonId',
- component: 'Input',
- rules: 'required',
- },
-];
diff --git a/apps/web-antd/src/views/property/roomBooking/participants/index.vue b/apps/web-antd/src/views/property/roomBooking/participants/index.vue
index 2fbd3def..92a0e8d1 100644
--- a/apps/web-antd/src/views/property/roomBooking/participants/index.vue
+++ b/apps/web-antd/src/views/property/roomBooking/participants/index.vue
@@ -1,25 +1,17 @@
+
+
+
+
+
+ {{ ParticipantsDetail.meetBookingVo.name }}
+
+
+ {{ ParticipantsDetail.meetBookingVo.meetTheme }}
+
+
+ {{ ParticipantsDetail.meetBookingVo.scheduledStarttime }}
+
+
+ {{ ParticipantsDetail.meetBookingVo.personName }}
+
+
+ {{ ParticipantsDetail.meetBookingVo.unitName }}
+
+
+ {{ ParticipantsDetail.meetBookingVo.meetLocation }}
+
+
+
+ {{ ParticipantsDetail.residentPersonVo.userName }}
+
+
+ {{ ParticipantsDetail.residentPersonVo.idCard }}
+
+
+ {{ ParticipantsDetail.residentPersonVo.unitName }}
+
+
+ {{ ParticipantsDetail.residentPersonVo.phone }}
+
+
+
+
+
+ {{ ParticipantsDetail.signState === '0' ? '未签到' : '已签到'}}
+
+
+ {{ ParticipantsDetail.signTime }}
+
+
+
+
diff --git a/apps/web-antd/src/views/property/roomBooking/participants/participants-modal.vue b/apps/web-antd/src/views/property/roomBooking/participants/participants-modal.vue
deleted file mode 100644
index 4972eaa2..00000000
--- a/apps/web-antd/src/views/property/roomBooking/participants/participants-modal.vue
+++ /dev/null
@@ -1,101 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/apps/web-antd/vite.config.mts b/apps/web-antd/vite.config.mts
index fcce105a..ded7ff75 100644
--- a/apps/web-antd/vite.config.mts
+++ b/apps/web-antd/vite.config.mts
@@ -27,7 +27,7 @@ export default defineConfig(async () => {
changeOrigin: true,
rewrite: (path) => path.replace(/^\/api/, ''),
// mock代理目标地址
- target: 'http://183.230.235.66:11010/api/',
+ target: 'http://192.168.1.110:8080',
ws: true,
},
},