diff --git a/ljwx-admin/src/service/api/health/user-health-data.ts b/ljwx-admin/src/service/api/health/user-health-data.ts index 26ec63c..1ffd669 100644 --- a/ljwx-admin/src/service/api/health/user-health-data.ts +++ b/ljwx-admin/src/service/api/health/user-health-data.ts @@ -52,6 +52,11 @@ export function fetchUserHealthData(params?: Api.Health.HealthChartSearchParams) delete filteredParams.userId; } + // 确保 departmentInfo 有默认值 + if (!filteredParams.departmentInfo) { + filteredParams.departmentInfo = ''; + } + return request({ url: '/t_user_health_data/getUserHealthData', params: filteredParams diff --git a/ljwx-admin/src/views/health/chart/index.vue b/ljwx-admin/src/views/health/chart/index.vue index 20c1eb6..9632087 100644 --- a/ljwx-admin/src/views/health/chart/index.vue +++ b/ljwx-admin/src/views/health/chart/index.vue @@ -29,6 +29,7 @@ const searchParams = ref({ page: 1, pageSize: 10, departmentInfo: null, + orgId: null, userId: null, startDate, endDate, @@ -117,7 +118,7 @@ async function fetchHealthData() { try { const response = await fetchUserHealthData({ customerId: searchParams.value.customerId, - orgId: searchParams.value.orgId, + departmentInfo: searchParams.value.orgId || '', userId: searchParams.value.userId, startDate: searchParams.value.startDate, endDate: searchParams.value.endDate, diff --git a/ljwx-admin/src/views/health/chart/modules/health-search.vue b/ljwx-admin/src/views/health/chart/modules/health-search.vue index af982fc..bb85ec2 100644 --- a/ljwx-admin/src/views/health/chart/modules/health-search.vue +++ b/ljwx-admin/src/views/health/chart/modules/health-search.vue @@ -76,6 +76,22 @@ watch( } ); +// 监听departmentInfo变化,同步到orgId字段(保持向后兼容) +watch( + () => model.value.departmentInfo, + departmentInfo_val => { + // 如果departmentInfo是数组(多选),取第一个值;如果是单选,直接使用 + if (Array.isArray(departmentInfo_val) && departmentInfo_val.length > 0) { + model.value.orgId = departmentInfo_val[0]; + } else if (departmentInfo_val && !Array.isArray(departmentInfo_val)) { + model.value.orgId = departmentInfo_val; + } else { + model.value.orgId = null; + } + }, + { immediate: true } +); + // 组件挂载时加载特征选项 onMounted(() => { loadFeatureOptions();