fix: 修改打包报错
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run

This commit is contained in:
fyy 2025-07-27 18:15:39 +08:00
parent a1d711017a
commit 68bb70ee72

View File

@ -1,12 +1,11 @@
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 { getDictOptions } from "#/utils/dict" import { getDictOptions } from '#/utils/dict';
import { renderDict } from "#/utils/render" import { renderDict } from '#/utils/render';
import { resident_unitList } from "#/api/property/resident/unit" import { resident_unitList } from '#/api/property/resident/unit';
import { authGroupList } from '#/api/sis/authGroup' import { authGroupList } from '#/api/sis/authGroup';
import type { AuthGroupVO, AuthGroupQuery } from '#/api/sis/authGroup/model' import type { AuthGroupVO, AuthGroupQuery } from '#/api/sis/authGroup/model';
import { toRaw } from 'vue' import { toRaw } from 'vue';
export const querySchema: FormSchemaGetter = () => [ export const querySchema: FormSchemaGetter = () => [
{ {
@ -22,7 +21,7 @@ export const querySchema: FormSchemaGetter = () => [
debounceTime: 500, debounceTime: 500,
allowClear: true, allowClear: true,
placeholder: '请选择所属单位', placeholder: '请选择所属单位',
filterOption: true filterOption: true,
}, },
}, },
{ {
@ -38,7 +37,7 @@ export const querySchema: FormSchemaGetter = () => [
fieldName: 'state', fieldName: 'state',
label: '状态', label: '状态',
}, },
] ];
export const columns: VxeGridProps['columns'] = [ export const columns: VxeGridProps['columns'] = [
{ type: 'checkbox', width: 60 }, { type: 'checkbox', width: 60 },
@ -54,27 +53,27 @@ export const columns: VxeGridProps['columns'] = [
{ {
title: '员工编号', title: '员工编号',
field: 'userId', field: 'userId',
width: 100 width: 100,
}, },
{ {
title: '员工名称', title: '员工名称',
field: 'userName', field: 'userName',
width: 100 width: 100,
}, },
{ {
title: '联系电话', title: '联系电话',
field: 'phone', field: 'phone',
width: 100 width: 100,
}, },
{ {
title: '性别', title: '性别',
field: 'gender', field: 'gender',
slots: { slots: {
default: ({ row }) => { default: ({ row }) => {
return renderDict(row.gender, 'sys_user_sex') return renderDict(row.gender, 'sys_user_sex');
}
}, },
width: 100 },
width: 100,
}, },
{ {
field: 'img', field: 'img',
@ -85,7 +84,7 @@ export const columns: VxeGridProps['columns'] = [
{ {
title: '所属单位', title: '所属单位',
field: 'unitName', field: 'unitName',
width: 100 width: 100,
}, },
// { // {
// title: '入驻位置', // title: '入驻位置',
@ -94,27 +93,27 @@ export const columns: VxeGridProps['columns'] = [
{ {
title: '入驻时间', title: '入驻时间',
field: 'time', field: 'time',
width: 100 width: 100,
}, },
{ {
title: '车牌号码', title: '车牌号码',
field: 'carNumber', field: 'carNumber',
width: 100 width: 100,
}, },
{ {
title: '状态', title: '状态',
field: 'state', field: 'state',
slots: { slots: {
default: ({ row }) => { default: ({ row }) => {
return renderDict(row.state, 'wy_rzryzt') return renderDict(row.state, 'wy_rzryzt');
}
}, },
width: 100 },
width: 100,
}, },
{ {
title: '备注', title: '备注',
field: 'remark', field: 'remark',
width: 100 width: 100,
}, },
{ {
field: 'action', field: 'action',
@ -123,9 +122,9 @@ export const columns: VxeGridProps['columns'] = [
title: '操作', title: '操作',
minWidth: 180, minWidth: 180,
}, },
] ];
let authGroupArr: AuthGroupVO[] = [] let authGroupArr: AuthGroupVO[] = [];
export const modalSchema: FormSchemaGetter = () => [ export const modalSchema: FormSchemaGetter = () => [
{ {
label: '主键id', label: '主键id',
@ -139,34 +138,34 @@ export const modalSchema: FormSchemaGetter = () => [
{ {
label: '员工名称', label: '员工名称',
fieldName: 'userName', fieldName: 'userName',
component: "Input", component: 'Input',
rules: 'required', rules: 'required',
}, },
{ {
label: '联系电话', label: '联系电话',
fieldName: 'phone', fieldName: 'phone',
component: "Input", component: 'Input',
rules: 'required', rules: 'required',
}, },
{ {
label: '性别', label: '性别',
fieldName: 'gender', fieldName: 'gender',
component: "Select", component: 'Select',
componentProps: { componentProps: {
options: getDictOptions('sys_user_sex') options: getDictOptions('sys_user_sex'),
}, },
rules: 'required', rules: 'required',
}, },
{ {
label: '证件号', label: '证件号',
fieldName: 'idCard', fieldName: 'idCard',
component: "Input", component: 'Input',
rules: 'required', rules: 'required',
}, },
{ {
label: '邮箱', label: '邮箱',
fieldName: 'email', fieldName: 'email',
component: "Input", component: 'Input',
}, },
{ {
label: '人员状态', label: '人员状态',
@ -175,7 +174,7 @@ export const modalSchema: FormSchemaGetter = () => [
componentProps: { componentProps: {
options: getDictOptions('wy_rzryzt'), options: getDictOptions('wy_rzryzt'),
}, },
rules: 'selectRequired' rules: 'selectRequired',
}, },
// { // {
// label: '入住员工', // label: '入住员工',
@ -207,7 +206,7 @@ export const modalSchema: FormSchemaGetter = () => [
format: 'YYYY-MM-DD HH:mm:ss', format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss',
}, },
rules: "required" rules: 'required',
}, },
{ {
label: '车牌号码', label: '车牌号码',
@ -223,15 +222,12 @@ export const modalSchema: FormSchemaGetter = () => [
format: 'YYYY-MM-DD HH:mm:ss', format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss',
}, },
<<<<<<< HEAD
=======
dependencies: { dependencies: {
show: (values) => { show: (values) => {
return typeof (values.id) !== 'undefined' return typeof values.id !== 'undefined';
}, },
triggerFields: ['id'], triggerFields: ['id'],
} },
>>>>>>> 54ed694271a4aeb1c3d592f9200e037fb524361f
}, },
{ {
label: '通行权限组', label: '通行权限组',
@ -239,7 +235,7 @@ export const modalSchema: FormSchemaGetter = () => [
component: 'ApiSelect', component: 'ApiSelect',
dependencies: { dependencies: {
show: (values) => { show: (values) => {
return typeof (values.id) !== 'undefined' return typeof values.id !== 'undefined';
}, },
triggerFields: ['id'], triggerFields: ['id'],
}, },
@ -255,17 +251,13 @@ export const modalSchema: FormSchemaGetter = () => [
groupType: 2, groupType: 2,
pageNum: 1, pageNum: 1,
pageSize: 500, pageSize: 500,
};
const res = await authGroupList(params);
authGroupArr = res.rows;
} }
const res = await authGroupList(params) return authGroupArr;
authGroupArr = res.rows
}
return authGroupArr
}, },
<<<<<<< HEAD
}, },
=======
}
>>>>>>> 54ed694271a4aeb1c3d592f9200e037fb524361f
}, },
{ {
label: '人脸图片', label: '人脸图片',
@ -283,7 +275,7 @@ export const modalSchema: FormSchemaGetter = () => [
component: 'Textarea', component: 'Textarea',
formItemClass: 'col-span-2', formItemClass: 'col-span-2',
}, },
] ];
//门禁记录 //门禁记录
export const accessControlColumns: VxeGridProps['columns'] = [ export const accessControlColumns: VxeGridProps['columns'] = [
@ -319,8 +311,7 @@ export const accessControlColumns: VxeGridProps['columns'] = [
title: '状态', title: '状态',
field: 'locathon', field: 'locathon',
}, },
];
]
//车辆记录 //车辆记录
export const carColumns: VxeGridProps['columns'] = [ export const carColumns: VxeGridProps['columns'] = [
@ -364,20 +355,22 @@ export const carColumns: VxeGridProps['columns'] = [
title: '备注', title: '备注',
field: 'remark', field: 'remark',
}, },
] ];
export async function getUnitList(): Promise<{ value: number; label: string }[]> { export async function getUnitList(): Promise<
{ value: number; label: string }[]
> {
const queryParam = { const queryParam = {
pageNum: 1000, pageNum: 1000,
pageSize: 1, pageSize: 1,
} };
const res = await resident_unitList(queryParam) const res = await resident_unitList(queryParam);
const data: { value: number; label: string }[] = [] const data: { value: number; label: string }[] = [];
res.rows.forEach((r: any) => { res.rows.forEach((r: any) => {
data.push({ data.push({
value: r.id, value: r.id,
label: r.name, label: r.name,
}) });
}) });
return data return data;
} }