hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-11 11:56:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
joshen
2025-06-18 15:51:35 +08:00
parent 327223da3e 5956556b57
commit 110a74275b
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/report/Employeelearning.vue
View File

@@ -610,7 +610,7 @@ export default {
orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
bandCode: state.valueBand, bandCode: state.valueBand,
jobName: state.studentJobName, jobName: state.studentJobName,
tableSorts: state.tableSorts tableSorted: state.tableSorts
}); });
if (res) { if (res) {
state.tableDataTotal = res.data.total; state.tableDataTotal = res.data.total;

13
src/views/report/Overvoewnew.vue
View File

@@ -693,7 +693,7 @@ export default {
// 导出按钮 // 导出按钮
const exportClick = async () => { const exportClick = async () => {
if (!reportSelectedValues.value?.length) { if (!state.selectedRowKeys.length) {
return message.warning("请至少选择一条数据进行导出"); return message.warning("请至少选择一条数据进行导出");
} else { } else {
let fields = columns.value.filter(item=>item.visible==true).map(function(item){ let fields = columns.value.filter(item=>item.visible==true).map(function(item){
@@ -748,7 +748,7 @@ export default {
page: state.pageNo, page: state.pageNo,
size: state.pageSize, size: state.pageSize,
orgPath: state.orgPath, orgPath: state.orgPath,
tableSorts: state.tableSorts tableSorted: state.tableSorts
}); });
} else if (state.currentTab === 6) { } else if (state.currentTab === 6) {
//专业力 //专业力
@@ -784,8 +784,8 @@ export default {
teacher: state.teacherName, teacher: state.teacherName,
orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null, orgId: state.orgId ? state.orgId[state.orgId.length - 1] : null,
createName: state.creator, createName: state.creator,
startTime: state.publishTime && state.publishTime[0] ? state.publishTime[0] + " 00:00:00" : null, startCreateTime: 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, endCreateTime: state.publishTime && state.publishTime[1] ? state.publishTime[1] + " 23:59:59" : null,
orgPath: state.orgPath, orgPath: state.orgPath,
tableSorts: state.tableSorts tableSorts: state.tableSorts
}); });
@@ -1146,6 +1146,7 @@ export default {
ellipsis: true, ellipsis: true,
width: 120, width: 120,
align: "center", align: "center",
sorter: true,
customRender: (text) => { customRender: (text) => {
return text.value && text.value == 1?'已发布':"未发布";; return text.value && text.value == 1?'已发布':"未发布";;
}, },
@@ -1384,6 +1385,7 @@ export default {
ellipsis: true, ellipsis: true,
align: "center", align: "center",
width: 120, width: 120,
sorter: true,
colSortNo: 5, colSortNo: 5,
visible: true, visible: true,
customRender: (text) => {return formatValNull(text.value);}, customRender: (text) => {return formatValNull(text.value);},
@@ -1928,9 +1930,6 @@ export default {
key: "address", key: "address",
width: 120, width: 120,
align: "center", align: "center",
customRender: (text) => {
return formatValNull(text.value)
},
colSortNo: 7, colSortNo: 7,
visible: true, visible: true,
}, },