From 6abfc705cd4bece7d2893409d4795a33dffe1401 Mon Sep 17 00:00:00 2001
From: chensg <ch@qq.com>
Date: Wed, 18 Jun 2025 13:51:46 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=8E=88=E8=AF=BE=20=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E9=9D=A2=E6=8E=88=E5=9C=B0=E7=82=B9=E6=A0=BC=E5=BC=8F=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/report/Overvoewnew.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/views/report/Overvoewnew.vue b/src/views/report/Overvoewnew.vue
index 3fe2e9ac..2df3b4d9 100644
--- a/src/views/report/Overvoewnew.vue
+++ b/src/views/report/Overvoewnew.vue
@@ -1928,9 +1928,6 @@ export default {
             key: "address",
             width: 120,
             align: "center",
-            customRender: (text) => {
-              return formatValNull(text.value)
-            },
             colSortNo: 7,
             visible: true,
           },

From 812eb37cef6288bd0f6fd6be0962ecbb85de7350 Mon Sep 17 00:00:00 2001
From: chensg <ch@qq.com>
Date: Wed, 18 Jun 2025 15:26:03 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E8=80=83=E8=AF=95=E3=80=81=E6=A1=88?=
 =?UTF-8?q?=E4=BE=8B=E3=80=81=E4=B8=93=E4=B8=9A=E5=8A=9B=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/report/Overvoewnew.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/report/Overvoewnew.vue b/src/views/report/Overvoewnew.vue
index 2df3b4d9..ed905ba1 100644
--- a/src/views/report/Overvoewnew.vue
+++ b/src/views/report/Overvoewnew.vue
@@ -748,7 +748,7 @@ export default {
           page: state.pageNo,
           size: state.pageSize,
           orgPath: state.orgPath,
-          tableSorts: state.tableSorts
+          tableSorted: state.tableSorts
         });
       } else if (state.currentTab === 6) {
         //专业力
@@ -784,8 +784,8 @@ export default {
           teacher: state.teacherName,
           orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
           createName: state.creator,
-          startTime: state.publishTime && state.publishTime[0] ? state.publishTime[0] + " 00:00:00" : null,
-          endTime: state.publishTime && state.publishTime[1] ? state.publishTime[1] + " 23:59:59" : null,
+          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
         });
@@ -1146,6 +1146,7 @@ export default {
             ellipsis: true,
             width: 120,
             align: "center",
+            sorter: true,
             customRender: (text) => {
               return text.value && text.value == 1?'已发布':"未发布";;
             },
@@ -1384,6 +1385,7 @@ export default {
             ellipsis: true,
             align: "center",
             width: 120,
+            sorter: true,
             colSortNo: 5,
             visible: true,
             customRender: (text) => {return formatValNull(text.value);},

From 1f116c900661c2e9e7d0fcfbbcc917b8d2197e4a Mon Sep 17 00:00:00 2001
From: chensg <ch@qq.com>
Date: Wed, 18 Jun 2025 15:35:41 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AD=A6=E5=91=98?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8Fbug?=
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 fcf8ebe5..05890dc5 100644
--- a/src/views/report/Employeelearning.vue
+++ b/src/views/report/Employeelearning.vue
@@ -610,7 +610,7 @@ export default {
         orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
         bandCode: state.valueBand,
         jobName: state.studentJobName,
-        tableSorts: state.tableSorts
+        tableSorted: state.tableSorts
       });
       if (res) {
         state.tableDataTotal = res.data.total;

From 5956556b579731a4777119a24afc80a2261e7a02 Mon Sep 17 00:00:00 2001
From: chensg <ch@qq.com>
Date: Wed, 18 Jun 2025 15:48:37 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=AF=BC=E5=87=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/report/Overvoewnew.vue b/src/views/report/Overvoewnew.vue
index ed905ba1..5053e0dc 100644
--- a/src/views/report/Overvoewnew.vue
+++ b/src/views/report/Overvoewnew.vue
@@ -693,7 +693,7 @@ export default {
 
     // 导出按钮
     const exportClick = async () => {
-      if (!reportSelectedValues.value?.length) {
+      if (!state.selectedRowKeys.length) {
         return message.warning("请至少选择一条数据进行导出");
       } else {
         let fields = columns.value.filter(item=>item.visible==true).map(function(item){