diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue index 54e8d251..2f3a2ecd 100644 --- a/src/components/NavLeft.vue +++ b/src/components/NavLeft.vue @@ -1050,6 +1050,10 @@ export default { console.log("监听路由", n, store.state.openpages, state.keysList); // console.log("new:" + n.toLowerCase() + ",old:" + o); let arr = state.keysList; + if(!arr.some(page => page.href === n)){ + console.log('不存在',n) + return + } arr.map((value) => { if (n.toLowerCase() === value.href) { localStorage.setItem("openKeys", JSON.stringify([value.openKeys])); diff --git a/src/components/drawers/project/ProjectEvalManage.vue b/src/components/drawers/project/ProjectEvalManage.vue index 21b92390..d124f7cb 100644 --- a/src/components/drawers/project/ProjectEvalManage.vue +++ b/src/components/drawers/project/ProjectEvalManage.vue @@ -430,6 +430,9 @@ export default { // 导出数据 function exportTaskStu() { + if(!props.datasource.projectTaskId){ + props.datasource.projectTaskId = '' + } window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&taskId=${props.datasource.projectTaskId}&taskType=${props.datasource.type}`) // window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?pageNo=${state.currentPage}&pageSize=${state.pageSize}¤tStageId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&taskId=${props.datasource.projectTaskId}&status=${state.name}&studentName=${state.projectName}`) } diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 80c42d61..7dd38377 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -2475,7 +2475,7 @@ export default { if(qrCodeItems.value.length==1){ qrCode({ title: "【签到】二维码", - courseName: state.name+'项目', + courseName: state.name, name: qrCodeItems.value[0].name+'课程签到', createName:qrCodeItems.value[0].offteachers.map(teacher => teacher.teacherName).join(', ')||qrCodeItems.value[0].teacher, url: `${location.protocol}//${location.host}${process.env.VUE_APP_BASE_API}/admin/student/studentSign?taskId=${qrCodeItems.value[0].id}&taskType=${2}&type=${3}&openCourseId=${qrCodeItems.value[0].id}`, @@ -2493,7 +2493,7 @@ export default { const offteachers = qrCodeItems.value[key].offteachers.map(teacher => teacher.teacherName).join(', '); qrCode({ title: "【签到】二维码", - courseName: state.name+'项目', + courseName: state.name, name: name+'课程签到', createName:offteachers||teacher, url: `${location.protocol}//${location.host}${process.env.VUE_APP_BASE_API}/admin/student/studentSign?taskId=${id}&taskType=${2}&type=${3}&openCourseId=${id}`, @@ -2518,7 +2518,7 @@ export default { })); qrCodeItemspg.value = qrCodeItemspgItem.filter(item => item.assessmentId !== null); if(qrCodeItemspg.value.length==1){ - const courseName = state.name+'项目' + const courseName = state.name qrCode({ title: "【评估】二维码", courseName, @@ -2535,7 +2535,7 @@ export default { const teacher = qrCodeItemspg.value[key].teacher; const id = qrCodeItemspg.value[key].id; const assessmentId = qrCodeItemspg.value[key].assessmentId; - const courseName = state.name+'项目' + const courseName = state.name qrCode({ title: "【评估】二维码", courseName,