From 3df0281430df6e6d18cf1d7c036c7e3fcaddc777 Mon Sep 17 00:00:00 2001 From: "weixiaobo@boe.com.cn" Date: Tue, 22 Aug 2023 19:03:42 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=80=89=E6=8B=A9=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Caseess.vue | 6 +++--- src/views/report/Curriculum.vue | 6 +++--- src/views/report/Employeelearning.vue | 6 +++--- src/views/report/Learningpathmap.vue | 9 ++++++--- src/views/report/ReportExamination.vue | 6 +++--- src/views/report/ReportProject.vue | 6 +++--- 6 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/views/report/Caseess.vue b/src/views/report/Caseess.vue index f9893b85..e9f2c963 100644 --- a/src/views/report/Caseess.vue +++ b/src/views/report/Caseess.vue @@ -159,9 +159,9 @@ export default { // let roleList = store.state.userInfo.roleList; const res = await api.userGetUserOrg(); if (res) { - state.option = res.data?.result; - state.orgId = [state.option[0]?.organizationId]; - state.resetOrgId = [state.option[0]?.organizationId]; + state.option = res.data?.result.orgTreeList; + state.orgId = res.data?.result.treeNodeList; + state.resetOrgId = res.data?.result.treeNodeList; state.allowClear = true; getTableData(); } diff --git a/src/views/report/Curriculum.vue b/src/views/report/Curriculum.vue index 164acd54..83fa8184 100644 --- a/src/views/report/Curriculum.vue +++ b/src/views/report/Curriculum.vue @@ -187,9 +187,9 @@ export default { } const res = await api.userGetUserOrg(params); if (res) { - state.option = res.data?.result; - state.orgId = [state.option[0]?.organizationId]; - state.resetOrgId = [state.option[0]?.organizationId]; + state.option = res.data?.result.orgTreeList; + state.orgId = res.data?.result.treeNodeList; + state.resetOrgId = res.data?.result.treeNodeList; state.allowClear = true getTableData(); } diff --git a/src/views/report/Employeelearning.vue b/src/views/report/Employeelearning.vue index 3ae8339f..9d150f10 100644 --- a/src/views/report/Employeelearning.vue +++ b/src/views/report/Employeelearning.vue @@ -218,9 +218,9 @@ export default { const getOrgList = async () => { const res = await api.userGetUserOrg({}); if (res) { - state.option = res.data?.result; - state.orgId = [state.option[0]?.organizationId]; - state.resetOrgId = [state.option[0]?.organizationId]; + state.option = res.data?.result.orgTreeList; + state.orgId = res.data?.result.treeNodeList; + state.resetOrgId = res.data?.result.treeNodeList; res.data?.result?.userType === 1 ? (state.allowClear = true) : (state.allowClear = false); diff --git a/src/views/report/Learningpathmap.vue b/src/views/report/Learningpathmap.vue index 10db54ad..4b7fadc6 100644 --- a/src/views/report/Learningpathmap.vue +++ b/src/views/report/Learningpathmap.vue @@ -188,9 +188,12 @@ export default { // let roleList = store.state.userInfo.roleList; const res = await api.userGetUserOrg(); if (res) { - state.option = res.data?.result; - state.orgId = [state.option[0]?.organizationId]; - state.resetOrgId = [state.option[0]?.organizationId]; + // state.option = res.data?.result; + // state.orgId = [state.option[0]?.organizationId]; + // state.resetOrgId = [state.option[0]?.organizationId]; + state.option = res.data?.result.orgTreeList; + state.orgId = res.data?.result.treeNodeList; + state.resetOrgId = res.data?.result.treeNodeList; state.allowClear = true; getTableData(); } diff --git a/src/views/report/ReportExamination.vue b/src/views/report/ReportExamination.vue index be239b9d..f5c4ba12 100644 --- a/src/views/report/ReportExamination.vue +++ b/src/views/report/ReportExamination.vue @@ -184,9 +184,9 @@ export default { const getOrgList = async () => { const res = await api.userGetUserOrg({}); if (res) { - state.option = res.data?.result; - state.orgId = [state.option[0]?.organizationId]; - state.resetOrgId = [state.option[0]?.organizationId]; + state.option = res.data?.result.orgTreeList; + state.orgId = res.data?.result.treeNodeList; + state.resetOrgId = res.data?.result.treeNodeList; res.data?.result?.userType === 1 ? (state.allowClear = true) : (state.allowClear = false); diff --git a/src/views/report/ReportProject.vue b/src/views/report/ReportProject.vue index d7014fa7..0d793773 100644 --- a/src/views/report/ReportProject.vue +++ b/src/views/report/ReportProject.vue @@ -315,9 +315,9 @@ export default { } const res = await api.userGetUserOrg(params); if (res) { - state.option = res.data?.result; - state.orgId = [state.option[0]?.organizationId]; - state.resetOrgId = [state.option[0]?.organizationId]; + state.option = res.data?.result.orgTreeList; + state.orgId = res.data?.result.treeNodeList; + state.resetOrgId = res.data?.result.treeNodeList; state.allowClear = true getTableData(); }