Merge remote-tracking branch 'origin/develop' into develop

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,

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)