diff --git a/src/components/OrgCard/OrgCardCom.vue b/src/components/OrgCard/OrgCardCom.vue index 9bec75d..588efec 100644 --- a/src/components/OrgCard/OrgCardCom.vue +++ b/src/components/OrgCard/OrgCardCom.vue @@ -49,6 +49,8 @@ 机构详情 + 长者标签详情 区域信息 { + if (!text) { + return h(Image, { + width: 30, + height: 30, + src: '', + fallback: + 'data:image/png;base64,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', + }); + } + let avatarList = text.split(','); + return h( + 'span', + avatarList.map((item) => { + return h(Image, { + src: getFileAccessHttpUrl(item), + width: 30, + height: 30, + preview: false, + style: { marginRight: '5px' }, + previewMask: () => { + return h(Icon, { icon: 'ant-design:eye-outlined', size: 20 }); + }, + }); + }) + ); + //update-end-author:taoyan date:2022-5-24 for: VUEN-1084 【vue3】online表单测试发现的新问题 41、生成的代码,树默认图大小未改 + }, /** * 渲染 Tooltip * @param text diff --git a/src/views/synchronization/eldertag/elderTagOpeLogMain/NuConfigElderTagOpeLogMain.data.ts b/src/views/synchronization/eldertag/elderTagOpeLogMain/NuConfigElderTagOpeLogMain.data.ts index 9bb09e3..eacc910 100644 --- a/src/views/synchronization/eldertag/elderTagOpeLogMain/NuConfigElderTagOpeLogMain.data.ts +++ b/src/views/synchronization/eldertag/elderTagOpeLogMain/NuConfigElderTagOpeLogMain.data.ts @@ -3,7 +3,6 @@ import {FormSchema} from '/@/components/Table'; import { rules} from '/@/utils/helper/validator'; import { render } from '/@/utils/common/renderUtils'; import { getWeekMonthQuarterYear } from '/@/utils'; -const opeMediaAddress = import.meta.env.VITE_OPE_MEDIA_ADDRESS; //列表数据 export const columns: BasicColumn[] = [ { @@ -42,22 +41,14 @@ export const columns: BasicColumn[] = [ title: '默认图标', align: "center", dataIndex: 'pic', - customRender: ({ text }) => { - // 如果 text 为空或 null/undefined,使用默认图片 - const imageUrl = text ? opeMediaAddress + text : opeMediaAddress + import.meta.env.VITE_DEFAULT_DIRECTIVE_PRE_PIC; - return render.renderImage({ text: imageUrl }); - }, + customRender: render.renderImageNoPreview, width: 100 }, { title: '焦点图标', align: "center", dataIndex: 'picFocus', - customRender: ({ text }) => { - // 如果 text 为空或 null/undefined,使用默认图片 - const imageUrl = text ? opeMediaAddress + text : opeMediaAddress + import.meta.env.VITE_DEFAULT_DIRECTIVE_PRE_PIC; - return render.renderImage({ text: imageUrl }); - }, + customRender: render.renderImageNoPreview, width: 100 }, ]; diff --git a/src/views/synchronization/eldertag/elderTagOpeLogMain/NuConfigElderTagOpeLogMainList.vue b/src/views/synchronization/eldertag/elderTagOpeLogMain/NuConfigElderTagOpeLogMainList.vue index 690f0a7..d5ad069 100644 --- a/src/views/synchronization/eldertag/elderTagOpeLogMain/NuConfigElderTagOpeLogMainList.vue +++ b/src/views/synchronization/eldertag/elderTagOpeLogMain/NuConfigElderTagOpeLogMainList.vue @@ -104,7 +104,7 @@ */ function handleDetail(record: Recordable) { console.log("🚀 ~ handleDetail ~ record:", record) - if(record.optType =='1'){ + if(record.opeType =='1'){ registerModal.value.disableSubmit = true; registerModal.value.edit(record); }else{ diff --git a/src/views/synchronization/eldertag/elderTagOpeLogMain/NuConfigElderTagOpeLogMainListModal.vue b/src/views/synchronization/eldertag/elderTagOpeLogMain/NuConfigElderTagOpeLogMainListModal.vue index 1eda9e1..3b7376e 100644 --- a/src/views/synchronization/eldertag/elderTagOpeLogMain/NuConfigElderTagOpeLogMainListModal.vue +++ b/src/views/synchronization/eldertag/elderTagOpeLogMain/NuConfigElderTagOpeLogMainListModal.vue @@ -1,5 +1,5 @@