diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue index 754e9f9..57dabf0 100644 --- a/src/views/faceteach/FaceTeach.vue +++ b/src/views/faceteach/FaceTeach.vue @@ -29,23 +29,43 @@
{{ data.planDto?.address }}
- - 评估 - - {{ data.isSurvery ? "已评估" : "评估" }} - +
+ 签到 + + {{ data.signFlag ? "已签到" : "签到" }} + + + 评估 + + {{ data.isSurvery ? "已评估" : "评估" }} + +
@@ -218,7 +238,7 @@ const returnclick = () => { router.back(); }; const { - query: { courseId, type }, + query: { courseId, type, id: taskId }, } = useRoute(); const { data } = useRequest(STU_OFFCOURSE_DETAIL, { courseId }); @@ -230,26 +250,103 @@ const { avatar: userAvatar } = useUserInfo( const state = reactive({ activeName: "first", enclosure: "", + isAllowSign: false, }); -const { activeName, enclosure } = toRefs(state); +const { activeName, enclosure, isAllowSign } = toRefs(state); const handleClick = (tab, event) => { console.log(tab, event); }; const download = (url) => { window.open(url); }; +let timer = null; +//判断能否签到 +function isSignClick() { + timer = setInterval(() => { + if (data.value.planDto.beforeStart && data.value.planDto.afterStart) { + //有开始前有开始后 + let beginTime = + new Date(data.value.planDto.beginTime).getTime() - + data.value.planDto.beforeStart * 60 * 1000; + let endTime = + new Date(data.value.planDto.beginTime).getTime() + + data.value.planDto.afterStart * 60 * 1000; + let nowTime = new Date().getTime(); + if (nowTime < endTime && nowTime > beginTime) { + state.isAllowSign = true; + } else { + state.isAllowSign = false; + } + } else if ( + !data.value.planDto.beforeStart && + !data.value.planDto.afterStart + ) { + //开始前开始后都没有 + state.isAllowSign = true; + } else if ( + data.value.planDto.beforeStart && + !data.value.planDto.afterStart + ) { + //只有开始前无开始后 + let beginTime = + new Date(data.value.planDto.beginTime).getTime() - + data.value.planDto.beforeStart * 60 * 1000; + let nowTime = new Date().getTime(); + if (nowTime > beginTime) { + state.isAllowSign = true; + } else { + state.isAllowSign = false; + } + } else if ( + !data.value.planDto.beforeStart && + data.value.planDto.afterStart + ) { + //无开始前有开始后 + let endTime = + new Date(data.value.planDto.beginTime).getTime() + + data.value.planDto.afterStart * 60 * 1000; + let nowTime = new Date().getTime(); + if (nowTime < endTime) { + state.isAllowSign = true; + } else { + state.isAllowSign = false; + } + } + console.log("isAllowSign", state.isAllowSign); + }, 1000); +} +isSignClick(); + +//签到 +const signClick = () => { + if (data.value.signFlag) { + return; + } + console.log("data.signFlag", data.value.signFlag); + if (!isAllowSign) { + ElMessage.info("未在签到范围内"); + return; + } + data.value.signFlag = 1; + ElMessage.info("签到成功"); + request(TASK_BROADCAST_SIGN, { courseId: courseId, taskId, type }); +}; function toSurvery() { if (data.value.isSurvery) { return; } if (data.value.planDto.evalFlag == 0) { - alert("此课程无评估"); + ElMessage.info("此课程无评估"); return; } router.push({ path: "/surveydetail", - query: { courseId: data.value.planDto.evaluateId }, + query: { + courseId: data.value.planDto.evaluateId, + pName: "面授课", + sName: data.value.planDto.name, + }, }); } @@ -260,6 +357,8 @@ function toWork() { courseId: data.value.workDto.workId, id: data.value.offcourseDto.categoryId, type, + pName: "面授课", + sName: data.value.planDto.name, }, }); } diff --git a/src/views/homework/HomeworkPage.vue b/src/views/homework/HomeworkPage.vue index 30f5346..5498453 100644 --- a/src/views/homework/HomeworkPage.vue +++ b/src/views/homework/HomeworkPage.vue @@ -28,7 +28,7 @@
- 【作业】管理者进阶腾飞班 - 中级管理者作业 + 【作业】 {{ data?.workName }}
@@ -285,6 +285,7 @@ const { } = useRoute(); const { data } = useRequest(TASK_WORK_DETAIL, { workId, taskId }); +console.log("data", data); const { data: submitList } = useRequest(TASK_WORK_SUBMIT_LIST, { workerId: workId, }); diff --git a/src/views/liveBroadcast/LiveBroadcast.vue b/src/views/liveBroadcast/LiveBroadcast.vue index e1ac682..eec3833 100644 --- a/src/views/liveBroadcast/LiveBroadcast.vue +++ b/src/views/liveBroadcast/LiveBroadcast.vue @@ -220,13 +220,17 @@ const commitClick = () => { return; } if (data.value.isEvaluate == 0) { - alert("此直播无评估"); + ElMessage.info("此直播无评估"); return; } router.push({ path: "/surveydetail", - query: { courseId: data.value.assessmentId }, + query: { + courseId: data.value.assessmentId, + pName: "直播", + sName: data.value.liveName, + }, }); }; diff --git a/src/views/survey/SurveyDetail.vue b/src/views/survey/SurveyDetail.vue index 770f6c4..4a84ae3 100644 --- a/src/views/survey/SurveyDetail.vue +++ b/src/views/survey/SurveyDetail.vue @@ -2,16 +2,16 @@
{{ pName }}
/
{{ sName }}
/
-
调研详情
+
评估详情
-
-
- -
返回
+
+ +
返回
-
【调研】管理者进阶腾飞班 - 培训阶段性调研
+
【评估】管理者进阶腾飞班 - 培训阶段性调研
{{ value.assessmentScTitle }}
完全没用
{ - if(data.isSubmit){ - return + if (data.isSubmit) { + return; } value.selectAnswer = item; } @@ -88,21 +89,29 @@
-
{{ data.assessmentSingleChoiceDtoList[0]?.singleStemName }}
+
+ {{ data.assessmentSingleChoiceDtoList[0]?.singleStemName }} +
{{ value.singleOptionName }}
-
{{ data.assessmentMultipleChoiceDtoList[0]?.multipleStemName }}
+
+ {{ data.assessmentMultipleChoiceDtoList[0]?.multipleStemName }} +
{ + if (data.isSubmit) { + return; } - value.select = !value.select - }" + value.select = !value.select; + } + " >
{{ value.multipleOptionName }}
{{ item.assessmentQaTitle }}
{{ item.content?.length || 0 }}/200
-
-
提交
+
+
+ 提交 +
@@ -178,28 +207,33 @@