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

This commit is contained in:
yuping
2023-03-05 23:30:24 +08:00
2 changed files with 4 additions and 4 deletions

View File

@@ -467,10 +467,10 @@ function toSurvery() {
router.push({ router.push({
path: "/surveydetail", path: "/surveydetail",
query: { query: {
id: taskId, id: data.value.planDto.id,
courseId: data.value.planDto.evaluateId, courseId: data.value.planDto.assessmentId,
pName: "面授课", pName: "面授课",
infoId: data.value.planDto.offcoursePlanId, infoId: data.value.planDto.id,
chapterOrStageId: 0, chapterOrStageId: 0,
sName: data.value.planDto.name, sName: data.value.planDto.name,
type: 3, type: 3,

View File

@@ -348,7 +348,7 @@ const returnclick = () => {
clearInterval(timers) clearInterval(timers)
router.back(); 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 fielPath = ref(import.meta.env.VITE_FILE_PATH);
const { data } = useRequest(ASSESSMENT_QUERY(courseId), { id: courseId, type, chapterOrStageId, targetId: infoId ? infoId : 0 }); const { data } = useRequest(ASSESSMENT_QUERY(courseId), { id: courseId, type, chapterOrStageId, targetId: infoId ? infoId : 0 });
console.log(data) console.log(data)