diff --git a/src/store/index.js b/src/store/index.js index 379211a..8796c5a 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -28,7 +28,7 @@ export default createStore({ if (state.projectInfo.unlockMode === 1) { state.projectInfo.stageProcessList.forEach((t) => { t.statusName = "进行中"; - t.taskProcessList?.forEach((s) => s.statusName = (s.status === 1) ? "已完成" : TASK_TYPES.toName[s.type]); + t.taskProcessList?.forEach((s) => s.statusName = (s.status === 1) ? "已完成" : s.status === 2 ? (s.statusName = "进行中") : TASK_TYPES.toName[s.type]); t.taskProcessList?.every((s) => s.status === 1) && (t.statusName = "已完成"); }); return; @@ -57,7 +57,7 @@ export default createStore({ } state.routerInfo.statusName = "进行中"; if (state.routerInfo.unlockMode === 1) { - state.routerInfo.taskBoList?.forEach((s) => s.statusName = (s.status === 1) ? "已完成" : TASK_TYPES.toName[s.type]); + state.routerInfo.taskBoList?.forEach((s) => s.statusName = (s.status === 1) ? "已完成" : s.status === 2 ? (s.statusName = "进行中") : TASK_TYPES.toName[s.type]); state.routerInfo.taskBoList?.every((s) => s.status === 1) && (state.routerInfo.statusName = "已完成"); return; } diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue index 4546cf6..99c1756 100644 --- a/src/views/faceteach/FaceTeach.vue +++ b/src/views/faceteach/FaceTeach.vue @@ -467,10 +467,10 @@ function toSurvery() { router.push({ path: "/surveydetail", query: { - id: taskId, - courseId: data.value.planDto.evaluateId, + id: data.value.planDto.id, + courseId: data.value.planDto.assessmentId, pName: "面授课", - infoId: data.value.planDto.offcoursePlanId, + infoId: data.value.planDto.id, chapterOrStageId: 0, sName: data.value.planDto.name, type: 3, diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index 2c923a3..ccf5713 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -473,6 +473,7 @@ async function toFinish(d) { targetId: data.value.id, logo: ROUTER, type: ROUTER, + taskType: d.type, stageOrChapterId: data.value.currentStageId, taskId: d.id, }); diff --git a/src/views/survey/SurveyDetail.vue b/src/views/survey/SurveyDetail.vue index a5bb3cc..583325e 100644 --- a/src/views/survey/SurveyDetail.vue +++ b/src/views/survey/SurveyDetail.vue @@ -348,7 +348,7 @@ const returnclick = () => { clearInterval(timers) router.back(); }; -const {nextPage,prevPage,hasPrev, hasNext} = useTaskPage() +const {nextPage,prevPage,hasPrev, hasNext} = type==3 ? '' : useTaskPage() const fielPath = ref(import.meta.env.VITE_FILE_PATH); const { data } = useRequest(ASSESSMENT_QUERY(courseId), { id: courseId, type, chapterOrStageId, targetId: infoId ? infoId : 0 }); console.log(data)