diff --git a/web-vue/packages/core/layouts/default/header/components/notify/NoticeInfo.vue b/web-vue/packages/core/layouts/default/header/components/notify/NoticeInfo.vue index 226b40c3..b7272570 100644 --- a/web-vue/packages/core/layouts/default/header/components/notify/NoticeInfo.vue +++ b/web-vue/packages/core/layouts/default/header/components/notify/NoticeInfo.vue @@ -14,7 +14,6 @@ 时间:{{ NoticeList?.createTime || '-' }} 类型:{{ getTypeText(NoticeList?.type) }} -
{{ NoticeList?.description || '无内容' }}
@@ -43,22 +42,34 @@ import { defineComponent, ref, onMounted, onUnmounted } from 'vue'; import { useMessage } from '@jeesite/core/hooks/web/useMessage'; import { BasicModal, useModalInner } from '@jeesite/core/components/Modal'; - import { bizListItemSflow, BizListItem } from '@jeesite/biz/api/biz/listItem'; + import { bizListItemSflow, bizListItemList, BizListItem, TabItem } from '@jeesite/biz/api/biz/listItem'; export default defineComponent({ components: { BasicModal }, emits: ['modalClose'], setup(props, { emit }) { - + const TodoValue = ref(); - const NoticeList = ref(); + const NoticeList = ref(); + const getDataList = async ( params: any) => { + try { + const result = await bizListItemList(params); + NoticeList.value = result.bizListItem || []; + TodoValue.value = result.bizListItem.extraDesc|| ''; + } catch (error) { + NoticeList.value = undefined ; + console.error('获取数据失败:', error); + } + } const { createMessage } = useMessage(); // 模态框注册 const [register, { closeModal }] = useModalInner(async (data: any) => { if (!data) return; - NoticeList.value = Array.isArray(data) ? data[0] : data; - TodoValue.value = NoticeList.value.extraDesc|| ''; + const params = { + id : data.id + } + await getDataList(params); }); const getTypeText = (type: string) => { @@ -120,9 +131,9 @@ /* 主容器样式 - 淡蓝色系优化 */ .detail-container { background-color: #f0f8ff; /* 统一淡蓝色背景 */ - padding: 20px; + padding: 12px; border-radius: 8px; - min-height: 200px; + min-height: 400px; font-size: 14px; color: #333; } diff --git a/web-vue/packages/core/layouts/default/header/components/notify/NoticeList.vue b/web-vue/packages/core/layouts/default/header/components/notify/NoticeList.vue index d1857d42..f0b5ef02 100644 --- a/web-vue/packages/core/layouts/default/header/components/notify/NoticeList.vue +++ b/web-vue/packages/core/layouts/default/header/components/notify/NoticeList.vue @@ -13,6 +13,7 @@ $props.titleRows && $props.titleRows > 0 ? { rows: $props.titleRows, tooltip: !!item.title } : false " :content="item.title" + @click="openModal(true, item)" />
@@ -52,14 +53,17 @@ + diff --git a/web-vue/packages/core/layouts/default/header/components/notify/index.vue b/web-vue/packages/core/layouts/default/header/components/notify/index.vue index bf3cc781..8a739795 100644 --- a/web-vue/packages/core/layouts/default/header/components/notify/index.vue +++ b/web-vue/packages/core/layouts/default/header/components/notify/index.vue @@ -9,33 +9,29 @@
-