From f5eddf623618bc828a772c15dd1d8923e7e34cf1 Mon Sep 17 00:00:00 2001 From: wyx Date: Wed, 1 Feb 2023 21:44:32 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E6=8A=95=E7=A5=A8?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=8F=90=E4=BA=A4=E6=9F=A5=E8=AF=A2=E5=8F=8A?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/api.js | 9 +- src/views/ballot/BallotPage.vue | 129 ++++-- src/views/project/ProjectDetails.vue | 18 + src/views/roadmap/PathDetails.vue | 21 +- src/views/testscore/OuterChain.vue | 598 +++++++++++++++++++++++++++ vite.config.js | 3 + 6 files changed, 742 insertions(+), 36 deletions(-) create mode 100644 src/views/testscore/OuterChain.vue diff --git a/src/api/api.js b/src/api/api.js index 7e8fccb..22567cb 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -47,9 +47,9 @@ export const DISCUSS_SUBMIT_REVIEW_LIST = '/discussSubmit/queryDiscussSubmitAndR export const COMMENT_LIST = '/comment/list' -export const VOTE_DETAIL2 = voteId => `/vote/queryVoteAndVoteStemDetailByVoteId?voteId=${voteId} post` +export const VOTE_DETAIL2 = `/voteSubmit/queryVoteTaskDetailById post` // 投票详情接口 -export const VOTE_DETAIL_SUBMIT = `/voteSubmit/queryVoteSubmitDetailListByTaskId post` +export const VOTE_DETAIL_SUBMIT = `/voteSubmit/vote/commit post` export const COMMENT_ADD = '/comment post' export const COMMENT_PRAISE = '/comment/praise post' @@ -67,4 +67,7 @@ export const PROJECT_LIST = '/stu/project/list post' export const FACETEACH_SIGNUP = `/stu/project/stuFaceTeachSignUp` // 外部考试详情接口 -export const EXTERNALEXAM = `/external/exam/queryExternalExam` \ No newline at end of file +export const EXTERNALEXAM = `/external/exam/queryExternalExam` + +// 外链详情接口 +export const LINKGETONE = `/link/getOne` \ No newline at end of file diff --git a/src/views/ballot/BallotPage.vue b/src/views/ballot/BallotPage.vue index 3a3266a..51e92bf 100644 --- a/src/views/ballot/BallotPage.vue +++ b/src/views/ballot/BallotPage.vue @@ -22,7 +22,7 @@ -
【投票】{{ dataInfo?.voteName }}
+
【投票】{{ state.dataInfo?.voteName }}
@@ -41,8 +41,8 @@
{{ - dataInfo.numberOfInvolved || dataInfo.numberOfInvolved == 0 - ? dataInfo.numberOfInvolved + state.dataInfo.numberOfInvolved || state.dataInfo.numberOfInvolved == 0 + ? state.dataInfo.numberOfInvolved : "-" }}
@@ -51,8 +51,8 @@
{{ - dataInfo.votesTotal || dataInfo.votesTotal == 0 - ? dataInfo.votesTotal + state.dataInfo.votesTotal || state.dataInfo.votesTotal == 0 + ? state.dataInfo.votesTotal : "-" }}
@@ -61,8 +61,8 @@
{{ - dataInfo.numberOfBrowse || dataInfo.numberOfBrowse == 0 - ? dataInfo.numberOfBrowse + state.dataInfo.numberOfBrowse || state.dataInfo.numberOfBrowse == 0 + ? state.dataInfo.numberOfBrowse : "-" }}
@@ -81,7 +81,7 @@
@@ -102,7 +102,7 @@ :src="value.optionPictureAddress" /> -->
-
- +
@@ -135,9 +139,9 @@
{{ - dataInfo?.voteStartTime + state.dataInfo?.voteStartTime }}    至    {{ - dataInfo?.voteEndTime + state.dataInfo?.voteEndTime }}
@@ -145,11 +149,11 @@ 距离结束还有   {{ parseInt( - dayjs(dataInfo?.voteEndTime).diff(dayjs(), "minute") / 60 + dayjs(state.dataInfo?.voteEndTime).diff(dayjs(), "minute") / 60 ) }}   小时  {{ - dayjs(dataInfo?.voteEndTime).diff(dayjs(), "minute") % 60 + dayjs(state.dataInfo?.voteEndTime).diff(dayjs(), "minute") % 60 }}  分钟
@@ -168,7 +172,7 @@
@@ -181,15 +185,16 @@ diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index 7a33414..412c360 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -526,6 +526,23 @@ function toFinish(d, sName, chapterOrStageId) { stageOrChapterId: chapterOrStageId, taskId: d.projectTaskId, }); + // 此处判断外链跳转详情界面 + if(d.type==7){ + router.push({ + path: '/outerchain', + query: { + id: d.projectTaskId, + type: PROJECT, + infoId: data.value.projectId, + courseId: d.courseId, + pName: data.value.name, + sName, + chapterOrStageId, + exname: d.name, // 外链名称 + }, + }); + return + } } if (typeof types.value.path[d.type] === "string") { @@ -544,6 +561,7 @@ function toFinish(d, sName, chapterOrStageId) { pName: data.value.name, sName, chapterOrStageId, + btype: 1 }, }); } else if (typeof types.value.path[d.type] === "function") { diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index 88ca468..1364cee 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -467,6 +467,24 @@ function toFinish(d) { stageOrChapterId: data.value.currentStageId, taskId: d.routerTaskId, }); + + // 此处判断外链跳转详情界面 + if(d.type==7){ + router.push({ + path: '/outerchain', + query: { + id: d.routerTaskId, + type: ROUTER, + infoId: routerId, + courseId: d.courseId, + pName: data.value.name, + sName: data.value.currentStageName, + chapterOrStageId: data.value.currentStageId, + exname: d.name, // 外链名称 + }, + }); + return + } } if (typeof types.value.path[d.type] === "string") { types.value.path[d.type] && @@ -483,7 +501,8 @@ function toFinish(d) { courseId: d.courseId, pName: data.value.name, sName: data.value.currentStageName, - chapterOrStageId: data.value.currentStageId + chapterOrStageId: data.value.currentStageId, + btype: 2 }, }); } else if (typeof types.value.path[d.type] === "function") { diff --git a/src/views/testscore/OuterChain.vue b/src/views/testscore/OuterChain.vue new file mode 100644 index 0000000..250a401 --- /dev/null +++ b/src/views/testscore/OuterChain.vue @@ -0,0 +1,598 @@ + + + + + + + + \ No newline at end of file diff --git a/vite.config.js b/vite.config.js index e374744..9a1f270 100644 --- a/vite.config.js +++ b/vite.config.js @@ -99,6 +99,9 @@ export default defineConfig(({ command, mode }) => },'/external/exam/queryExternalExam': { target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, changeOrigin: true, + },'/link/getOne': { + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, + changeOrigin: true, }, } }