diff --git a/src/api/api.js b/src/api/api.js index 15ef42d..c54171d 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/discussdetail/DiscussDetail.vue b/src/views/discussdetail/DiscussDetail.vue index 0a33e5c..e687a7f 100644 --- a/src/views/discussdetail/DiscussDetail.vue +++ b/src/views/discussdetail/DiscussDetail.vue @@ -118,7 +118,7 @@
@@ -143,7 +143,7 @@
- +
{{ row.createName }}
{{row.studentJobName}}
@@ -156,7 +156,7 @@
- +
{{ row.ctime }}
@@ -184,16 +184,16 @@
- +
{{ replay.studentName }}
回复
- +
{{ replay.targetStudentName }}
{{ replay.createTime }}
- +
@@ -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); const getFocus = () => { refInput.value.focus() } diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue index 99c1756..453b612 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() { diff --git a/src/views/faceteach/FaceTeachSignUp.vue b/src/views/faceteach/FaceTeachSignUp.vue index be8a150..6e4e824 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,7 +38,24 @@
{{ data.planDto?.address }}
- {{data.isSignUp?'已报名':'立即报名'}} + + {{ + data.isRefused ? '审核拒绝' : data.isSignUp? '已报名' :'立即报名' + }} + + + 重新报名 +
@@ -364,8 +380,22 @@ const download = (url) => { const downloads = (url) => { ElMessage.warning("未在有效时间范围内,请耐心等待!"); }; -let timer = null; +//判断能否报名 (TODO-大于面授课截止时间就不能报名了,其余均可以) +function isSignClick() { + let endTime = new Date(data.value.planDto?.endTime).getTime() + let nowTime = new Date().getTime(); + if (nowTime < endTime) { + state.isAllowSign = true; + } else { + state.isAllowSign = false; + } + console.log(state.isAllowSign) +} + +watch(data,()=>{ + isSignClick(); +}) // 查看更多-展开回复列表 function lookMore(i) { @@ -541,8 +571,13 @@ function submitReplayComment() { } // 报名 -function onLineSignUp() { - if(data.value.isSignUp){ +function onLineSignUp(isAgain) { + if (!state.isAllowSign) { + // console.log("data.signFlag", data.value.signFlag, isAllowSign); + ElMessage.warning("未在允许报名时间范围内"); + return; + } + if(data.value.isSignUp && !isAgain){ return; } request(FACETEACH_SIGNUP, {courseId}) diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index ccc5121..b098e3e 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -229,7 +229,7 @@ - +
@@ -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('') 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) }}%
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 : "暂无考试说明" }}