From b171871d6fadcd25c7a1beb04feaf4f8ee026abc Mon Sep 17 00:00:00 2001 From: wuyx Date: Fri, 23 Dec 2022 18:31:41 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=8F=90=E4=BA=A4=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E4=BC=A0=E9=80=92=E9=A1=B9=E7=9B=AE/=E8=B7=AF=E5=BE=84id?= =?UTF-8?q?=E5=8F=8A=E5=85=B6=E9=98=B6=E6=AE=B5/=E8=B7=AF=E5=BE=84id?= =?UTF-8?q?=E7=94=A8=E4=BA=8E=E5=8C=BA=E5=88=86=E4=B8=8D=E5=90=8C=E8=AF=84?= =?UTF-8?q?=E4=BC=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/faceteach/FaceTeach.vue | 1 + src/views/liveBroadcast/LiveBroadcast.vue | 1 + src/views/project/ProjectDetails.vue | 5 +- src/views/roadmap/PathDetails.vue | 8 +- src/views/survey/SurveyDetail.vue | 777 ++++++++++------------ 5 files changed, 379 insertions(+), 413 deletions(-) diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue index deaa521..42db959 100644 --- a/src/views/faceteach/FaceTeach.vue +++ b/src/views/faceteach/FaceTeach.vue @@ -333,6 +333,7 @@ function toSurvery() { courseId: data.value.planDto.evaluateId, pName: "面授课", sName: data.value.planDto.name, + type: 3 }, }); } diff --git a/src/views/liveBroadcast/LiveBroadcast.vue b/src/views/liveBroadcast/LiveBroadcast.vue index 89085a6..2cbfe7c 100644 --- a/src/views/liveBroadcast/LiveBroadcast.vue +++ b/src/views/liveBroadcast/LiveBroadcast.vue @@ -213,6 +213,7 @@ const commitClick = () => { courseId: data.value.assessmentId, pName: "直播", sName: data.value.liveName, + type: 4 }, }); }; diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index 8f77189..d0356a2 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -375,8 +375,8 @@ function introductionPro() { dialogVisible.value = true; } -function toFinish(d, sName, chapterId) { - console.log("dddddd", d, sName); +function toFinish(d, sName, chapterOrStageId) { + console.log("dddddd", d, sName, chapterOrStageId); // 作业过期判断 if (d.type == 4) { let date1 = new Date(d.endTime).getTime(); @@ -472,6 +472,7 @@ function toFinish(d, sName, chapterId) { courseId: d.courseId, pName: data.value.name, sName, + chapterOrStageId }, }); } else if (typeof types.value.path[d.type] === "function") { diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index ea07fba..1a242db 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -96,7 +96,7 @@
- {{value.currentRatio === 1 ? "已完成" : types.path[value.type] ? types.toName[value.type] : "未开放"}} + {{ value.currentRatio === 1 ? "已完成" : types.path[value.type] ? types.toName[value.type] : "未开放" }}
@@ -368,6 +368,8 @@ const types = ref({ }); function toFinish(d) { + console.log(d) + console.log(data.value.currentStageId, routerId) if (!types.value.path[d.type]) { ElMessage.error("暂时未开放"); return; @@ -390,11 +392,13 @@ function toFinish(d) { router.push({ path: types.value.path[d.type], query: { - id: d.routerTaskId, + // id: d.routerTaskId, + id: routerId, type: 1, courseId: d.courseId, pName: data.value.name, sName: data.value.currentStageName, + chapterOrStageId: data.value.currentStageId }, }); } else if (typeof types.value.path[d.type] === "function") { diff --git a/src/views/survey/SurveyDetail.vue b/src/views/survey/SurveyDetail.vue index 6528ef5..ad20cbe 100644 --- a/src/views/survey/SurveyDetail.vue +++ b/src/views/survey/SurveyDetail.vue @@ -1,17 +1,15 @@