From 700058f48c752e4d2edc1ec68655578c6c255bf9 Mon Sep 17 00:00:00 2001 From: caozc Date: Mon, 6 Mar 2023 02:13:35 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix:taskId=E6=9C=AA=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/faceteach/FaceTeach.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue index 4546cf6..1d8eba8 100644 --- a/src/views/faceteach/FaceTeach.vue +++ b/src/views/faceteach/FaceTeach.vue @@ -445,8 +445,12 @@ const signClick = () => { data.value.signFlag = 1; ElMessage.warning("签到成功"); + let taskId = courseId + console.log("taskId:" + taskId) + console.log("courseId:" + courseId) + console.log("请求入参：" + JSON.stringify( { courseId: courseId,taskId: taskId,type:type })) - request(TASK_OFFCOURSE_NOTASK_SIGN, { courseId: courseId }); + request(TASK_OFFCOURSE_NOTASK_SIGN, { courseId: courseId,taskId: taskId,type:type }); }; function toSurvery() { From 724f22d6291d5df9184ad6ac9814b442b876c5ce Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Mon, 6 Mar 2023 17:00:31 +0800 Subject: [PATCH 2/6] =?UTF-8?q?fix:=E5=A4=96=E9=83=A8=E8=80=83=E8=AF=95?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/testscore/ExternalExamination.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/testscore/ExternalExamination.vue b/src/views/testscore/ExternalExamination.vue index a1b1561..3bbfee4 100644 --- a/src/views/testscore/ExternalExamination.vue +++ b/src/views/testscore/ExternalExamination.vue @@ -60,7 +60,7 @@
- {{ state.datainfo.externalExplain ? state.datainfo.externalExplain : "暂无考试说明" }} + {{ state.datainfo.examinationExplain ? state.datainfo.examinationExplain : "暂无考试说明" }}
From cf345d37da6e9ae03cc8e9dccca8188675218889 Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Mon, 6 Mar 2023 22:58:08 +0800 Subject: [PATCH 3/6] =?UTF-8?q?feat:=E9=9D=A2=E6=8E=88=E8=AF=BE=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=87=8D=E6=96=B0=E6=8A=A5=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/faceteach/FaceTeachSignUp.vue | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/views/faceteach/FaceTeachSignUp.vue b/src/views/faceteach/FaceTeachSignUp.vue index be8a150..d49f32c 100644 --- a/src/views/faceteach/FaceTeachSignUp.vue +++ b/src/views/faceteach/FaceTeachSignUp.vue @@ -39,7 +39,16 @@
{{ data.planDto?.address }}
- {{data.isSignUp?'已报名':'立即报名'}} + + {{ + data.isSignUp? + data.isRefused?'审核拒绝':'已报名' + :'立即报名' + }} + + + 重新报名 +
@@ -550,6 +559,12 @@ function onLineSignUp() { ElMessage.success("报名成功"); } +function onLineOnceSignUp() { + request(FACETEACH_SIGNUP, {courseId}) + data.value.isSignUp = true + ElMessage.success("报名成功"); +} + function formateArr(strs) { let arrs = strs.split(',') console.log('112233', arrs) From b70e9714aaf5e68a796900a6e6512e47c99dfb74 Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Mon, 6 Mar 2023 23:40:17 +0800 Subject: [PATCH 4/6] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E5=9B=BE=E5=BF=85=E4=BF=AE=E8=BF=9B=E5=BA=A6=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/roadmap/PathDetails.vue | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index ccf5713..bb4f469 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -219,7 +219,7 @@
-
+
{{ parseInt((data.currentReqCnt || 0) / (data.totalReqCnt || 1) * 100) }}%
From f4f45e58b617f80096b0924492cdc0623b78789a Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Tue, 7 Mar 2023 00:55:16 +0800 Subject: [PATCH 5/6] =?UTF-8?q?fix:=E9=A1=B9=E7=9B=AE=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=BA=A6=E5=B0=8F=E7=BB=84=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E5=BA=A6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/api.js | 2 +- src/views/project/ProjectDetails.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/api.js b/src/api/api.js index 5f5dc6c..e6d384f 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -88,7 +88,7 @@ export const QueryDiscussSubmitDetailByDiscussId = '/discussSubmit/queryDiscussS export const EvaluationToLearn = '/evaluation/evaluationToLearn post' // 个人/小组完成度排行 -export const CompletionList = `/stu/project/rank_list/completion_list` +export const CompletionList = `/stu/project/rank_list/project_rank_list` // 积分排行榜 export const PointList = `/stu/project/rank_list/point_list` diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index ccc5121..d3ef708 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -229,7 +229,7 @@ - +
From e3e352841d0142866cc7fbc4430653b258a430cb Mon Sep 17 00:00:00 2001 From: caozc Date: Tue, 7 Mar 2023 01:25:17 +0800 Subject: [PATCH 6/6] =?UTF-8?q?fix:=20=E6=8A=A5=E5=90=8D=E7=8A=B6=E6=80=81?= =?UTF-8?q?=EF=BC=9A=E5=A2=9E=E5=BC=BA=E9=87=8D=E5=A4=8D=E6=8A=A5=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/faceteach/FaceTeachSignUp.vue | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/src/views/faceteach/FaceTeachSignUp.vue b/src/views/faceteach/FaceTeachSignUp.vue index d49f32c..17de29a 100644 --- a/src/views/faceteach/FaceTeachSignUp.vue +++ b/src/views/faceteach/FaceTeachSignUp.vue @@ -39,14 +39,12 @@
{{ data.planDto?.address }}
- + {{ - data.isSignUp? - data.isRefused?'审核拒绝':'已报名' - :'立即报名' + data.isRefused ? '审核拒绝' : data.isSignUp? '已报名' :'立即报名' }} - + 重新报名
@@ -550,8 +548,8 @@ function submitReplayComment() { } // 报名 -function onLineSignUp() { - if(data.value.isSignUp){ +function onLineSignUp(isAgain) { + if(data.value.isSignUp && !isAgain){ return; } request(FACETEACH_SIGNUP, {courseId}) @@ -559,12 +557,6 @@ function onLineSignUp() { ElMessage.success("报名成功"); } -function onLineOnceSignUp() { - request(FACETEACH_SIGNUP, {courseId}) - data.value.isSignUp = true - ElMessage.success("报名成功"); -} - function formateArr(strs) { let arrs = strs.split(',') console.log('112233', arrs)