Merge remote-tracking branch 'yx/250605-added-yzt'

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;

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){
@@ -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);},
@@ -1928,9 +1930,6 @@ export default {
             key: "address",
             width: 120,
             align: "center",
-            customRender: (text) => {
-              return formatValNull(text.value)
-            },
             colSortNo: 7,
             visible: true,
           },