{
@@ -245,7 +240,7 @@ export default {
title: "姓名",
dataIndex: "userNickName",
key: "userNickName",
- width: 50,
+ width: 80,
align: "center",
className: "h head",
customRender: (text) => {
@@ -259,27 +254,11 @@ export default {
);
},
},
- {
- title: "归属组织",
- dataIndex: "orgName",
- key: "orgName",
- width: 160,
- align: "center",
- ellipsis: true,
- className: "h",
- customRender: (text) => {
- return (
-
- {text.record.orgName ? text.record.orgName : "-"}
-
- );
- },
- },
{
title: "标准岗位",
dataIndex: "stdPositionName",
key: "stdPositionName",
- width: 60,
+ width: 150,
align: "center",
ellipsis: true,
className: "h",
@@ -300,7 +279,7 @@ export default {
title: "任职资格",
dataIndex: "qualsLevelDesr",
key: "qualsLevelDesr",
- width: 60,
+ width: 80,
align: "center",
ellipsis: true,
className: "h",
@@ -349,22 +328,6 @@ export default {
4: "添加",
}[joinMethod]),
},
- /** {
- title: "学员关卡",
- dataIndex: "currentStageName",
- key: "currentStageName",
- width: 60,
- align: "center",
- ellipsis: true,
- className: "h",
- customRender: () => {
- return (
-
- {props.levelName}
-
- );
- },
- },*/
{
title: "完成时间",
dataIndex: "finishTime",
@@ -456,6 +419,8 @@ export default {
state.name = "";
state.projectName = undefined;
state.tabledata = [];
+ state.stdPosition = null;
+ state.qualsLevelCode = null;
};
const afterVisibleChange = (bol) => {
if (bol == true) {
@@ -494,13 +459,13 @@ export default {
// 获取数据
function getData() {
getStudentTaskPage({
- pageNo: state.currentPage,
+ pageNum: state.currentPage,
pageSize: state.pageSize,
completionStatus: state.projectName,
username: state.name,
taskId: props.datasource.id,
qualsLevelCode: state.qualsLevelCode,
- stdPositionId: state.stdPositionId,
+ stdPosition: state.stdPosition,
})
.then((res) => {
console.log("在线课数据获取", res);
@@ -528,6 +493,8 @@ export default {
state.currentPage = 1;
state.name = "";
state.projectName = null;
+ state.stdPosition = null;
+ state.qualsLevelCode = null;
getData();
}
@@ -540,56 +507,35 @@ export default {
// 导出数据
function exportTaskStu() {
- exportStudentTaskPage({
- pageNo: state.currentPage,
- pageSize: state.pageSize,
- completionStatus: state.projectName,
- username: state.name,
- taskId: props.datasource.id,
- qualsLevelCode: state.qualsLevelCode,
- stdPositionId: state.stdPositionId,
- }).catch((err) => {
- let blob = new Blob([err.data], {
- type: "application/vnd.ms-excel",
- });
- console.log(blob);
- let url = window.URL.createObjectURL(blob);
-
- // 创建a标签并为其添加属性
- const link = document.createElement("a");
- link.href = url;
- link.download = `【${
- state.TASK_TYPE[props.datasource.taskType].name
- }】${props.datasource.taskName}.xlsx`;
- // 触发点击事件执行下载
- document.body.appendChild(link);
- link.click();
- // 下载完成就删掉a标签
- document.body.removeChild(link);
- //释放blob对象
- window.URL.revokeObjectURL(url);
- });
- // if(props.datasource.type==1){
- // {/* 在线课导出 */}
- // window.open(`${process.env.VUE_APP_BASE_API}/admin/online/manage/exportOnline?chapterId=${props.datasource.stageId}&type=${1}&targetId=${props.datasource.projectId}&taskId=${props.datasource.courseId}`)
- // }else if(props.datasource.taskType==11){
- // {/* 评估导出 */}
- // window.open(`${process.env.VUE_APP_BASE_API}/admin/assessment/manage/exportAssessmentMessage?chapterId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&courseId=${props.datasource.courseId}&taskId=${props.datasource.id}&taskType=${props.datasource.taskType}`)
- // }else if(props.datasource.taskType==8){
- // {/* 讨论导出 */}
- // window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportDiscussStudent?chapterId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&courseId=${props.datasource.courseId}&taskId=${props.datasource.id}&taskType=${props.datasource.taskType}`)
- // }else{
- // window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&taskId=${props.datasource.id}&taskType=${props.datasource.taskType}`)
- // }
+ let params = {
+ pageNo: state.currentPage || "",
+ pageSize: state.pageSize || "",
+ completionStatus: state.projectName || "",
+ username: state.name || "",
+ taskId: props.datasource.id || "",
+ qualsLevelCode: state.qualsLevelCode || "",
+ stdPosition: state.stdPosition || "",
+ };
// window.open(
- // `${
- // process.env.VUE_APP_BASE_API
- // }/admin/online/manage/exportOnline?type=${14}&targetId=${
- // props.datasource.targetId
- // }&taskId=${props.datasource.courseId}`
+ // buildUrl(
+ // "http://192.168.18.141:32002/professional/studentTask/export",
+ // params
+ // )
// );
+ window.open(
+ buildUrl(
+ `${process.env.VUE_APP_BOE_API_URL}${process.env.VUE_APP_BASE_API_GROWTH}/professional/studentTask/export`,
+ params
+ )
+ );
+ }
+ function buildUrl(url, params) {
+ const searchParams = new URLSearchParams();
+ Object.keys(params).forEach((key) => {
+ searchParams.append(key, params[key]);
+ });
+ return `${url}?${searchParams.toString()}`;
}
-
return {
...toRefs(state),
selectProjectName,
diff --git a/src/components/growthpath/GrowthProject.vue b/src/components/growthpath/GrowthProject.vue
index 06efce92..31bda7f7 100644
--- a/src/components/growthpath/GrowthProject.vue
+++ b/src/components/growthpath/GrowthProject.vue
@@ -56,9 +56,9 @@
