From 47f25830ccd028b20a96568425aee73baefe7862 Mon Sep 17 00:00:00 2001 From: JiangSheng Date: Fri, 6 Mar 2026 15:00:01 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=89=BE=E5=9B=9E=E4=B8=A2=E5=A4=B1?= =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/data/analysis/index.vue | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/src/views/data/analysis/index.vue b/src/views/data/analysis/index.vue index e000277a..684b36b9 100644 --- a/src/views/data/analysis/index.vue +++ b/src/views/data/analysis/index.vue @@ -586,15 +586,29 @@ const searchChangeFun = (searchData: any) => { if (val.uuid) { getChildNodeFun('phase'); } - clearChildOptions(['phaseNodeId', 'machineNodeId', 'workspaceNodeId', 'taskNodeId', 'runId']); + clearChildOptions([ + 'phaseNodeId', + 'machineNodeId', + 'workspaceNodeId', + 'taskNodeId', + 'runId', + 'disciplineNodeId', + ]); } if (key === 'phaseNodeId') { if (val) { getChildNodeFun('machine'); getChildNodeFun('workspace'); + getChildNodeFun('discipline'); } - clearChildOptions(['machineNodeId', 'workspaceNodeId', 'taskNodeId', 'runId']); + clearChildOptions([ + 'machineNodeId', + 'workspaceNodeId', + 'taskNodeId', + 'runId', + 'disciplineNodeId', + ]); } if (key === 'machineNodeId') { @@ -619,7 +633,9 @@ const searchChangeFun = (searchData: any) => { } }; -const getChildNodeFun = (nodeType: 'phase' | 'machine' | 'workspace' | 'task' | 'run') => { +const getChildNodeFun = ( + nodeType: 'phase' | 'machine' | 'workspace' | 'task' | 'run' | 'discipline' +) => { const searchParams = tableRef.value?.getSearchParamsFun() || {}; const params: any = { nodeType }; @@ -629,6 +645,9 @@ const getChildNodeFun = (nodeType: 'phase' | 'machine' | 'workspace' | 'task' | if (nodeType !== 'phase' && searchParams.phaseNodeId) { params.phaseNodeId = searchParams.phaseNodeId; } + if (!['phase', 'discipline'].includes(nodeType) && searchParams.disciplineNodeId) { + params.disciplineNodeId = searchParams.disciplineNodeId; + } if (!['phase', 'machine'].includes(nodeType) && searchParams.machineNodeId) { params.machineNodeId = searchParams.machineNodeId; } @@ -649,6 +668,9 @@ const getChildNodeFun = (nodeType: 'phase' | 'machine' | 'workspace' | 'task' | if (nodeType === 'phase') { tableRef.value?.setOptionsFun('phaseNodeId', options); } + if (nodeType === 'discipline') { + tableRef.value?.setOptionsFun('disciplineNodeId', options); + } if (nodeType === 'machine') { tableRef.value?.setOptionsFun('machineNodeId', options); }