diff --git a/.gitignore b/.gitignore index 96ab4755..2407436e 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ vite.config.ts.* # 排除自动生成的类型文件 apps/web-antd/types/components.d.ts .history +apps/web-antd/vite.config.mts diff --git a/apps/web-antd/src/api/property/attendanceManagement/attendanceGroupSettings/index.ts b/apps/web-antd/src/api/property/attendanceManagement/attendanceGroupSettings/index.ts index a7260b35..66a61b01 100644 --- a/apps/web-antd/src/api/property/attendanceManagement/attendanceGroupSettings/index.ts +++ b/apps/web-antd/src/api/property/attendanceManagement/attendanceGroupSettings/index.ts @@ -59,3 +59,12 @@ export function groupUpdate(data: GroupForm) { export function groupRemove(id: ID | IDS) { return requestClient.deleteWithMsg(`/Property/group/${id}`); } + +/** + * 获取节假日数据 + * @param year + */ +export async function getHoliday(year: string) { + const response = await fetch(`https://timor.tech/api/holiday/year/${year}`); + return response.json(); +} diff --git a/apps/web-antd/src/api/property/attendanceManagement/attendanceGroupSettings/model.d.ts b/apps/web-antd/src/api/property/attendanceManagement/attendanceGroupSettings/model.d.ts index e189227b..ab341b73 100644 --- a/apps/web-antd/src/api/property/attendanceManagement/attendanceGroupSettings/model.d.ts +++ b/apps/web-antd/src/api/property/attendanceManagement/attendanceGroupSettings/model.d.ts @@ -1,4 +1,4 @@ -import type { PageQuery, BaseEntity } from '#/api/common'; +import type {PageQuery, BaseEntity} from '#/api/common'; export interface GroupVO { /** @@ -63,7 +63,16 @@ export interface GroupQuery extends PageQuery { attendanceType?: number; /** - * 日期范围参数 - */ + * 日期范围参数 + */ params?: any; } + +/** + * 假期 + */ +export interface Holiday { + holiday: boolean; + name: string; + date: string; +} diff --git a/apps/web-antd/src/api/property/attendanceManagement/shiftSetting/index.ts b/apps/web-antd/src/api/property/attendanceManagement/shiftSetting/index.ts index 2ed90e67..98bbe246 100644 --- a/apps/web-antd/src/api/property/attendanceManagement/shiftSetting/index.ts +++ b/apps/web-antd/src/api/property/attendanceManagement/shiftSetting/index.ts @@ -1,8 +1,6 @@ import type { ShiftVO, ShiftForm, ShiftQuery } 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/api/property/attendanceManagement/shiftSetting/model.d.ts b/apps/web-antd/src/api/property/attendanceManagement/shiftSetting/model.d.ts index 76332c84..a1ae216d 100644 --- a/apps/web-antd/src/api/property/attendanceManagement/shiftSetting/model.d.ts +++ b/apps/web-antd/src/api/property/attendanceManagement/shiftSetting/model.d.ts @@ -40,7 +40,6 @@ export interface ShiftVO { * 休息结束时间 */ restEndTime: string; - } export interface ShiftForm extends BaseEntity { @@ -83,7 +82,6 @@ export interface ShiftForm extends BaseEntity { * 休息结束时间 */ restEndTime?: string; - } export interface ShiftQuery extends PageQuery { diff --git a/apps/web-antd/src/api/property/costManagement/houseCharge/model.d.ts b/apps/web-antd/src/api/property/costManagement/houseCharge/model.d.ts index 2188b2fb..7abe3229 100644 --- a/apps/web-antd/src/api/property/costManagement/houseCharge/model.d.ts +++ b/apps/web-antd/src/api/property/costManagement/houseCharge/model.d.ts @@ -58,6 +58,8 @@ export interface HouseChargeVO { costItemsVo: CostItemSettingVO; chargeStatus: string; + + personId: string; } export interface HouseChargeForm extends BaseEntity { diff --git a/apps/web-antd/src/assets/222.jpg b/apps/web-antd/src/assets/222.jpg new file mode 100644 index 00000000..ec753913 Binary files /dev/null and b/apps/web-antd/src/assets/222.jpg differ diff --git a/apps/web-antd/src/assets/222.png b/apps/web-antd/src/assets/222.png new file mode 100644 index 00000000..64e16b18 Binary files /dev/null and b/apps/web-antd/src/assets/222.png differ diff --git a/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/data.ts b/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/data.ts index d270af7e..14d851ab 100644 --- a/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/data.ts +++ b/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/data.ts @@ -2,7 +2,7 @@ import type { FormSchemaGetter } from '#/adapter/form'; import type { VxeGridProps } from '#/adapter/vxe-table'; import {getDictOptions} from "#/utils/dict"; import {renderDict} from "#/utils/render"; - +import type { TableColumnsType } from 'ant-design-vue'; export const querySchema: FormSchemaGetter = () => [ { @@ -124,6 +124,18 @@ export const modalSchema: FormSchemaGetter = () => [ rules:'required', defaultValue:'1', }, + { + label: '', + fieldName: 'shiftData', + component: 'Input', + dependencies: { + show: (formValue) => formValue.attendanceType=='1', + triggerFields: ['attendanceType'], + }, + slots:{ + default:'shiftData' + }, + }, { label: '排班周期', fieldName: 'schedulingCycle', @@ -138,32 +150,99 @@ export const modalSchema: FormSchemaGetter = () => [ defaultValue:'1', rules:'required' }, + { + label: '', + fieldName: 'cycleData', + component: 'Input', + dependencies: { + show: (formValue) => formValue.attendanceType=='1', + triggerFields: ['attendanceType'], + }, + slots:{ + default:'cycleData' + }, + }, ]; -export const weekdayColumns: VxeGridProps['columns'] = [ +export const weekdayColumns: TableColumnsType = [ { title: '工作日', - name: 'label', + key: 'label', width:180, align:'center', dataIndex:'label' }, { title: '班次', - name: 'shift', + key: 'shift', minWidth:180, align:'center', dataIndex:'shift' }, { title: '操作', - name: 'action', + key: 'action', dataIndex:'action', width:180, align:'center', - slots:{ - default:'action' - }, - }, ] + +export const noClockingColumns: TableColumnsType = [ + { + title: '无需打卡日期', + key: 'label', + width:180, + align:'center', + dataIndex:'label' + }, + { + title: '操作', + key: 'action', + dataIndex:'action', + width:180, + align:'center', + }, +] + +export const clockingColumns: TableColumnsType = [ + { + title: '必须打卡日期', + key: 'label', + width:180, + align:'center', + dataIndex:'label' + }, + { + title: '操作', + key: 'action', + dataIndex:'action', + width:180, + align:'center', + }, +] + +export const cycleColumns: TableColumnsType = [ + { + title: '天数', + key: 'label', + width:180, + align:'center', + dataIndex:'label' + }, + { + title: '班次', + key: 'label', + width:180, + align:'center', + dataIndex:'label' + }, + { + title: '操作', + key: 'action', + dataIndex:'action', + width:180, + align:'center', + }, +] + diff --git a/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/group-modal.vue b/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/group-modal.vue index 769c01c1..4445dbbc 100644 --- a/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/group-modal.vue +++ b/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/group-modal.vue @@ -13,9 +13,16 @@ import { } from '#/api/property/attendanceManagement/attendanceGroupSettings'; import {defaultFormValueGetter, useBeforeCloseDiff} from '#/utils/popup'; -import {modalSchema, weekdayColumns} from './data'; -import {Tag, Button, Table} from 'ant-design-vue' +import { + clockingColumns, + cycleColumns, + modalSchema, + noClockingColumns, + weekdayColumns +} from './data'; +import {Tag, Button, Table, Checkbox} from 'ant-design-vue' import {getDictOptions} from "#/utils/dict"; +import holidayCalendar from './holiday-calendar.vue' const emit = defineEmits<{ reload: [] }>(); @@ -24,7 +31,9 @@ const weekdayData = ref([]) const title = computed(() => { return isUpdate.value ? $t('pages.common.edit') : $t('pages.common.add'); }); - +const settingData = ref({ + isAutomatic: true, +}) const [BasicForm, formApi] = useVbenForm({ commonConfig: { // 默认占满两列 @@ -50,8 +59,9 @@ const {onBeforeClose, markInitialized, resetInitialized} = useBeforeCloseDiff( const [BasicModal, modalApi] = useVbenModal({ // 在这里更改宽度 - class: 'w-[70%]', + class: 'w-[80%]', fullscreenButton: false, + maskClosable:false, onBeforeClose, onClosed: handleClosed, onConfirm: handleConfirm, @@ -66,18 +76,17 @@ const [BasicModal, modalApi] = useVbenModal({ if (isUpdate.value && id) { const record = await groupInfo(id); await formApi.setValues(record); - }else { - weekdayData.value=[] - getDictOptions('wy_kqgzr').forEach(item=>{ - weekdayData.value.push({ - dayOfWeek:item.value, - label:item.label, - shift:item.value=='6'||item.value=='7'?'休息':'常规班次：08:00:00~12:00:00 14:00:00~17:00:00' - }) + } else { + weekdayData.value = [] + getDictOptions('wy_kqgzr').forEach(item => { + weekdayData.value.push({ + dayOfWeek: item.value, + label: item.label, + shift: item.value == '6' || item.value == '7' ? '休息' : '常规班次：08:00:00~12:00:00 14:00:00~17:00:00' + }) }) } await markInitialized(); - modalApi.modalLoading(false); }, }); @@ -106,41 +115,95 @@ async function handleClosed() { await formApi.resetForm(); resetInitialized(); } + +const [HolidayCalendar, holidayApi] = useVbenModal({ + connectedComponent: holidayCalendar, +}); + +/** + * 查看法定节假日日历 + */ +async function showHoliday() { + holidayApi.open() +} + + diff --git a/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/holiday-calendar.vue b/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/holiday-calendar.vue new file mode 100644 index 00000000..2db5c818 --- /dev/null +++ b/apps/web-antd/src/views/property/attendanceManagement/attendanceGroupSettings/holiday-calendar.vue @@ -0,0 +1,78 @@ + + + + diff --git a/apps/web-antd/src/views/property/attendanceManagement/shiftSetting/index.vue b/apps/web-antd/src/views/property/attendanceManagement/shiftSetting/index.vue index c356c100..80471597 100644 --- a/apps/web-antd/src/views/property/attendanceManagement/shiftSetting/index.vue +++ b/apps/web-antd/src/views/property/attendanceManagement/shiftSetting/index.vue @@ -17,6 +17,7 @@ import shiftModal from './shift-modal.vue'; import shiftDetail from './shift-detail.vue'; import { columns, querySchema } from './data'; import {TableSwitch} from "#/components/table"; +import { $t } from '#/locales'; const formOptions: VbenFormProps = { commonConfig: { diff --git a/apps/web-antd/src/views/property/attendanceManagement/shiftSetting/shift-detail.vue b/apps/web-antd/src/views/property/attendanceManagement/shiftSetting/shift-detail.vue index bef37f0c..706a5e04 100644 --- a/apps/web-antd/src/views/property/attendanceManagement/shiftSetting/shift-detail.vue +++ b/apps/web-antd/src/views/property/attendanceManagement/shiftSetting/shift-detail.vue @@ -3,15 +3,9 @@ import type {ShiftVO} from '#/api/property/attendanceManagement/shiftSetting/mod import {shallowRef} from 'vue'; import {useVbenModal} from '@vben/common-ui'; import {Descriptions, DescriptionsItem} from 'ant-design-vue'; -import dayjs from 'dayjs'; -import duration from 'dayjs/plugin/duration'; -import relativeTime from 'dayjs/plugin/relativeTime'; import {shiftInfo} from '#/api/property/attendanceManagement/shiftSetting'; import {renderDict} from "#/utils/render"; -dayjs.extend(duration); -dayjs.extend(relativeTime); - const [BasicModal, modalApi] = useVbenModal({ onOpenChange: handleOpenChange, onClosed() { @@ -40,7 +34,7 @@ async function handleOpenChange(open: boolean) { {{ shiftSettingDetail.name }} - {{ shiftSettingDetail.startTime ? shiftSettingDetail.startTime + '-' + shiftSettingDetail.endTime : '-' }} + {{ shiftSettingDetail.startTime + '-' + shiftSettingDetail.endTime }} {{ shiftSettingDetail.isRest===0 ? '不休息' : '休息' }} diff --git a/apps/web-antd/src/views/property/attendanceManagement/shiftSetting/shift-modal.vue b/apps/web-antd/src/views/property/attendanceManagement/shiftSetting/shift-modal.vue index d9ec6fe3..d404aa5a 100644 --- a/apps/web-antd/src/views/property/attendanceManagement/shiftSetting/shift-modal.vue +++ b/apps/web-antd/src/views/property/attendanceManagement/shiftSetting/shift-modal.vue @@ -4,28 +4,23 @@ import dayjs from 'dayjs'; import { useVbenModal } from '@vben/common-ui'; import { $t } from '@vben/locales'; import { cloneDeep } from '@vben/utils'; - import { useVbenForm } from '#/adapter/form'; import { shiftAdd, shiftInfo, shiftUpdate } from '#/api/property/attendanceManagement/shiftSetting'; import { defaultFormValueGetter, useBeforeCloseDiff } from '#/utils/popup'; - import { modalSchema } from './data'; import {TimeRangePicker} from "ant-design-vue"; const emit = defineEmits<{ reload: [] }>(); - const isUpdate = ref(false); + const title = computed(() => { return isUpdate.value ? $t('pages.common.edit') : $t('pages.common.add'); }); const [BasicForm, formApi] = useVbenForm({ commonConfig: { - // 默认占满两列 formItemClass: 'col-span-2', - // 默认label宽度 px labelWidth: 100, - // 通用配置项 会影响到所有表单项 componentProps: { class: 'w-full', } @@ -43,7 +38,6 @@ const { onBeforeClose, markInitialized, resetInitialized } = useBeforeCloseDiff( ); const [BasicModal, modalApi] = useVbenModal({ - // 在这里更改宽度 class: 'w-[550px]', fullscreenButton: false, onBeforeClose, @@ -54,16 +48,13 @@ const [BasicModal, modalApi] = useVbenModal({ return null; } modalApi.modalLoading(true); - const { id } = modalApi.getData() as { id?: number | string }; isUpdate.value = !!id; - if (isUpdate.value && id) { const record = await shiftInfo(id); await formApi.setValues(record); } await markInitialized(); - modalApi.modalLoading(false); }, }); @@ -75,7 +66,6 @@ async function handleConfirm() { if (!valid) { return; } - // getValues获取为一个readonly的对象 需要修改必须先深拷贝一次 const data = cloneDeep(await formApi.getValues()); data.startTime = dayjs(data.attendanceTimeRange[0]).format('HH:mm:ss'); data.endTime = dayjs(data.attendanceTimeRange[1]).format('HH:mm:ss'); @@ -86,7 +76,7 @@ async function handleConfirm() { await (isUpdate.value ? shiftUpdate(data) : shiftAdd(data)); resetInitialized(); emit('reload'); - modalApi.close(); + await modalApi.close(); } catch (error) { console.error(error); } finally { diff --git a/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/scheduleView.vue b/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/scheduleView.vue index 59da82b2..b3836a31 100644 --- a/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/scheduleView.vue +++ b/apps/web-antd/src/views/property/attendanceManagement/workforceManagement/scheduleView.vue @@ -2,16 +2,14 @@ import { Radio, Select, Button, Table,Calendar } from 'ant-design-vue'; import type { RadioChangeEvent } from 'ant-design-vue'; import {ref} from 'vue'; -import dayjs from 'dayjs'; import { Dayjs } from 'dayjs'; import { columns, querySchema } from './data'; -import { +import { useVbenVxeGrid, vxeCheckboxChecked, - type VxeGridProps + type VxeGridProps } from '#/adapter/vxe-table'; import { getVxePopupContainer } from '@vben/utils'; -import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui'; import { arrangementExport, arrangementList, @@ -22,11 +20,7 @@ import type { ArrangementForm } from '#/api/property/attendanceManagement/arrang import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui'; import { Modal, Popconfirm, Space } from 'ant-design-vue'; - - - const emit = defineEmits<{(e:'changeView',value:boolean):void}>(); - const props = defineProps<{ viewMode:'calender' | 'schedule' }>(); @@ -40,25 +34,6 @@ function handleViewModeChange(e: RadioChangeEvent): void { emit('changeView',e.target.value) } -const formOptions: VbenFormProps = { - commonConfig: { - labelWidth: 80, - componentProps: { - allowClear: true, - }, - }, - schema: querySchema(), - wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4', - // 处理区间选择器RangePicker时间格式 将一个字段映射为两个字段 搜索/导出会用到 - // 不需要直接删除 - // fieldMappingTime: [ - // [ - // 'createTime', - // ['params[beginTime]', 'params[endTime]'], - // ['YYYY-MM-DD 00:00:00', 'YYYY-MM-DD 23:59:59'], - // ], - // ], -}; const gridOptions: VxeGridProps = { checkboxConfig: { @@ -90,10 +65,23 @@ const gridOptions: VxeGridProps = { keyField: 'id', }, // 表格全局唯一表示 保存列配置需要用到 - id: 'property-arrangement-index' + id: 'property-arrangement-index', + toolbarConfig: { + // 控制工具栏整体是否显示（默认显示） + show: true, + // 隐藏"刷新/重置"按钮（对应 redo） + refresh: false, + // 隐藏"全屏"按钮 + fullscreen: false, + // 隐藏"列设置"按钮（对应 setting） + columns: false, + // 隐藏"表格尺寸"按钮（对应 size） + size: undefined, + // 其他可能的按钮（如导出等，按需配置） + // export: false, // 如果有导出按钮，也可以隐藏 + }, }; const [BasicTable, tableApi] = useVbenVxeGrid({ - formOptions, gridOptions, }); @@ -129,7 +117,7 @@ async function handleDelete(row: Required) {
- + - diff --git a/apps/web-antd/src/views/property/costManagement/houseCharge/house-charge-refund.vue b/apps/web-antd/src/views/property/costManagement/houseCharge/house-charge-refund.vue index 4d068e2f..9a67aad1 100644 --- a/apps/web-antd/src/views/property/costManagement/houseCharge/house-charge-refund.vue +++ b/apps/web-antd/src/views/property/costManagement/houseCharge/house-charge-refund.vue @@ -6,13 +6,11 @@ import {cloneDeep} from '@vben/utils'; import {useVbenForm} from '#/adapter/form'; import { - houseChargeAdd, houseChargeInfo, houseChargeRefund, - houseChargeUpdate } from '#/api/property/costManagement/houseCharge'; import {defaultFormValueGetter, useBeforeCloseDiff} from '#/utils/popup'; -import {modalSchemaRefund, modalSchemaUpdate} from './data'; +import {modalSchemaRefund} from './data'; import {renderDict} from "#/utils/render"; import {Descriptions, DescriptionsItem, Divider} from "ant-design-vue"; import type {HouseChargeVO} from "#/api/property/costManagement/houseCharge/model"; @@ -62,14 +60,15 @@ const [BasicModal, modalApi] = useVbenModal({ modalApi.modalLoading(true); const {id} = modalApi.getData() as { id?: number | string }; isUpdate.value = !!id; - record.value = await houseChargeInfo(id); - if (record.value) { - room.value = record.value.roomVo - costItem.value = record.value.costItemsVo + if(id){ + record.value = await houseChargeInfo(id); + if (record.value) { + room.value = record.value.roomVo + costItem.value = record.value.costItemsVo + } + await formApi.setValues(record.value); } - await formApi.setValues(record.value); await markInitialized(); - modalApi.modalLoading(false); }, }); @@ -83,8 +82,8 @@ async function handleConfirm() { } // getValues获取为一个readonly的对象 需要修改必须先深拷贝一次 const data = cloneDeep(await formApi.getValues()); - data.costItemsId = record.value.costItemsId - data.personId = record.value.personId + data.costItemsId = record.value?.costItemsId + data.personId = record.value?.personId await houseChargeRefund(data); resetInitialized(); emit('reload'); @@ -123,7 +122,7 @@ async function handleClosed() { {{ record.startTime }} - {{ room.roomNumber }} + {{ room?.roomNumber }} {{ `${room?.area} （套内面积：${room?.insideInArea}）` }} diff --git a/apps/web-antd/src/views/property/meter/meterInfo/components/meterInfo-modal.vue b/apps/web-antd/src/views/property/meter/meterInfo/components/meterInfo-modal.vue index 938e91df..c9e1b93c 100644 --- a/apps/web-antd/src/views/property/meter/meterInfo/components/meterInfo-modal.vue +++ b/apps/web-antd/src/views/property/meter/meterInfo/components/meterInfo-modal.vue @@ -71,6 +71,10 @@ const [BasicModal, modalApi] = useVbenModal({ if (isUpdate.value && id) { const record = await meterInfoInfo(id); + record.meterType = record.meterType.toString(); + record.meterUnit = record.meterUnit.toString(); + record.runningState = record.runningState.toString(); + record.communicationState = record.communicationState.toString(); await formApi.setValues(record); } await markInitialized(); diff --git a/apps/web-antd/src/views/screen/property/index.vue b/apps/web-antd/src/views/screen/property/index.vue index 2caa5bcb..eb4aa5fa 100644 --- a/apps/web-antd/src/views/screen/property/index.vue +++ b/apps/web-antd/src/views/screen/property/index.vue @@ -168,14 +168,19 @@ const updateTime = () => { const initBarChart = () => { if (!barChart.value) return - const chart = echarts.init(barChart.value) - const option = getThreeDBarOption({ - xData: ['A区', 'B区', 'C区', 'D区'], - yData: [320, 452, 688, 400] - }) - chart.setOption(option) - barChartInstance = chart - addChartToResizeManager(chart) + const myChart = echarts.init(barChart.value); + myChart.setOption({ + tooltip: {}, + xAxis: { data: ['A', 'B', 'C', 'D'] }, + yAxis: {}, + series: [ + { + name: '销量', + type: 'bar', + data: [5, 20, 36, 10, 10, 20], + }, + ], + }); } // 初始化电力图表 @@ -601,6 +606,9 @@ onBeforeUnmount(() => { min-height: unset; margin: 0 auto; } + .bar-chart{ + + } } .second{ height: 12rem; diff --git a/apps/web-antd/src/views/sis/elevatorInfo/floorAuth-modal.vue b/apps/web-antd/src/views/sis/elevatorInfo/floorAuth-modal.vue deleted file mode 100644 index dc1f22c2..00000000 --- a/apps/web-antd/src/views/sis/elevatorInfo/floorAuth-modal.vue +++ /dev/null @@ -1,116 +0,0 @@ - - - diff --git a/apps/web-antd/src/views/sis/elevatorInfo/index.vue b/apps/web-antd/src/views/sis/elevatorInfo/index.vue index ae3195ad..e9ed22c5 100644 --- a/apps/web-antd/src/views/sis/elevatorInfo/index.vue +++ b/apps/web-antd/src/views/sis/elevatorInfo/index.vue @@ -25,7 +25,6 @@ import { commonDownloadExcel } from '#/utils/file/download'; import elevatorInfoModal from './elevatorInfo-modal.vue'; import { columns, querySchema } from './data'; -import floorAuthModal from './floorAuth-modal.vue'; const formOptions: VbenFormProps = { commonConfig: { @@ -89,10 +88,6 @@ const [ElevatorInfoModal, modalApi] = useVbenModal({ connectedComponent: elevatorInfoModal, }); -const [FloorAuthModal, floorAuthModalApi] = useVbenModal({ - connectedComponent: floorAuthModal, -}); - function handleAdd() { modalApi.setData({}); modalApi.open(); @@ -128,11 +123,6 @@ function handleDownloadExcel() { }); } -function handleAuth(row: Required) { - floorAuthModalApi.setData({ unitId: row.unitId, elevatorId: row.elevatorId }); - floorAuthModalApi.open(); -} - - diff --git a/packages/effects/layouts/src/authentication/authentication.vue b/packages/effects/layouts/src/authentication/authentication.vue index da515493..2b6686fa 100644 --- a/packages/effects/layouts/src/authentication/authentication.vue +++ b/packages/effects/layouts/src/authentication/authentication.vue @@ -281,7 +281,7 @@ const handleAccountLogin = async () => { align-items: center; background: url('../../../../../apps/web-antd/src/assets/juxing.png') no-repeat center center fixed, - url('../../../../../apps/web-antd/src/assets/222.gif'); + url('../../../../../apps/web-antd/src/assets/222.png'); background-size: cover, cover; color: #fff; }