From 618e12bb6793a68a2afeda54a9f69711123bf949 Mon Sep 17 00:00:00 2001 From: helloxujingliang <3225043@qq.com> Date: Tue, 6 Jan 2026 15:45:27 +0800 Subject: [PATCH] merge --- .../Tasks/Tasks/TaskReceivPerson/index.vue | 17 ++++++++++++++++- .../Zhigan/ZhiGan_SheXiangTouLeiXing/index.vue | 10 +++++++++- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/src/packages/components/Tasks/Tasks/TaskReceivPerson/index.vue b/src/packages/components/Tasks/Tasks/TaskReceivPerson/index.vue index 628d180..694ae37 100644 --- a/src/packages/components/Tasks/Tasks/TaskReceivPerson/index.vue +++ b/src/packages/components/Tasks/Tasks/TaskReceivPerson/index.vue @@ -79,6 +79,9 @@ import axios from 'axios' import { ElMessage } from 'element-plus' import { EventBus } from '@/utils/eventBus' import { getAppEnvConfig } from '@/utils/env' +import { eventHandlerHook } from '@/hooks/eventHandler.hook'; +import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'; + var { VITE_GLOB_API_URL } = getAppEnvConfig(); const props = defineProps({ chartConfig: { @@ -111,6 +114,18 @@ const { } = toRefs(props.chartConfig.option) +const chartEditStore = useChartEditStore(); +const deliveryData = ref(); + +const clickBtn = () => { + eventHandlerHook( + chartEditStore.getComponentList, + props.chartConfig.events.interactConfigEvents, + 'click', + deliveryData.value, + ); + }; + onMounted(() => { getReceiveGroup() getPeopleList() @@ -192,7 +207,7 @@ const sendClick = ()=>{ type: 'success', }) - props.chartConfig.status.hide = true; + clickBtn(); } else { ElMessage({ message: res.data.message, diff --git a/src/packages/components/Zhigan/Zhigan/ZhiGan_SheXiangTouLeiXing/index.vue b/src/packages/components/Zhigan/Zhigan/ZhiGan_SheXiangTouLeiXing/index.vue index 2e7e0a5..bd86323 100644 --- a/src/packages/components/Zhigan/Zhigan/ZhiGan_SheXiangTouLeiXing/index.vue +++ b/src/packages/components/Zhigan/Zhigan/ZhiGan_SheXiangTouLeiXing/index.vue @@ -47,11 +47,13 @@ const { w, h } = toRefs(props.chartConfig.attr); const option = reactive({ - dataset: props.chartConfig.option.dataset, + // dataset: props.chartConfig.option.dataset, dataStyle: props.chartConfig.option.dataStyle, status: props.chartConfig.status, }); + + watch( () => option.dataStyle.width, () => { @@ -99,8 +101,14 @@ }; // 数据callback处理(预览时触发) + // useChartDataFetch(props.chartConfig, useChartEditStore, (resData: any[]) => { + // option.dataset = resData; + // }); + useChartDataFetch(props.chartConfig, useChartEditStore, (resData: any[]) => { + props.chartConfig.option.dataset = resData; option.dataset = resData; + });