From 0e730359489fa0d8e73ea192561649d6a6a55294 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8D=93=E7=85=9C?= <2210102150@qq.com>
Date: Sun, 22 Jun 2025 18:58:56 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AD=A6=E5=91=98?=
 =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E6=8A=A5=E8=A1=A8=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/report/EmployeelearningModal.vue | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/views/report/EmployeelearningModal.vue b/src/views/report/EmployeelearningModal.vue
index 946a3663..d19d30e3 100644
--- a/src/views/report/EmployeelearningModal.vue
+++ b/src/views/report/EmployeelearningModal.vue
@@ -302,6 +302,21 @@ const exportClick = ()=>{
 const exportClickAll = ()=>{
     fetchExportReport({type: data.type,id:props.studentId});
 }
+// 处理导出
+function fetchExportReport(data) {
+  axios({
+    method: "post",
+    url: "/reportsnake/export/report",
+    data: data,
+    responseType: "blob",
+    headers: {
+      token: Cookies.get("token"),
+    },
+  }).then((res) => {
+    downLoad(res.data,  modelTitle.value + ".xlsx");
+  });
+}
+
 </script>
 <style lang="scss">
 .tableBox {

From 656ffdd6c226e8d55ee671c72feceedde55c9da6 Mon Sep 17 00:00:00 2001
From: chensg <ch@qq.com>
Date: Tue, 24 Jun 2025 10:41:33 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=80=E7=BA=A7=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=AF=BC=E5=87=BA=E6=B7=BB=E5=8A=A0=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/report/Employeelearning.vue |  15 ++--
 src/views/report/Overvoewnew.vue      | 113 +++++++++++++++++++++++++-
 2 files changed, 121 insertions(+), 7 deletions(-)

diff --git a/src/views/report/Employeelearning.vue b/src/views/report/Employeelearning.vue
index 05890dc5..b9ceb354 100644
--- a/src/views/report/Employeelearning.vue
+++ b/src/views/report/Employeelearning.vue
@@ -607,7 +607,7 @@ export default {
         size: state.pageSize,
         userNo: state.userNo,
         name: state.name,
-        orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
+        //orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
         bandCode: state.valueBand,
         jobName: state.studentJobName,
         tableSorted: state.tableSorts
@@ -644,15 +644,18 @@ export default {
       if(!fields?.length){
           return message.warning("请至少选择一个字段进行导出");
       }
+      let studentReportReq = {
+        userNo: state.userNo,
+        name: state.name,
+        orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
+        bandCode: state.valueBand,
+        jobName: state.studentJobName,
+      }
       axios({
         method: "post",
         url: "/reportsnake/export/report",
         data: {
-          userNo: state.userNo,
-          name: state.name,
-          orgId: state.orgId,
-          bandCode: state.valueBand,
-          jobName: state.studentJobName,
+          studentReportReq: studentReportReq,
           fields: fields,
           type: 20
         },
diff --git a/src/views/report/Overvoewnew.vue b/src/views/report/Overvoewnew.vue
index e9974192..34b38765 100644
--- a/src/views/report/Overvoewnew.vue
+++ b/src/views/report/Overvoewnew.vue
@@ -713,7 +713,22 @@ export default {
       if(!fields?.length){
         return message.warning("请至少选择一个字段进行导出");
       }
-      fetchExportReport({type: state.currentTab,fields:fields});
+      let query = getQueryParams();
+      if (state.currentTab === 0) {
+        fetchExportReport({type: state.currentTab,fields:fields,projectReportReq:query});
+      }else if(state.currentTab === 1){
+        fetchExportReport({type: state.currentTab,fields:fields,routerReportReq:query});
+      }else if(state.currentTab === 2){
+        fetchExportReport({type: state.currentTab,fields:fields,faceReportReq:query});
+      }else if(state.currentTab === 3){
+        fetchExportReport({type: state.currentTab,fields:fields,courseReportReq:query});
+      }else if(state.currentTab === 4){
+        fetchExportReport({type: state.currentTab,fields:fields,examReportReq:query});
+      }else if(state.currentTab === 5){
+        fetchExportReport({type: state.currentTab,fields:fields,caseReportReq:query});
+      }else if(state.currentTab === 6){
+        fetchExportReport({type: state.currentTab,fields:fields,professionalReportReq:query});
+      }
     };
     // table选中
     const onSelectChange = (selectedRowKeys) => {
@@ -2449,6 +2464,102 @@ export default {
       return recursiveSearch(data, value, '');
     }
 
+    function getQueryParams(){
+      if (state.currentTab === 4) {
+        //考试列表
+        return {
+          createName: state.creator,
+          startCreateTime: state.publishTime && state.publishTime[0] ? state.publishTime[0] + " 00:00:00" : null,
+          endCreateTime: state.publishTime && state.publishTime[1] ? state.publishTime[1] + " 23:59:59" : null,
+          orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
+          testName: state.name,
+          page: state.pageNo,
+          size: state.pageSize,
+          orgPath: state.orgPath,
+          tableSorts: state.tableSorts,
+        };
+      } else if (state.currentTab === 5) {
+        //案例列表
+        return {
+          createName: state.creator,
+          startCreateTime: state.publishTime && state.publishTime[0] ? state.publishTime[0] + " 00:00:00" : null,
+          endCreateTime: state.publishTime && state.publishTime[1] ? state.publishTime[1] + " 23:59:59" : null,
+          orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
+          caseName: state.name,
+          page: state.pageNo,
+          size: state.pageSize,
+          orgPath: state.orgPath,
+          tableSorted: state.tableSorts
+        };
+      } else if (state.currentTab === 6) {
+        //专业力
+        return {
+          startCreateTime: state.publishTime && state.publishTime[0] ? state.publishTime[0] + " 00:00:00" : null,
+          endCreateTime: state.publishTime && state.publishTime[1] ? state.publishTime[1] + " 23:59:59" : null,
+          orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
+          page: state.pageNo,
+          size: state.pageSize,
+          orgPath: state.orgPath,
+          stdPosition: state.stdPosition,
+          qualsLevelCode: state.qualsLevelCode,
+          tableSorts: state.tableSorts
+        };
+      } else if (state.currentTab === 3) {
+        return {
+          page: state.pageNo,
+          size: state.pageSize,
+          name: state.name,
+          orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
+          createName: state.creator,
+          startCreateTime: state.publishTime && state.publishTime[0] ? state.publishTime[0] + " 00:00:00" : null,
+          endCreateTime: state.publishTime && state.publishTime[1] ? state.publishTime[1] + " 23:59:59" : null,
+          orgPath: state.orgPath,
+          category: findPathByValue(sysTypeOptions, state.categoryTypeId),
+          tableSorts: state.tableSorts
+        };
+      } else if (state.currentTab === 2) {
+        return {
+          page: state.pageNo,
+          size: state.pageSize,
+          offcourseName: state.name,
+          teacher: state.teacherName,
+          orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
+          createName: state.creator,
+          startCreateTime: state.publishTime && state.publishTime[0] ? state.publishTime[0] + " 00:00:00" : null,
+          endCreateTime: state.publishTime && state.publishTime[1] ? state.publishTime[1] + " 23:59:59" : null,
+          orgPath: state.orgPath,
+          tableSorts: state.tableSorts
+        };
+      } else if (state.currentTab === 1) {
+        return {
+          page: state.pageNo,
+          size: state.pageSize,
+          routerName: state.name,
+          orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
+          createName: state.creator,
+          startCreateTime: state.publishTime && state.publishTime[0] ? state.publishTime[0] + " 00:00:00" : null,
+          endCreateTime: state.publishTime && state.publishTime[1] ? state.publishTime[1] + " 23:59:59" : null,
+          orgPath: state.orgPath,
+          status: state.status,
+          tableSorts: state.tableSorts
+        };
+      } else if (state.currentTab === 0) {
+        return {
+          page: state.pageNo,
+          size: state.pageSize,
+          orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
+          createName: state.creator,
+          projectName: state.name,
+          mangerName: state.mangerName,
+          startCreateTime: state.publishTime && state.publishTime[0] ? state.publishTime[0] + " 00:00:00" : null,
+          endCreateTime: state.publishTime && state.publishTime[1] ? state.publishTime[1] + " 23:59:59" : null,
+          orgPath: state.orgPath,
+          status: state.status && (state.status == 1 ? "进行中" : "已结束"),
+          tableSorts: state.tableSorts
+        };
+      }
+    }
+
     const loadEcharts = ()=>{
       // 初始化漏斗图
       myFunnelChart = echarts.init(funnelChart.value);

From 341af7df11a24bbe30709729ec436c9d7d494b94 Mon Sep 17 00:00:00 2001
From: chensg <ch@qq.com>
Date: Tue, 24 Jun 2025 13:23:18 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=AD=A6=E5=91=98=E6=8A=A5=E8=A1=A8orgId?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=81=A2=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/report/Employeelearning.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/report/Employeelearning.vue b/src/views/report/Employeelearning.vue
index b9ceb354..212e8f0a 100644
--- a/src/views/report/Employeelearning.vue
+++ b/src/views/report/Employeelearning.vue
@@ -607,7 +607,7 @@ export default {
         size: state.pageSize,
         userNo: state.userNo,
         name: state.name,
-        //orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
+        orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
         bandCode: state.valueBand,
         jobName: state.studentJobName,
         tableSorted: state.tableSorts