From 700058f48c752e4d2edc1ec68655578c6c255bf9 Mon Sep 17 00:00:00 2001 From: caozc Date: Mon, 6 Mar 2023 02:13:35 +0800 Subject: [PATCH 01/11] =?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 b4e78be565912ac7024a2c91b257c6d278288eb9 Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Mon, 6 Mar 2023 14:38:16 +0800 Subject: [PATCH 02/11] =?UTF-8?q?fix:=E8=AE=A8=E8=AE=BA=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 1 + src/views/discussdetail/DiscussDetail.vue | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.env b/.env index 0899c85..f03f2ff 100644 --- a/.env +++ b/.env @@ -3,6 +3,7 @@ VITE_BASE_H5=/fe-student-h5 VITE_BASE_API= VITE_OUTPUT_DIR=./dist VITE_FILE_PATH=/upload/ +VITE_FILE_PATH_AVATAR=/upload VITE_BASE_LOGIN_URL=//u-pre.boe.com/web/ VITE_PROXY_URL=http://43.143.139.204/manageApi diff --git a/src/views/discussdetail/DiscussDetail.vue b/src/views/discussdetail/DiscussDetail.vue index 0a33e5c..166971c 100644 --- a/src/views/discussdetail/DiscussDetail.vue +++ b/src/views/discussdetail/DiscussDetail.vue @@ -118,7 +118,7 @@
@@ -156,7 +156,7 @@
- +
{{ row.ctime }}
@@ -193,7 +193,7 @@
- +
@@ -263,7 +263,7 @@
@@ -324,6 +324,7 @@ import UploadPostImg from "@/components/img/UploadPostImg.vue"; const router = useRouter(); const refInput =ref() +const fielPath = ref(import.meta.env.VITE_FILE_PATH_AVATAR); const getFocus = () => { refInput.value.focus() } From d161145e5318b8506eb50e7b8829bf468916abb0 Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Mon, 6 Mar 2023 15:35:24 +0800 Subject: [PATCH 03/11] =?UTF-8?q?fix:=E8=AE=A8=E8=AE=BA=E5=9B=9E=E5=A4=8D?= =?UTF-8?q?=E5=A4=B4=E5=83=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 1 - src/views/discussdetail/DiscussDetail.vue | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.env b/.env index f03f2ff..0899c85 100644 --- a/.env +++ b/.env @@ -3,7 +3,6 @@ VITE_BASE_H5=/fe-student-h5 VITE_BASE_API= VITE_OUTPUT_DIR=./dist VITE_FILE_PATH=/upload/ -VITE_FILE_PATH_AVATAR=/upload VITE_BASE_LOGIN_URL=//u-pre.boe.com/web/ VITE_PROXY_URL=http://43.143.139.204/manageApi diff --git a/src/views/discussdetail/DiscussDetail.vue b/src/views/discussdetail/DiscussDetail.vue index 166971c..e687a7f 100644 --- a/src/views/discussdetail/DiscussDetail.vue +++ b/src/views/discussdetail/DiscussDetail.vue @@ -143,7 +143,7 @@
- +
{{ row.createName }}
{{row.studentJobName}}
@@ -184,10 +184,10 @@
- +
{{ replay.studentName }}
回复
- +
{{ replay.targetStudentName }}
{{ replay.createTime }}
@@ -324,7 +324,7 @@ import UploadPostImg from "@/components/img/UploadPostImg.vue"; const router = useRouter(); const refInput =ref() -const fielPath = ref(import.meta.env.VITE_FILE_PATH_AVATAR); +const fielPath = ref(import.meta.env.VITE_FILE_PATH); const getFocus = () => { refInput.value.focus() } 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 04/11] =?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 05/11] =?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 06/11] =?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 07/11] =?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 08/11] =?UTF-8?q?fix:=20=E6=8A=A5=E5=90=8D=E7=8A=B6?= =?UTF-8?q?=E6=80=81=EF=BC=9A=E5=A2=9E=E5=BC=BA=E9=87=8D=E5=A4=8D=E6=8A=A5?= =?UTF-8?q?=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) From d01fef96a53c0a0dcaded9c250b6b264e761d409 Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Tue, 7 Mar 2023 15:21:39 +0800 Subject: [PATCH 09/11] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E9=9D=A2=E6=8E=88?= =?UTF-8?q?=E8=AF=BE=E6=8A=A5=E5=90=8D=E9=A1=B5=E9=9D=A2=E6=8A=A5=E5=90=8D?= =?UTF-8?q?=E9=99=90=E5=88=B6=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=BC=80=E8=AF=BE?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/faceteach/FaceTeachSignUp.vue | 72 +++++++++++++++++++++++-- 1 file changed, 67 insertions(+), 5 deletions(-) diff --git a/src/views/faceteach/FaceTeachSignUp.vue b/src/views/faceteach/FaceTeachSignUp.vue index 17de29a..1c3d9ba 100644 --- a/src/views/faceteach/FaceTeachSignUp.vue +++ b/src/views/faceteach/FaceTeachSignUp.vue @@ -29,8 +29,7 @@
{{ - dayjs(data.planDto?.beginTime).format('YYYY-MM-DD HH:MM') + " 至 " + - dayjs(data.planDto?.endTime).format('YYYY-MM-DD HH:MM') + data.planDto?.beginTime + " 至 " + data.planDto?.endTime }}
@@ -39,12 +38,22 @@
{{ data.planDto?.address }}
- + {{ data.isRefused ? '审核拒绝' : data.isSignUp? '已报名' :'立即报名' }} - + 重新报名
@@ -371,8 +380,56 @@ const download = (url) => { const downloads = (url) => { ElMessage.warning("未在有效时间范围内，请耐心等待！"); }; -let timer = null; +//判断能否报名 +function isSignClick() { + let beginTime = new Date(data.value.planDto?.beginTime).getTime(); + let endTime = + !data.value.planDto?.afterStart || data.value.afterStart == "0" + ? new Date(data.value.planDto?.endTime).getTime() + : new Date(data.value.planDto?.beginTime).getTime(); + let nowTime = new Date().getTime(); + if ( + data.value.planDto?.beforeStart && + data.value.planDto?.afterStart && + data.value.beforeStart !== "0" && + data.value.afterStart !== "0" + ) { + //有开始前有开始后 + beginTime = beginTime - data.value.planDto?.beforeStart * 60 * 1000; + endTime = endTime + data.value.planDto?.afterStart * 60 * 1000; + console.log("1111"); + } else if ( + data.value.planDto?.beforeStart && + !data.value.planDto?.afterStart && + data.value.beforeStart !== "0" && + data.value.afterStart == "0" + ) { + //只有开始前无开始后 + beginTime = beginTime - data.value.planDto?.beforeStart * 60 * 1000; + console.log("11112222"); + } else if ( + !data.value.planDto?.beforeStart && + data.value.planDto?.afterStart && + data.value.beforeStart == "0" && + data.value.afterStart !== "0" + ) { + //无开始前有开始后 + endTime = endTime + data.value.planDto?.afterStart * 60 * 1000; + console.log("1111333"); + } + if (nowTime < endTime && nowTime > beginTime) { + state.isAllowSign = true; + } else { + state.isAllowSign = false; + } + console.log(state.isAllowSign) +} + + +watch(data,()=>{ + isSignClick(); +}) // 查看更多-展开回复列表 function lookMore(i) { @@ -549,6 +606,11 @@ function submitReplayComment() { // 报名 function onLineSignUp(isAgain) { + if (!state.isAllowSign) { + // console.log("data.signFlag", data.value.signFlag, isAllowSign); + ElMessage.warning("未在允许报名时间范围内"); + return; + } if(data.value.isSignUp && !isAgain){ return; } From b7d9bdb99f6e6dfbde7a3575c87065ebfcf9750a Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Tue, 7 Mar 2023 15:33:13 +0800 Subject: [PATCH 10/11] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E9=9D=A2=E6=8E=88?= =?UTF-8?q?=E8=AF=BE=E6=8A=A5=E5=90=8D=E9=A1=B5=E9=9D=A2=E6=8A=A5=E5=90=8D?= =?UTF-8?q?=E9=99=90=E5=88=B6=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=BC=80=E8=AF=BE?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/faceteach/FaceTeachSignUp.vue | 40 ++----------------------- 1 file changed, 3 insertions(+), 37 deletions(-) diff --git a/src/views/faceteach/FaceTeachSignUp.vue b/src/views/faceteach/FaceTeachSignUp.vue index 1c3d9ba..6e4e824 100644 --- a/src/views/faceteach/FaceTeachSignUp.vue +++ b/src/views/faceteach/FaceTeachSignUp.vue @@ -381,44 +381,11 @@ const downloads = (url) => { ElMessage.warning("未在有效时间范围内，请耐心等待！"); }; -//判断能否报名 +//判断能否报名 (TODO-大于面授课截止时间就不能报名了，其余均可以) function isSignClick() { - let beginTime = new Date(data.value.planDto?.beginTime).getTime(); - let endTime = - !data.value.planDto?.afterStart || data.value.afterStart == "0" - ? new Date(data.value.planDto?.endTime).getTime() - : new Date(data.value.planDto?.beginTime).getTime(); + let endTime = new Date(data.value.planDto?.endTime).getTime() let nowTime = new Date().getTime(); - if ( - data.value.planDto?.beforeStart && - data.value.planDto?.afterStart && - data.value.beforeStart !== "0" && - data.value.afterStart !== "0" - ) { - //有开始前有开始后 - beginTime = beginTime - data.value.planDto?.beforeStart * 60 * 1000; - endTime = endTime + data.value.planDto?.afterStart * 60 * 1000; - console.log("1111"); - } else if ( - data.value.planDto?.beforeStart && - !data.value.planDto?.afterStart && - data.value.beforeStart !== "0" && - data.value.afterStart == "0" - ) { - //只有开始前无开始后 - beginTime = beginTime - data.value.planDto?.beforeStart * 60 * 1000; - console.log("11112222"); - } else if ( - !data.value.planDto?.beforeStart && - data.value.planDto?.afterStart && - data.value.beforeStart == "0" && - data.value.afterStart !== "0" - ) { - //无开始前有开始后 - endTime = endTime + data.value.planDto?.afterStart * 60 * 1000; - console.log("1111333"); - } - if (nowTime < endTime && nowTime > beginTime) { + if (nowTime < endTime) { state.isAllowSign = true; } else { state.isAllowSign = false; @@ -426,7 +393,6 @@ function isSignClick() { console.log(state.isAllowSign) } - watch(data,()=>{ isSignClick(); }) From 43042f1b0c265168618a0f1cc269511a63b4edad Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Tue, 7 Mar 2023 20:11:54 +0800 Subject: [PATCH 11/11] =?UTF-8?q?fix:=E9=BB=98=E8=AE=A4=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=BA=94=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/project/ProjectDetails.vue | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index d3ef708..b098e3e 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -267,7 +267,7 @@
-
@@ -290,7 +290,7 @@
-
@@ -306,7 +306,7 @@
-
@@ -407,7 +407,6 @@ const tabChange = (tabs) => { myIndex.value = res.data.myIndex myPoint.value = res.data.myPointsCount }) - tableRankData.value = 12 } const myIndex = ref('') const myPoint = ref('')