From bdcf3ae1cccfdda0ab706b41666bea06bebcf7e6 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Mon, 30 Jan 2023 19:19:14 +0800 Subject: [PATCH 1/8] -- fix --- .env | 2 +- .../pathdetails/{组 21.png => pathDetailBack.png} | Bin .../pathdetails/{组 23.png => pathDetailImg.png} | Bin .../{组 23(1).png => pathDetailImgSelect.png} | Bin src/components/PathDetailImage.vue | 6 +++--- 5 files changed, 4 insertions(+), 4 deletions(-) rename src/assets/image/pathdetails/{组 21.png => pathDetailBack.png} (100%) rename src/assets/image/pathdetails/{组 23.png => pathDetailImg.png} (100%) rename src/assets/image/pathdetails/{组 23(1).png => pathDetailImgSelect.png} (100%) diff --git a/.env b/.env index 49ae16e..af2bfff 100644 --- a/.env +++ b/.env @@ -3,7 +3,7 @@ VITE_BASE_API= VITE_OUTPUT_DIR=./dist VITE_FILE_PATH=/upload/ VITE_BASE_LOGIN_URL=https://u-pre.boe.com/web/ -VITE_PROXY_URL=http://111.231.196.214/manageApi +VITE_PROXY_URL=http://43.143.139.204/manageApi VITE_BOE_ONLINE_CLASS_URL=https://u-pre.boe.com/pc/course/studyindex?id= diff --git a/src/assets/image/pathdetails/组 21.png b/src/assets/image/pathdetails/pathDetailBack.png similarity index 100% rename from src/assets/image/pathdetails/组 21.png rename to src/assets/image/pathdetails/pathDetailBack.png diff --git a/src/assets/image/pathdetails/组 23.png b/src/assets/image/pathdetails/pathDetailImg.png similarity index 100% rename from src/assets/image/pathdetails/组 23.png rename to src/assets/image/pathdetails/pathDetailImg.png diff --git a/src/assets/image/pathdetails/组 23(1).png b/src/assets/image/pathdetails/pathDetailImgSelect.png similarity index 100% rename from src/assets/image/pathdetails/组 23(1).png rename to src/assets/image/pathdetails/pathDetailImgSelect.png diff --git a/src/components/PathDetailImage.vue b/src/components/PathDetailImage.vue index ade60ba..1d5a391 100644 --- a/src/components/PathDetailImage.vue +++ b/src/components/PathDetailImage.vue @@ -13,9 +13,9 @@ From 8dffddef638f65c5ea8a9b7a3b05c73d0d89413d Mon Sep 17 00:00:00 2001 From: wyx Date: Wed, 1 Feb 2023 10:58:24 +0800 Subject: [PATCH 4/8] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=20=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=20=E5=85=B1=E4=BA=AB=E6=96=87=E6=A1=A3=20=E7=BB=A7?= =?UTF-8?q?=E7=BB=AD=E5=AD=A6=E4=B9=A0=20=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/project/ProjectDetails.vue | 87 ++++++++++++++++++---------- 1 file changed, 58 insertions(+), 29 deletions(-) diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index 1a71003..bb14029 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -133,30 +133,28 @@
{{ data.notice || "暂无公告" }}
- - - - - - - - - - - - - - - - - - - - - + +
+
+ + +
{{ value.name }}
+
+ +
下载
+
+
+
+ @@ -190,11 +188,12 @@
学习进度
- + +
+
上次学到：{{ data.lastLearned }}
+
继续学习
+
+
总进度
@@ -287,6 +286,7 @@ import { useRoute, useRouter } from "vue-router"; import store from "@/store"; import { ElMessage } from "element-plus"; import {PROJECT} from "@/api/CONST"; +import FileTypeImg from "@/components/FileTypeImg.vue"; const { query: { courseId, projectId }, @@ -547,6 +547,35 @@ const queryAllStatus = (data) => { } return true; } + +// 共享文档下载 +function downloadFile(url){ + window.open(url); +} + +// 继续学习 +function continueLearn(taskname, datas){ + console.log('我是当前的列表展示信息',data) + console.log(datas) + let jumpinfo + let stageName + let stageId + for(let i=0; i + + \ No newline at end of file diff --git a/vite.config.js b/vite.config.js index 57bd0e3..e374744 100644 --- a/vite.config.js +++ b/vite.config.js @@ -92,10 +92,13 @@ export default defineConfig(({ command, mode }) => changeOrigin: true, }, '/link': { target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, - changeOrigin: true, + changeOrigin: true, }, '/onlineClasses/queryOnlineClassesStudyDetail': { target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, changeOrigin: true, + },'/external/exam/queryExternalExam': { + target: loadEnv(mode, process.cwd()).VITE_PROXY_URL, + changeOrigin: true, }, } } From f5eddf623618bc828a772c15dd1d8923e7e34cf1 Mon Sep 17 00:00:00 2001 From: wyx Date: Wed, 1 Feb 2023 21:44:32 +0800 Subject: [PATCH 6/8] =?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, }, } } From 9d1c1221acb5054955fb45461cfd94c3c2310462 Mon Sep 17 00:00:00 2001 From: wyx Date: Thu, 2 Feb 2023 15:41:10 +0800 Subject: [PATCH 7/8] =?UTF-8?q?style:=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=AD=A6=E4=B9=A0=E8=BF=9B=E5=BA=A6=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=EF=BC=8C=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE=E8=B5=B7?= =?UTF-8?q?=E6=AD=A2=E6=97=B6=E9=97=B4=EF=BC=9B=E5=A2=9E=E5=8A=A0=E8=AE=A8?= =?UTF-8?q?=E8=AE=BA=E6=A8=A1=E5=9D=97=E9=83=A8=E5=88=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=8F=8A=E6=A0=B7=E5=BC=8F=E6=8E=A5=E5=85=A5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/api.js | 6 +- src/views/discuss/DiscussPage.vue | 245 ++++++++++++++++++++-- src/views/discussdetail/DiscussDetail.vue | 7 +- src/views/project/ProjectManage.vue | 78 +++++-- 4 files changed, 299 insertions(+), 37 deletions(-) diff --git a/src/api/api.js b/src/api/api.js index 22567cb..4d3dc12 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -70,4 +70,8 @@ export const FACETEACH_SIGNUP = `/stu/project/stuFaceTeachSignUp` export const EXTERNALEXAM = `/external/exam/queryExternalExam` // 外链详情接口 -export const LINKGETONE = `/link/getOne` \ No newline at end of file +export const LINKGETONE = `/link/getOne` + +// 讨论模块 +// -- 根据讨论的Id查询讨论发表的帖子 +export const QueryDiscussSubmitDetailByDiscussId = '/discussSubmit/queryDiscussSubmitDetailByDiscussId post' \ No newline at end of file diff --git a/src/views/discuss/DiscussPage.vue b/src/views/discuss/DiscussPage.vue index 2fc5763..6c173b8 100644 --- a/src/views/discuss/DiscussPage.vue +++ b/src/views/discuss/DiscussPage.vue @@ -36,48 +36,47 @@
-
{{ info.name }}
+
【讨论】{{ state.info.discussDtoList[0].discussName }}
- {{ info.name }} + {{ state.info.discussDtoList[0].discussName }}
- +
-
{{ info.sName }}
+
{{ state.info.discussDtoList[0].discussName }}
进行中
-
-
{{ d.discussName }}
-
- {{ d.discussExplain }} +
{{ d.discussSubmitTitle }}
+
+ {{ d.discussSubmitContent }}
-
{{ d.commentNum || 0 }}
+
{{ d.discussReviewCount || 0 }}
-
{{ d.praiseNum || 0 }}
+
{{ d.discussLikeCount || 0 }}
-
{{ d.collectionNum || 0 }}
+
{{ d.discussCollectionCount || 0 }}
+
+ + +
@@ -110,7 +121,12 @@