diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue index d6d03caf..2dd78605 100644 --- a/src/components/NavLeft.vue +++ b/src/components/NavLeft.vue @@ -1090,6 +1090,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/router/RouterEvaluationManage.vue b/src/components/drawers/router/RouterEvaluationManage.vue index 892376b4..c682cc3d 100644 --- a/src/components/drawers/router/RouterEvaluationManage.vue +++ b/src/components/drawers/router/RouterEvaluationManage.vue @@ -429,6 +429,9 @@ export default { // 导出数据 function exportTaskStu() { console.log(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.routerTaskId}&taskType=${props.datasource.type}`) + if(!props.datasource.routerTaskId){ + props.datasource.routerTaskId = '' + } window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.routerTaskId}&taskType=${props.datasource.type}`) // window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?pageNo=${state.currentPage}&pageSize=${state.pageSize}¤tStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.routerTaskId}&status=${state.name}&studentName=${state.projectName}`) } diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index 93f83ba8..d76cd0df 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -2299,7 +2299,7 @@ export default { state.addLoading = true; getOverview(); - // myGetRouterDetail(); + myGetRouterDetail(); reget(); }); const closePub = () => { 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, diff --git a/src/views/research/ResearchAdd.vue b/src/views/research/ResearchAdd.vue index 723224d2..37690a95 100644 --- a/src/views/research/ResearchAdd.vue +++ b/src/views/research/ResearchAdd.vue @@ -90,6 +90,16 @@ const handleSave = () => { loading.value = false; return false; } + const listsss = data.value.scoringQuestionVoList.map((item) => ({ + minimumEvaluation: item.minimumEvaluation || '非常满意', + highestEvaluation: item.highestEvaluation || '非常不满意', + orderNumber: item.orderNumber, + assessmentId: id, + })); + request('/activitySubmit/editAssessmentScore post',listsss).then((res)=>{ + console.log(res,'sss') + + }) editResearchMessage({ id, assessmentName: data.value.assessmentName, @@ -175,6 +185,8 @@ function addScoringQuestionItem() { questionType: 4, assessmentScTitle: "", assessmentMaxScore: 10, + minimumEvaluation: '非常满意', + highestEvaluation: '非常不满意', assessmentMinScore: 1, weightScale: 100, orderNumber: orderList.value?.length + 1, diff --git a/src/views/research/components/ResearchAddPin.vue b/src/views/research/components/ResearchAddPin.vue index d5342acf..b35f710f 100644 --- a/src/views/research/components/ResearchAddPin.vue +++ b/src/views/research/components/ResearchAddPin.vue @@ -52,7 +52,11 @@