fix:图片显示
All checks were successful
/ Explore-Gitea-Actions (push) Successful in 13m48s

This commit is contained in:
2025-08-23 19:25:11 +08:00
parent 5c40b534f2
commit 67b7e64600
18 changed files with 191 additions and 75 deletions

View File

@@ -1,6 +1,6 @@
<script setup lang="ts">
import type {
ConferenceSettingsDetail,
MeetVO,
} from '#/api/property/roomBooking/conferenceSettings/model';
import {shallowRef} from 'vue';
import {useVbenModal} from '@vben/common-ui';
@@ -10,6 +10,7 @@ import duration from 'dayjs/plugin/duration';
import relativeTime from 'dayjs/plugin/relativeTime';
import {meetInfo} from '#/api/property/roomBooking/conferenceSettings';
import {renderDict} from "#/utils/render";
import {ossInfo} from "#/api/system/oss";
dayjs.extend(duration);
dayjs.extend(relativeTime);
@@ -21,7 +22,7 @@ const [BasicModal, modalApi] = useVbenModal({
},
});
const conferenceSettingsDetail = shallowRef<null | ConferenceSettingsDetail>(null);
const conferenceSettingsDetail = shallowRef<null | MeetVO>(null);
async function handleOpenChange(open: boolean) {
if (!open) {
@@ -29,7 +30,19 @@ async function handleOpenChange(open: boolean) {
}
modalApi.modalLoading(true);
const {id} = modalApi.getData() as { id: number | string };
conferenceSettingsDetail.value =await meetInfo(id);
conferenceSettingsDetail.value = await meetInfo(id);
if (conferenceSettingsDetail.value?.picture) {
let imgIds = conferenceSettingsDetail.value.picture.split(',');
const res = await ossInfo(imgIds);
if (res) {
let imgArr = [] as string[];
res.forEach(item => {
imgArr.push(item.url)
})
conferenceSettingsDetail.value.pictureArr = imgArr;
}
}
modalApi.modalLoading(false);
}
</script>
@@ -56,7 +69,7 @@ async function handleOpenChange(open: boolean) {
{{ conferenceSettingsDetail.baseService }}
</DescriptionsItem>
<DescriptionsItem label="负责人" :span="2">
{{ conferenceSettingsDetail.principalsName+'-'+conferenceSettingsDetail.phoneNo }}
{{ conferenceSettingsDetail.principalsName + '-' + conferenceSettingsDetail.phoneNo }}
</DescriptionsItem>
<DescriptionsItem label="费用模式" :span="conferenceSettingsDetail.expenseType=='2'?1:2">
<component
@@ -67,7 +80,9 @@ async function handleOpenChange(open: boolean) {
{{ conferenceSettingsDetail.basePrice }}
</DescriptionsItem>
<DescriptionsItem label="会议室图片" :span="2">
{{ conferenceSettingsDetail.picture }}
<div v-if="conferenceSettingsDetail.pictureArr">
<img v-for="item in conferenceSettingsDetail.pictureArr" style="width: 100px;margin: 5px 10px;display: inline-block" :src="item" alt="图片加载失败">
</div>
</DescriptionsItem>
<DescriptionsItem label="预约是否审核">
<component
@@ -75,7 +90,7 @@ async function handleOpenChange(open: boolean) {
/>
</DescriptionsItem>
<DescriptionsItem label="开放时段" :span="2">
{{ conferenceSettingsDetail.openStartHours+'-'+ conferenceSettingsDetail.openEndHours}}
{{ conferenceSettingsDetail.openStartHours + '-' + conferenceSettingsDetail.openEndHours }}
</DescriptionsItem>
<DescriptionsItem label="会议室描述" :span="2">
{{ conferenceSettingsDetail.descs }}

View File

@@ -78,6 +78,9 @@ const [BasicModal, modalApi] = useVbenModal({
if (record.openStartHours&&record.openEndHours) {
record.openHours = [dayjs(record.openStartHours, 'HH:mm'), dayjs(record.openEndHours, 'HH:mm')];
}
if(record.picture){
record.pictureArr=record.picture.split(';',)
}
await formApi.setValues(record);
}
await markInitialized();
@@ -99,6 +102,9 @@ async function handleConfirm() {
data.openStartHours=data.openHours[0]?.format('HH:mm');
data.openEndHours=data.openHours[1]?.format('HH:mm');
}
if(data.pictureArr){
data.picture=data.pictureArr.join(';',)
}
await (isUpdate.value ? meetUpdate(data) : meetAdd(data));
resetInitialized();
emit('reload');

View File

@@ -184,7 +184,7 @@ export const modalSchema: FormSchemaGetter = () => [
},
{
label: '会议室图片',
fieldName: 'picture',
fieldName: 'pictureArr',
component: 'ImageUpload',
componentProps: {
maxCount: 10, // 最大上传文件数 默认为1 为1会绑定为string而非string[]类型

View File

@@ -163,8 +163,8 @@ const { hasAccessByCodes } = useAccess();
</template>
<template #status="{ row }">
<TableSwitch
:checkedValue="0"
:unCheckedValue="1"
:checkedValue="1"
:unCheckedValue="0"
:checkedText="'启用'"
:unCheckedText="'停用'"
v-model:value="row.status"