diff --git a/apps/web-antd/index.html b/apps/web-antd/index.html index 21893884..a2da8d62 100644 --- a/apps/web-antd/index.html +++ b/apps/web-antd/index.html @@ -1,23 +1,24 @@ - - - - - - - - - - <%= VITE_APP_TITLE %> - - - - -
- - + + + + + + + + + + <%= VITE_APP_TITLE %> + + + + +
+ + diff --git a/apps/web-antd/src/api/property/attendanceManagement/arrangement/index.ts b/apps/web-antd/src/api/property/attendanceManagement/arrangement/index.ts index 0ffab03b..fdd93873 100644 --- a/apps/web-antd/src/api/property/attendanceManagement/arrangement/index.ts +++ b/apps/web-antd/src/api/property/attendanceManagement/arrangement/index.ts @@ -1,18 +1,25 @@ -import type { ArrangementVO, ArrangementForm, ArrangementQuery } from './model'; +import type { + ArrangementVO, + ArrangementForm, + ArrangementQuery, + arrangmentListQuery, +} 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 排班列表 -*/ + * 分页查询排班列表 + * @param params + * @returns 排班列表 + */ export function arrangementList(params?: ArrangementQuery) { - return requestClient.get>('/property/arrangement/list', { params }); + return requestClient.get>( + '/property/arrangement/list', + { params }, + ); } /** * 根据月份查询排班列表 @@ -58,3 +65,16 @@ export function arrangementUpdate(data: ArrangementForm) { export function arrangementRemove(id: ID | IDS) { return requestClient.deleteWithMsg(`/property/arrangement/${id}`); } + +/** + * 查询某天排班详情列表 + * @param params + * @returns 排班列表 + */ + +export function arrangmentList(params?: arrangmentListQuery) { + return requestClient.get>( + '/property/arrangement/list', + { params }, + ); +} diff --git a/apps/web-antd/src/api/property/attendanceManagement/arrangement/model.d.ts b/apps/web-antd/src/api/property/attendanceManagement/arrangement/model.d.ts index 83f93190..e0ecbb4a 100644 --- a/apps/web-antd/src/api/property/attendanceManagement/arrangement/model.d.ts +++ b/apps/web-antd/src/api/property/attendanceManagement/arrangement/model.d.ts @@ -9,37 +9,40 @@ export interface ArrangementVO { /** * 排班名称 */ - scheduleName: string; + scheduleName?: string; /** * 考勤组ID */ - groupId: string | number; + groupId?: string | number; /** * 排班类型：1-固定班制，2-排班制 */ - scheduleType: number; + scheduleType?: number; /** * 日期类型：1-单个日期，2-长期有效，3-期间有效 */ - dateType: number; + dateType?: number; /** * 开始日期 */ - startDate: string; + startDate?: string; /** * 结束日期(仅date_type=3时有效) */ - endDate: string; + endDate?: string; /** * 状态：0-未生效，1-已生效 */ - status: number; + status?: number; + userGroupList?:any[]; + attendanceGroup?:any; + dateType?:number } export interface ArrangementForm extends BaseEntity { @@ -134,3 +137,6 @@ export interface ArrangementQuery extends PageQuery { */ month?: string; } +export interface arrangmentListQuery extends PageQuery { + currentDate:string//某天的日期 +} diff --git a/apps/web-antd/src/api/property/businessManagement/workOrders/model.d.ts b/apps/web-antd/src/api/property/businessManagement/workOrders/model.d.ts index ea2e3fac..302bca92 100644 --- a/apps/web-antd/src/api/property/businessManagement/workOrders/model.d.ts +++ b/apps/web-antd/src/api/property/businessManagement/workOrders/model.d.ts @@ -94,6 +94,10 @@ export interface WorkOrdersVO { * 备注 */ remark: string; + /** + * 图片 + */ + orderImgUrl: string; } diff --git a/apps/web-antd/src/api/property/inspectionManagement/inspectionDetail/model.d.ts b/apps/web-antd/src/api/property/inspectionManagement/inspectionDetail/model.d.ts index 5750e1e1..7b5732cf 100644 --- a/apps/web-antd/src/api/property/inspectionManagement/inspectionDetail/model.d.ts +++ b/apps/web-antd/src/api/property/inspectionManagement/inspectionDetail/model.d.ts @@ -32,20 +32,59 @@ export interface TaskDetailVO { patrolType: string; /** - * 签到类型 + * 签到类型(1.现场拍照、2.摄像头签到、3.现场扫码) */ signType: string; + /** + * 实际巡检时间 + */ + actualInspectionTime: string; + + /** + * 实际签到状态(1已签到2.未签到) + */ + actualSignState: string; + /** * 巡检状态(0未完成,1已完成) */ inspectionState: string; /** - * 巡检照片 + * 巡检图片 */ - inspectionImag -e: string; + inspectionImage: string; + + /** + * 计划巡检人 + */ + planInspectionPerson: string; + + /** + * 实际巡检人 + */ + actualInspectionPerson: string; + + /** + * 任务状态 + */ + taskStatus: string; + + /** + * 巡检结果 + */ + inspectionResults: string; + + /** + * 巡检描述 + */ + inspectionDesc: string; + + /** + * 巡检位置 + */ + inspectionLocation: string; /** * 实际巡检时间 @@ -67,6 +106,11 @@ e: string; */ pointEndTime: string; + /** + * 搜索值 + */ + searchValue: string; + } export interface TaskDetailForm extends BaseEntity { @@ -101,20 +145,60 @@ export interface TaskDetailForm extends BaseEntity { patrolType?: string; /** - * 签到类型 + * 签到类型(1.现场拍照、2.摄像头签到、3.现场扫码) */ signType?: string; + /** + * 实际巡检时间 + */ + actualInspectionTime?: string; + + /** + * 实际签到状态(1已签到2.未签到) + */ + actualSignState?: string; + /** * 巡检状态(0未完成,1已完成) */ inspectionState?: string; /** - * 巡检照片 + * 巡检图片 */ inspectionImage?: string; + /** + * 计划巡检人 + */ + planInspectionPerson?: string; + + /** + * 实际巡检人 + */ + actualInspectionPerson?: string; + + /** + * 任务状态 + */ + taskStatus?: string; + + /** + * 巡检结果 + */ + inspectionResults?: string; + + /** + * 巡检描述 + */ + inspectionDesc?: string; + + /** + * 巡检位置 + */ + inspectionLocation?: string; + /** * 实际巡检时间 */ @@ -135,6 +219,11 @@ export interface TaskDetailForm extends BaseEntity { */ pointEndTime?: string; + /** + * 搜索值 + */ + searchValue?: string; + } export interface TaskDetailQuery extends PageQuery { @@ -164,20 +253,59 @@ export interface TaskDetailQuery extends PageQuery { patrolType?: string; /** - * 签到类型 + * 签到类型(1.现场拍照、2.摄像头签到、3.现场扫码) */ signType?: string; + /** + * 实际巡检时间 + */ + actualInspectionTime?: string; + + /** + * 实际签到状态(1已签到2.未签到) + */ + actualSignState?: string; + /** * 巡检状态(0未完成,1已完成) */ inspectionState?: string; /** - * 巡检照片 + * 巡检图片 */ - inspectionImag -e?: string; + inspectionImage?: string; + + /** + * 计划巡检人 + */ + planInspectionPerson?: string; + + /** + * 实际巡检人 + */ + actualInspectionPerson?: string; + + /** + * 任务状态 + */ + taskStatus?: string; + + /** + * 巡检结果 + */ + inspectionResults?: string; + + /** + * 巡检描述 + */ + inspectionDesc?: string; + + /** + * 巡检位置 + */ + inspectionLocation?: string; /** * 实际巡检时间 @@ -194,6 +322,11 @@ e?: string; */ pointEndTime?: string; + /** + * 搜索值 + */ + searchValue?: string; + /** * 日期范围参数 */ diff --git a/apps/web-antd/src/api/property/inspectionManagement/inspectionPoint/model.d.ts b/apps/web-antd/src/api/property/inspectionManagement/inspectionPoint/model.d.ts index dd4e4824..38196b80 100644 --- a/apps/web-antd/src/api/property/inspectionManagement/inspectionPoint/model.d.ts +++ b/apps/web-antd/src/api/property/inspectionManagement/inspectionPoint/model.d.ts @@ -46,6 +46,10 @@ export interface InspectionPointVO { */ searchValue: string; + itemName: string; + + createTime: string; + } export interface InspectionPointForm extends BaseEntity { 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 57f03f6b..0e3d6e57 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 @@ -24,7 +24,7 @@ export interface PersonVO { /** * 性别 */ - gender: number + gender: string | number /** * 人脸图片 @@ -75,6 +75,10 @@ export interface PersonVO { authEndDate?: string + authTime: any[] + + rosterType?: string | number + } export interface PersonForm extends BaseEntity { @@ -293,7 +297,7 @@ export interface Person extends BaseEntity { * @param file excel文件 */ export interface PerssonImportParam { - updateSupport: boolean; - unitId: number; - file: Blob | File; + updateSupport: boolean + unitId: number + file: Blob | File } 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 10b2f34b..c961d7f0 100644 --- a/apps/web-antd/src/api/sis/deviceManage/model.d.ts +++ b/apps/web-antd/src/api/sis/deviceManage/model.d.ts @@ -1,182 +1,194 @@ -import type { BaseEntity, PageQuery } from '#/api/common' +import type { BaseEntity, PageQuery } from '#/api/common'; export interface DeviceManageVO { /** * 主键id */ - id: string | number + id: string | number; /** * 设备编码 */ - deviceNo: string + deviceNo: string; /** * 设备名称 */ - deviceName: string + deviceName: string; /** * 设备ip */ - deviceIp: string + deviceIp: string; /** * 设备端口 */ - devicePort: number + devicePort: number; /** * 设备账号 */ - deviceAccount: string + deviceAccount: string; /** * 设备密码 */ - devicePwd: string + devicePwd: string; /** * 设备 */ - deviceMac: string + deviceMac: string; /** * 设备在线状态 0:离线 1:在线 2:未知 */ - deviceStatus: number + deviceStatus: number; /** * 父级设备id */ - parentId: string | number + parentId: string | number; /** * 设备通道编号 */ - channelNo: string + channelNo: string; /** * 录像机ip */ - vcrIp: string + vcrIp: string; /** * 录像机端口 */ - vcrPort: number + vcrPort: number; /** * 录像机账号 */ - vcrAccount: string + vcrAccount: string; /** * 录像机密码 */ - vcrPwd: string + vcrPwd: string; /** * 门禁id */ - accessControlId: string | number + accessControlId: string | number; /** * 楼层id */ - floorId: string | number + floorId: string | number; + + lon: number; + + lat: number; } export interface DeviceManageForm extends BaseEntity { /** * 主键id */ - id?: string | number + id?: string | number; /** * 设备编码 */ - deviceNo?: string + deviceNo?: string; /** * 设备名称 */ - deviceName?: string + deviceName?: string; /** * 设备ip */ - deviceIp?: string + deviceIp?: string; /** * 设备端口 */ - devicePort?: number + devicePort?: number; /** * 设备账号 */ - deviceAccount?: string + deviceAccount?: string; /** * 设备密码 */ - devicePwd?: string + devicePwd?: string; /** * 设备 */ - deviceMac?: string + deviceMac?: string; + + lon: number; + + lat: number; /** * 设备在线状态 0:离线 1:在线 2:未知 */ - deviceStatus?: number + deviceStatus?: number; } export interface DeviceManageQuery extends PageQuery { /** * 设备编码 */ - deviceNo?: string + deviceNo?: string; /** * 设备名称 */ - deviceName?: string + deviceName?: string; /** * 设备ip */ - deviceIp?: string + deviceIp?: string; /** * 设备端口 */ - devicePort?: number + devicePort?: number; /** * 设备账号 */ - deviceAccount?: string + deviceAccount?: string; /** * 设备密码 */ - devicePwd?: string + devicePwd?: string; /** * 设备 */ - deviceMac?: string + deviceMac?: string; + + lon: number; + + lat: number; /** * 设备在线状态 0:离线 1:在线 2:未知 */ - deviceStatus?: number + deviceStatus?: number; /** * 日期范围参数 */ - params?: any + params?: any; } diff --git a/apps/web-antd/src/api/sis/stream/index.ts b/apps/web-antd/src/api/sis/stream/index.ts index 65f08721..c233a1f5 100644 --- a/apps/web-antd/src/api/sis/stream/index.ts +++ b/apps/web-antd/src/api/sis/stream/index.ts @@ -12,9 +12,10 @@ export function addStreamProxy(params?: any) { params, ); } + export function addFFmpegStreamProxy(params?: any) { return requestClient.post( - 'sis/stream/realtime/addFfmpeg', + 'sis/stream/FFmpeg/proxy', params, ); } diff --git a/apps/web-antd/src/assets/map/alarm1.png b/apps/web-antd/src/assets/map/alarm1.png new file mode 100644 index 00000000..bc1175be Binary files /dev/null and b/apps/web-antd/src/assets/map/alarm1.png differ diff --git a/apps/web-antd/src/assets/map/alarm2.png b/apps/web-antd/src/assets/map/alarm2.png new file mode 100644 index 00000000..a9705e7e Binary files /dev/null and b/apps/web-antd/src/assets/map/alarm2.png differ diff --git a/apps/web-antd/src/assets/map/camear.png b/apps/web-antd/src/assets/map/camear.png new file mode 100644 index 00000000..f88584ca Binary files /dev/null and b/apps/web-antd/src/assets/map/camear.png differ diff --git a/apps/web-antd/src/assets/map/video-bg.png b/apps/web-antd/src/assets/map/video-bg.png new file mode 100644 index 00000000..5ebd22f2 Binary files /dev/null and b/apps/web-antd/src/assets/map/video-bg.png differ diff --git a/apps/web-antd/src/utils/video.ts b/apps/web-antd/src/utils/video.ts new file mode 100644 index 00000000..606cee2e --- /dev/null +++ b/apps/web-antd/src/utils/video.ts @@ -0,0 +1,21 @@ +/** + * 验证浏览器是否支持播放h265 编码的视频流 + */ +export function checkHEVCSupport() { + const video = document.createElement('video'); + const h265Support = { + hevc: false, + hvc1: false, + }; + + // 测试不同的HEVC MIME类型 + if (video.canPlayType) { + h265Support.hevc = + video.canPlayType('video/mp4; codecs="hev1.1.6.L93.B0"') !== ''; + h265Support.hvc1 = + video.canPlayType('video/mp4; codecs="hvc1.1.6.L93.B0"') !== ''; + } + const result = h265Support.hevc || h265Support.hvc1; + console.log('当前浏览器是否支持h265:' + result); + return result; +} diff --git a/apps/web-antd/src/views/property/assetManage/depot/data.ts b/apps/web-antd/src/views/property/assetManage/depot/data.ts index 3d8cabf5..afc2f889 100644 --- a/apps/web-antd/src/views/property/assetManage/depot/data.ts +++ b/apps/web-antd/src/views/property/assetManage/depot/data.ts @@ -2,6 +2,8 @@ import type {FormSchemaGetter} from '#/adapter/form'; import type {VxeGridProps} from '#/adapter/vxe-table'; import {renderDict} from "#/utils/render"; import {getDictOptions} from "#/utils/dict"; +import {z} from "#/adapter/form"; +import {$t} from "@vben/locales"; export const querySchema: FormSchemaGetter = () => [ @@ -30,18 +32,10 @@ export const querySchema: FormSchemaGetter = () => [ export const columns: VxeGridProps['columns'] = [ {type: 'checkbox', width: 60}, - { - title: '序号', - field: 'id', - slots: { - default: ({rowIndex}) => { - return (rowIndex + 1).toString(); - } - } - }, { title: '仓库名称', field: 'depotName', + width:200 }, { title: '仓库类型', @@ -50,21 +44,23 @@ export const columns: VxeGridProps['columns'] = [ default: ({row}) => { return renderDict(row.modelType, 'wy_cclx') } - } + }, + width:180 }, { title: '状态', field: 'state', - slots: {default: 'state'} + slots: {default: 'state'}, + width:120 + }, + { + title: '创建时间', + field: 'createTime', }, { title: '描述信息', field: 'msg', - }, - - { - title: '创建时间', - field: 'createTime', + minWidth:180, }, { field: 'action', @@ -89,7 +85,7 @@ export const modalSchema: FormSchemaGetter = () => [ label: '仓库名称', fieldName: 'depotName', component: 'Input', - rules:'required' + rules: z.string().min(1,'请输入仓库名称').max(30, { message: '仓库名称过长' }), }, { label: '仓库类型', diff --git a/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/arrangement-modal.vue b/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/arrangement-modal.vue index d4e5ccd3..1a941699 100644 --- a/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/arrangement-modal.vue +++ b/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/arrangement-modal.vue @@ -1,18 +1,9 @@ + + + + + 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 new file mode 100644 index 00000000..900d0d29 --- /dev/null +++ b/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/workforce-detail.vue @@ -0,0 +1,346 @@ + + + + diff --git a/apps/web-antd/src/views/property/businessManagement/workOrders/data.ts b/apps/web-antd/src/views/property/businessManagement/workOrders/data.ts index 0b7b199a..0239fe09 100644 --- a/apps/web-antd/src/views/property/businessManagement/workOrders/data.ts +++ b/apps/web-antd/src/views/property/businessManagement/workOrders/data.ts @@ -51,6 +51,16 @@ export const columns: VxeGridProps['columns'] = [ field: 'typeName', minWidth: 150, }, + { + title: '上报类型', + field: 'reportingType', + slots: { + default: ({row}) => { + return renderDict(row.reportingType, 'wy_gdsblx'); + }, + }, + width: 100, + }, { title: '派单时间', field: 'dispatchTime', @@ -164,6 +174,15 @@ export const modalSchema: FormSchemaGetter = () => [ }, rules: 'selectRequired', }, + { + label: '上报类型', + fieldName: 'reportingType', + component: 'Select', + componentProps: { + options: getDictOptions('wy_gdsblx'), + }, + rules: 'selectRequired', + }, // { // label: '状态', // fieldName: 'status', @@ -206,6 +225,7 @@ export const modalSchema: FormSchemaGetter = () => [ fieldName: 'location', component: 'Input', rules: 'selectRequired', + formItemClass:'col-span-2' }, // { // label: '计划完成时间', @@ -234,6 +254,7 @@ export const modalSchema: FormSchemaGetter = () => [ label: '备注', fieldName: 'remark', component: 'Textarea', + formItemClass:'col-span-2' }, // { // label: '是否超时', diff --git a/apps/web-antd/src/views/property/businessManagement/workOrders/work-orders-detail.vue b/apps/web-antd/src/views/property/businessManagement/workOrders/work-orders-detail.vue index 95c8420c..2d2f06f0 100644 --- a/apps/web-antd/src/views/property/businessManagement/workOrders/work-orders-detail.vue +++ b/apps/web-antd/src/views/property/businessManagement/workOrders/work-orders-detail.vue @@ -42,7 +42,7 @@ async function handleOpenChange(open: boolean) { - - - - - - - - - - + - + + diff --git a/apps/web-antd/src/views/property/inspectionManagement/inspectionPlan/data.ts b/apps/web-antd/src/views/property/inspectionManagement/inspectionPlan/data.ts index 95fd466a..9e269ea2 100644 --- a/apps/web-antd/src/views/property/inspectionManagement/inspectionPlan/data.ts +++ b/apps/web-antd/src/views/property/inspectionManagement/inspectionPlan/data.ts @@ -116,7 +116,7 @@ export const modalSchema: FormSchemaGetter = () => [ label: '计划名称', fieldName: 'planName', component: 'Input', - rules: 'required', + rules: z.string().min(1,'请输入计划名称').max(30, { message: '计划名称过长' }), }, { label: '巡检路线', 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 a80edc9a..b6d51485 100644 --- a/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/data.ts +++ b/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/data.ts @@ -50,6 +50,13 @@ export const columns: VxeGridProps['columns'] = [ title: '创建时间', field: 'createTime', }, + { + title: '二维码', + field: 'qrcode', + slots:{ + default: 'qrcode' + } + }, { title: '备注', field: 'remark', diff --git a/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/index.vue b/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/index.vue index 156f113a..bce8238d 100644 --- a/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/index.vue +++ b/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/index.vue @@ -1,7 +1,7 @@ + + diff --git a/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/point-detail.vue b/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/point-detail.vue new file mode 100644 index 00000000..7b9fe199 --- /dev/null +++ b/apps/web-antd/src/views/property/inspectionManagement/inspectionPoint/point-detail.vue @@ -0,0 +1,64 @@ + + + diff --git a/apps/web-antd/src/views/property/resident/person/data.ts b/apps/web-antd/src/views/property/resident/person/data.ts index 171b1b1a..aee41767 100644 --- a/apps/web-antd/src/views/property/resident/person/data.ts +++ b/apps/web-antd/src/views/property/resident/person/data.ts @@ -41,19 +41,10 @@ export const querySchema: FormSchemaGetter = () => [ export const columns: VxeGridProps['columns'] = [ { type: 'checkbox', width: 60 }, // { - // title: '序号', + // title: '员工编号', // field: 'id', - // slots: { - // default: ({ rowIndex }) => { - // return (rowIndex + 1).toString(); - // }, - // }, + // width: 100, // }, - { - title: '员工编号', - field: 'id', - width: 100, - }, { title: '员工名称', field: 'userName', @@ -62,7 +53,7 @@ export const columns: VxeGridProps['columns'] = [ { title: '联系电话', field: 'phone', - width: 100, + width: 120, }, { title: '性别', @@ -72,18 +63,18 @@ export const columns: VxeGridProps['columns'] = [ return renderDict(row.gender, 'sys_user_sex') }, }, - width: 100, + width: 80, }, { field: 'img', title: '人脸图片', slots: { default: 'img' }, - minWidth: 80, + width: 100, }, { title: '所属单位', field: 'unitName', - width: 100, + width: 160, }, // { // title: '入驻位置', @@ -93,10 +84,18 @@ export const columns: VxeGridProps['columns'] = [ title: '入驻时间', field: 'time', width: 100, + formatter: ({ cellValue }) => { + return cellValue ? new Date(cellValue).toLocaleDateString('zh-CN', { year: 'numeric', month: '2-digit', day: '2-digit' }).replace(/\//g, '-') : '' + } }, { - title: '车牌号码', - field: 'carNumber', + title: '人员标签', + field: 'rosterType', + slots: { + default: ({ row }) => { + return renderDict(row.rosterType, 'roster_type') + }, + }, width: 100, }, { @@ -112,14 +111,13 @@ export const columns: VxeGridProps['columns'] = [ { title: '备注', field: 'remark', - width: 100, }, { field: 'action', fixed: 'right', slots: { default: 'action' }, title: '操作', - minWidth: 180, + width: 200, }, ] @@ -236,7 +234,24 @@ export const modalSchema: FormSchemaGetter = () => [ }, triggerFields: ['id'], }, - + }, + { + label: '人员标签', + fieldName: 'rosterType', + component: 'Select', + formItemClass: 'col-span-1', + componentProps: { + options: getDictOptions('roster_type') + }, + dependencies: { + show: (values) => { + return typeof values.id !== 'undefined' + }, + disabled: (values) => { + return !values.authSwitch + }, + triggerFields: ['id', 'authSwitch'], + }, }, { label: '授权期限', @@ -253,7 +268,7 @@ export const modalSchema: FormSchemaGetter = () => [ show: (values) => { return typeof values.id !== 'undefined' }, - disabled:(values) => { + disabled: (values) => { return !values.authSwitch }, triggerFields: ['id', 'authSwitch'], @@ -263,12 +278,12 @@ export const modalSchema: FormSchemaGetter = () => [ label: '通行权限组', fieldName: 'authGroupId', component: 'ApiSelect', - formItemClass: 'col-span-2', + formItemClass: 'col-span-1', dependencies: { show: (values) => { return typeof values.id !== 'undefined' }, - disabled:(values) => { + disabled: (values) => { return !values.authSwitch }, triggerFields: ['id', 'authSwitch'], @@ -393,8 +408,8 @@ export async function getUnitList(): Promise< { value: number; label: string }[] > { const queryParam = { - pageNum: 1000, - pageSize: 1, + pageNum: 1, + pageSize: 1000, } const res = await resident_unitList(queryParam) const data: { value: number; label: string }[] = [] 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 2166815f..6413e2a1 100644 --- a/apps/web-antd/src/views/property/resident/person/index.vue +++ b/apps/web-antd/src/views/property/resident/person/index.vue @@ -165,11 +165,6 @@ function handleInfo(row: Required) { 无 -