yangjun
/
hldy_vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

This commit is contained in:
yangjun 2026-02-26 09:52:56 +08:00
parent 355ca1dc25
commit 791d4d382b
13 changed files with 58 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/OrgCard/OrgCardCom.vue
View File

@ -49,6 +49,8 @@
<a-col :span="12" style="text-align: right;">
<a-button style="font-size: 12px;" v-show="showDetail" type="link" size="small"
@click.stop="handleDetail">机构详情</a-button>
<a-button style="font-size: 12px;" v-show="showZzbqDetail" type="link" size="small"
@click.stop="handleDetail">长者标签详情</a-button>
<a-button style="font-size: 12px;" v-show="showHldy" type="link" size="small"
@click.stop="handleHldy">区域信息</a-button>
<a-button style="font-size: 12px;" v-show="showInfo" type="link" size="small"
@ -72,6 +74,7 @@ const props = defineProps({
isDirectiveMain: { type: Boolean, default: false },//标准指令库
isElderTagMain: { type: Boolean, default: false },//标准标签库
showDetail: { type: Boolean, default: false },
showZzbqDetail: { type: Boolean, default: false },//长者标签
showInfo: { type: Boolean, default: false },
showHldy: { type: Boolean, default: false },
clickable: { type: Boolean, default: false },

32
src/utils/common/renderUtils.ts
View File

@ -86,6 +86,38 @@ const render = {
);
//update-end-author:taoyan date:2022-5-24 for: VUEN-1084 【vue3】online表单测试发现的新问题 41、生成的代码，树默认图大小未改
},
/**
* 渲染图片
* @param text
*/
renderImageNoPreview: ({ text }) => {
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

13
src/views/synchronization/eldertag/elderTagOpeLogMain/NuConfigElderTagOpeLogMain.data.ts
View File

@ -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
},
];

2
src/views/synchronization/eldertag/elderTagOpeLogMain/NuConfigElderTagOpeLogMainList.vue
View File

@ -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{

2
src/views/synchronization/eldertag/elderTagOpeLogMain/NuConfigElderTagOpeLogMainListModal.vue
View File

@ -1,5 +1,5 @@
<template>
<a-drawer :title="title" :width="width" v-model:visible="visible" :closable="true" :bodyStyle="{ padding: 0 }" :maskClosable="false" :keyboard="false"
<a-drawer :title="title" :width="width" v-model:visible="visible" :closable="true" :bodyStyle="{ padding: 0 }" :keyboard="false"
:footer-style="{ textAlign: 'right' }" @close="handleCancel">
<NuConfigElderTagOpeLogMainList ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></NuConfigElderTagOpeLogMainList>
<template #footer>

6
src/views/synchronization/eldertag/elderTagOpeLogMain/components/NuConfigElderTagOpeLogInfoForm.vue
View File

@ -27,13 +27,13 @@
<a-col :span="24">
<a-form-item label="默认图标" v-bind="validateInfos.pic" id="NuConfigElderTagOpeLogInfoForm-pic" name="pic">
<!-- <a-input v-model:value="formData.pic" placeholder="请输入默认图标" ></a-input> -->
<img :src="opeMediaAddress+formData.pic" style="width: 70px;">
<img :src="getFileAccessHttpUrl(formData.pic)" style="width: 70px;">
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="焦点图标" v-bind="validateInfos.picFocus" id="NuConfigElderTagOpeLogInfoForm-picFocus" name="picFocus">
<!-- <a-input v-model:value="formData.picFocus" placeholder="请输入焦点图标" ></a-input> -->
<img :src="opeMediaAddress+formData.picFocus" style="width: 70px;">
<img :src="getFileAccessHttpUrl(formData.picFocus)" style="width: 70px;">
</a-form-item>
</a-col>
</a-row>
@ -51,6 +51,8 @@
import { saveOrUpdate } from '../NuConfigElderTagOpeLogInfo.api';
import { Form } from 'ant-design-vue';
import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
import { getFileAccessHttpUrl } from '/@/utils/common/compUtils';
const opeMediaAddress = import.meta.env.VITE_OPE_MEDIA_ADDRESS;
const props = defineProps({
formDisabled: { type: Boolean, default: false },

2
src/views/synchronization/eldertag/elderTagOpeLogMain/components/NuConfigElderTagOpeLogInfoModal.vue
View File

@ -1,5 +1,5 @@
<template>
<a-drawer :title="title" :width="width" v-model:visible="visible" :closable="true" :bodyStyle="{ padding: 0 }" :maskClosable="false" :keyboard="false"
<a-drawer :title="title" :width="width" v-model:visible="visible" :closable="true" :bodyStyle="{ padding: 0 }" :keyboard="false"
:footer-style="{ textAlign: 'right' }" @close="handleCancel">
<NuConfigElderTagOpeLogInfoForm ref="registerForm" v-if="isType == '1'" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></NuConfigElderTagOpeLogInfoForm>
<NuConfigElderTagOpeLogInfoCompare ref="registerForm" v-else @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></NuConfigElderTagOpeLogInfoCompare>

12
src/views/synchronization/eldertag/eldertag/ElderTagList.vue
View File

@ -125,15 +125,15 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
const labelCol = reactive({
xs: 24,
sm: 4,
xl: 6,
xxl: 5
sm: 8,
xl: 8,
xxl: 8
});
const wrapperCol = reactive({
xs: 24,
sm: 20,
xl: 18,
xxl: 19
sm: 16,
xl: 16,
xxl: 16
});
const sourceOrgName = ref()//日志功能进来的-源平台机构名称
const targetOrgName = ref()//日志功能进来的-目标平台机构名称

2
src/views/synchronization/eldertag/orgCom/OrgListCom.vue
View File

@ -9,6 +9,7 @@
:is-selected="selectedOrgs.some(org => org.orgCode === item.orgCode)"
:is-directive-selected="directiveMainSelectedOrg?.orgCode === item.orgCode"
:is-elder-tag-main="etmOrg?.orgCode === item.orgCode" :show-detail="props.showDetail"
:show-zzbq-detail="props.showZzbqDetail"
:clickable="props.showChoose || props.showDirectiveChoose" @click="handleCardClick" @detail="handleDetail" />
</a-col>
<a-col v-if="orgTableList.records.length == 0">
@ -38,6 +39,7 @@ const props = defineProps({
showChoose: { type: Boolean, default: false },
pageSize: { type: Number, default: 8 },
showDetail: { type: Boolean, default: false },
showZzbqDetail: { type: Boolean, default: false },
title: { type: String, default: '' },
allowMultipleSelection: { type: Boolean, default: false },
layout: { type: String, default: 'full' },

4
src/views/synchronization/eldertag/syncList.vue
View File

@ -28,12 +28,12 @@
</a-form>
</div>
<!-- 机构信息列表 -->
<OrgListCom ref="orgListComRef" :title="queryParam.title" @handleOrgDetail="handleDetail" :showDetail=true
<OrgListCom ref="orgListComRef" :title="queryParam.title" @handleOrgDetail="handleDetail" :showZzbqDetail=true
:showDMTip="true">
</OrgListCom>
<!-- 指令详情 -->
<a-drawer title="指令详情" width="85vw" v-if="listVisible" v-model:visible="listVisible"
<a-drawer title="长者标签详情" width="1200" v-if="listVisible" v-model:visible="listVisible"
:bodyStyle="{ padding:'14px', height: '70vh', display: 'flex', flexDirection: 'column', overflow: 'auto' }"
wrapClassName="org-list-modal" @cancel="handleCancelList">
<ElderTagList ref="listRef"></ElderTagList>

12
src/views/synchronization/eldertag/tagSyncLogMain/ElderTagSyncLogInfo.data.ts
View File

@ -35,21 +35,13 @@ 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,
},
{
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,
},
];

2
src/views/synchronization/eldertag/tagSyncLogMain/ElderTagSyncLogInfoListModal.vue
View File

@ -1,5 +1,5 @@
<template>
<a-drawer :title="title" :width="width" v-model:visible="visible" :closable="true" :bodyStyle="{ padding: 0 }" :maskClosable="false" :keyboard="false"
<a-drawer :title="title" :width="width" v-model:visible="visible" :closable="true" :bodyStyle="{ padding: 0 }" :keyboard="false"
:footer-style="{ textAlign: 'right' }" @close="handleCancel">
<ElderTagSyncLogInfoList ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></ElderTagSyncLogInfoList>
<template #footer>

2
src/views/synchronization/eldertag/tagSyncLogMain/ElderTagSyncLogMainListModal.vue
View File

@ -1,5 +1,5 @@
<template>
<a-drawer :title="title" :width="width" v-model:visible="visible" :closable="true" :bodyStyle="{ padding: 0 }" :maskClosable="false" :keyboard="false"
<a-drawer :title="title" :width="width" v-model:visible="visible" :closable="true" :bodyStyle="{ padding: 0 }" :keyboard="false"
:footer-style="{ textAlign: 'right' }" @close="handleCancel">
<ElderTagSyncLogMainList ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></ElderTagSyncLogMainList>
<template #footer>