From 8828f668f86bd7b6c92bc2b55749c813ab4a1a1f Mon Sep 17 00:00:00 2001 From: lixg Date: Thu, 15 Dec 2022 13:02:00 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E5=A4=96=E9=83=A8?= =?UTF-8?q?=E5=86=85=E9=83=A8=E6=B5=8B=E8=AF=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 1 + .env.boe | 1 + .env.prod | 1 + .env.release | 1 + src/views/project/ProjectDetails.vue | 23 +++++++++++++++++++---- src/views/roadmap/PathDetails.vue | 19 +++++++++++++++++-- 6 files changed, 40 insertions(+), 6 deletions(-) diff --git a/.env b/.env index 9815dca..3d1584a 100644 --- a/.env +++ b/.env @@ -7,6 +7,7 @@ VITE_PROXY_URL=http://111.231.196.214:30001 VITE_BOE_ONLINE_CLASS_URL=https://u-pre.boe.com/pc/course/studyindex?id= VITE_BOE_CASS_DETAIL_URL=https://u-pre.boe.com/pc/case/detail?id= VITE_BOE_TEST_DETAIL_URL=https://u-pre.boe.com/web/quizsummary?detailId= +VITE_BOE_TEST_OUT_DETAIL_URL=https://u-pre.boe.com/api/b1/tale/do-quiz?quizKid= VITE_BOE_EXAM_DETAIL_URL=https://u-pre.boe.com/pc/exam/test?id= VITE_BOE_API_URL=https://u-pre.boe.com \ No newline at end of file diff --git a/.env.boe b/.env.boe index b594a9e..e483b78 100644 --- a/.env.boe +++ b/.env.boe @@ -4,6 +4,7 @@ VITE_BASE_API=/manageApi VITE_BOE_ONLINE_CLASS_URL=https://u-pre.boe.com/pc/course/studyindex?id= VITE_BOE_CASS_DETAIL_URL=https://u-pre.boe.com/pc/case/detail?id= VITE_BOE_TEST_DETAIL_URL=https://u-pre.boe.com/web/quizsummary?detailId= +VITE_BOE_TEST_OUT_DETAIL_URL=https://u-pre.boe.com/api/b1/tale/do-quiz?quizKid= VITE_BOE_EXAM_DETAIL_URL=https://u-pre.boe.com/pc/exam/test?id= VITE_BOE_API_URL=https://u-pre.boe.com \ No newline at end of file diff --git a/.env.prod b/.env.prod index a783afa..0990012 100644 --- a/.env.prod +++ b/.env.prod @@ -4,6 +4,7 @@ VITE_BASE_API=/manageApi-release VITE_BOE_ONLINE_CLASS_URL=https://u.boe.com/pc-release/course/studyindex?id= VITE_BOE_CASS_DETAIL_URL=https://u.boe.com/pc-release/case/detail?id= VITE_BOE_TEST_DETAIL_URL=https://u.boe.com/web/quizsummary?detailId= +VITE_BOE_TEST_OUT_DETAIL_URL=https://u.boe.com/api/b1/tale/do-quiz?quizKid= VITE_BOE_EXAM_DETAIL_URL=https://u.boe.com/pc-release/exam/test?id= VITE_BOE_API_URL=https://u.boe.com \ No newline at end of file diff --git a/.env.release b/.env.release index 4d980c9..0c818ad 100644 --- a/.env.release +++ b/.env.release @@ -5,6 +5,7 @@ VITE_BASE_LOGIN_URL=https://u.boe.com/web/ VITE_BOE_ONLINE_CLASS_URL=https://u.boe.com/pc-release/course/studyindex?id= VITE_BOE_CASS_DETAIL_URL=https://u.boe.com/pc-release/case/detail?id= VITE_BOE_TEST_DETAIL_URL=https://u.boe.com/web/quizsummary?detailId= +VITE_BOE_TEST_OUT_DETAIL_URL=https://u.boe.com/api/b1/tale/do-quiz?quizKid= VITE_BOE_EXAM_DETAIL_URL=https://u.boe.com/pc-release/exam/test?id= VITE_BOE_API_URL=https://u.boe.com \ No newline at end of file diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index c7ca160..49dad8e 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -311,10 +311,11 @@ import { PROJECT_PROCESS, ROUTER_PROCESS, LINK_DETAILS } from "@/api/api"; import { useRoute, useRouter } from "vue-router"; const { - query: { projectId }, + query: { courseId }, } = useRoute(); const router = useRouter(); -const { data } = useRequest(PROJECT_PROCESS, { projectId }); +const { data } = useRequest(PROJECT_PROCESS, { projectId: courseId }); +console.log("data", data); const state = reactive({ course: [ { @@ -544,7 +545,10 @@ const types = ref({ 7: " ", 8: "/discusspage", 9: "/moreactive", - 10: import.meta.env.VITE_BOE_TEST_DETAIL_URL, //测评 + 10: [ + import.meta.env.VITE_BOE_TEST_DETAIL_URL, + import.meta.env.VITE_BOE_TEST_OUT_DETAIL_URL, + ], //测评 11: "/surveydetail", 12: "/ballotpage", 13: "去完成", @@ -556,10 +560,21 @@ function toFinish(d) { ElMessage.error("暂时未开放"); return; } + if (d.type == 10) { + let url = ""; + if (d.evaTyp == 1) { + url = types.value.path[d.type][1] + d.targetId; + } else { + url = types.value.path[d.type][0] + d.targetId; + } + import.meta.env.DEV + ? (window.location.href = url) + : (window.parent.location.href = url); + return; + } if (types.value.path[d.type] && types.value.path[d.type].startsWith("http")) { //配置文件 const url = types.value.path[d.type] + d.targetId; - console.log("url", d, url); import.meta.env.DEV ? (window.location.href = url) : (window.parent.location.href = url); diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index 8de04c9..9caa4fa 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -591,10 +591,13 @@ const types = ref({ 7: " ", 8: "/discusspage", 9: "/moreactive", - 10: import.meta.env.VITE_BOE_TEST_DETAIL_URL, //测评 + 10: [ + import.meta.env.VITE_BOE_TEST_DETAIL_URL, + import.meta.env.VITE_BOE_TEST_OUT_DETAIL_URL, + ], //测评 11: "/surveydetail", 12: "/ballotpage", - 13: "去完成", + 13: "/projectdetails", }, }); @@ -604,6 +607,18 @@ function toFinish(d) { ElMessage.error("暂时未开放"); return; } + if (d.type == 10) { + let url = ""; + if (d.evaTyp == 1) { + url = types.value.path[d.type][1] + d.targetId; + } else { + url = types.value.path[d.type][0] + d.targetId; + } + import.meta.env.DEV + ? (window.location.href = url) + : (window.parent.location.href = url); + return; + } if (types.value.path[d.type] && types.value.path[d.type].startsWith("http")) { //配置文件 const url = types.value.path[d.type] + d.targetId;