diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue index 91f4884..6f1aff7 100644 --- a/src/views/faceteach/FaceTeach.vue +++ b/src/views/faceteach/FaceTeach.vue @@ -34,19 +34,37 @@
{{ data.planDto?.address }}
-
- - {{ data.signFlag ? "已签到" : "签到" }} - - - {{ data.isSurvery ? "已评估" : "评估" }} - +
+
+ + {{ data.signFlag ? "已签到" : "签到" }} + + + {{ data.isSurvery ? "已评估" : "评估" }} + +
+
+
+
+ + {{ data.signFlag ? "已签到" : "签到" }} + + + {{ data.isSurvery ? "已评估" : "评估" }} + +
@@ -81,16 +99,18 @@
{{ el.slice(el.indexOf('-') + 1) }}
-
- -
- 下载 +
+
+ +
+ 下载 +
-
-
- -
- 下载 +
+ +
+ 下载 +
@@ -109,6 +129,7 @@
交作业 @@ -135,6 +156,7 @@
去考试 @@ -190,11 +212,12 @@ const returnclick = () => { router.back(); }; const { - query: { courseId, type, id: taskId }, + query: { courseId, type, id: taskId, projectStatus, projectEndTime }, } = useRoute(); const { data } = useRequest(STU_OFFCOURSE_DETAIL, { courseId }); console.log("datadatadatadatadatadatadata", data); +console.log("项目状态字段传递", projectStatus, projectEndTime); const teacherInfo = useUserInfo( computed(() => data.value?.planDto?.teacherId) ); diff --git a/src/views/homework/HomeworkPage.vue b/src/views/homework/HomeworkPage.vue index 6c6e7b1..2a94f2d 100644 --- a/src/views/homework/HomeworkPage.vue +++ b/src/views/homework/HomeworkPage.vue @@ -48,12 +48,27 @@
-
- - - +
+
+
+ + + +
+
+
+
+
+
+ + + +
+
- - -
-
- +
+
+
+
+ +
+
+ +
+
+ +
+
-
-
- +
+
+
+ +
+
+ +
+
+ +
+
- -
@@ -261,7 +293,7 @@ const returnclick = () => { router.back(); }; const { - query: { courseId: workId, type, id: taskId, pName, sName }, + query: { courseId: workId, type, id: taskId, pName, sName, projectStatus, projectEndTime}, } = useRoute(); const { data } = taskId && taskId !== 'undefined' ? useRequest(TASK_WORK_DETAIL, { workId, taskId }) : useRequest(TASK_WORK_DETAIL, { workId }); diff --git a/src/views/liveBroadcast/LiveBroadcast.vue b/src/views/liveBroadcast/LiveBroadcast.vue index 566984c..e571820 100644 --- a/src/views/liveBroadcast/LiveBroadcast.vue +++ b/src/views/liveBroadcast/LiveBroadcast.vue @@ -45,26 +45,59 @@
{{ data?.activityAddress }}
-->
-
- 观看 - +
+
+ 观看 + - {{ data.signFlag ? "已签到" : "签到" }} - - + {{ data.signFlag ? "已签到" : "签到" }} + + - {{ data.isSurvery ? "已评估" : - "评估" -}} - + {{ data.isSurvery ? "已评估" : + "评估" + }} + +
+
+ {{ data.isSurvery ? "已评估" : + "评估" + }} + +
+
+
+
+ 观看 + + + {{ data.signFlag ? "已签到" : "签到" }} + + + + {{ data.isSurvery ? "已评估" : + "评估" + }} + +
@@ -151,7 +184,7 @@ import { ElMessage } from "element-plus"; import dayjs from "dayjs"; const { - query: { courseId: liveId, id: taskId, type, pName, sName }, + query: { courseId: liveId, id: taskId, type, pName, sName, projectStatus, projectEndTime }, } = useRoute(); const router = useRouter(); const returnclick = () => { diff --git a/src/views/moreActive/MoreActive.vue b/src/views/moreActive/MoreActive.vue index a91b3cc..0595cdb 100644 --- a/src/views/moreActive/MoreActive.vue +++ b/src/views/moreActive/MoreActive.vue @@ -45,10 +45,22 @@
{{ data?.activityAddress }}
- {{ data.signFlag ? "已签到" : "签到" }} - - {{ data.signFlag ? "已签到" : "签到" }} - +
+
+ {{ data.signFlag ? "已签到" : "签到" }} + + {{ data.signFlag ? "已签到" : "签到" }} + +
+
+
+
+ {{ data.signFlag ? "已签到" : "签到" }} + + {{ data.signFlag ? "已签到" : "签到" }} + +
+
@@ -149,7 +161,7 @@ const returnclick = () => { router.back(); }; const { - query: { courseId: activityId, id: taskId, type, pName, sName }, + query: { courseId: activityId, id: taskId, type, pName, sName, projectStatus, projectEndTime }, } = useRoute(); const state = reactive({ diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index 894208b..0e2988f 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -274,6 +274,7 @@ import { import { useRoute, useRouter } from "vue-router"; import store from "@/store"; import { ElMessage } from "element-plus"; + const { query: { courseId, projectId }, } = useRoute(); @@ -374,9 +375,39 @@ const types = ref({ const dialogVisible = ref(false); const dialogVisibleTip = ref('该任务无法学习，请联系管理员进行替换！'); +// 判断当前任务已结束及时间意义上的结束 提示用户 +function judgeTaskIsEnd(type, endTimes, status) { + // type 任务类型 endTime 结束时间 status 任务状态 (状态 0 未完成 1 已完成 2 未开始 3 已结束) + console.log(type, endTimes, status); + let isEnd = false; + let nowTime = new Date().getTime(); + let endTime = new Date().getTime(endTimes); + switch (type) { + case 1: + status == 3 ? isEnd = true : nowTime > endTime ? isEnd = true : isEnd = false; + break; + case 3: + status == 3 ? isEnd = true : nowTime > endTime ? isEnd = true : isEnd = false; + break; + case 5: + status == 3 ? isEnd = true : nowTime > endTime ? isEnd = true : isEnd = false; + break; + case 7: + status == 3 ? isEnd = true : nowTime > endTime ? isEnd = true : isEnd = false; + break; + case 10: + status == 3 ? isEnd = true : nowTime > endTime ? isEnd = true : isEnd = false; + break; + } + return isEnd; +} function toFinish(d, sName, chapterOrStageId) { console.log("dddddd", d, sName, chapterOrStageId); + if(judgeTaskIsEnd(d.type ,data.value.endTime, data.value.status)){ + ElMessage.error("当前任务已结束") + return + } if (d.type == 2) { let date1 = new Date(d.endTime).getTime(); let date2 = new Date().getTime(); @@ -483,7 +514,9 @@ function toFinish(d, sName, chapterOrStageId) { courseId: d.courseId, pName: data.value.name, sName, - chapterOrStageId + chapterOrStageId, + projectStatus: data.value.status?data.value.status:0, // 项目状态 -- 用于判断当前项目是否已经结束 + projectEndTime: data.value.endTime?data.value.endTime:0 // 项目结束 -- 用于判断当前项目是否已经结束 }, }); } else if (typeof types.value.path[d.type] === "function") { diff --git a/src/views/survey/SurveyDetail.vue b/src/views/survey/SurveyDetail.vue index b038ec4..975fea9 100644 --- a/src/views/survey/SurveyDetail.vue +++ b/src/views/survey/SurveyDetail.vue @@ -296,9 +296,15 @@ data.assessmentMultipleChoiceDtoList?.length || data.assessmentSingleChoiceDtoList?.length || data.assessmentScoringQuestionDtoList?.length -"> -
- 提交 +">
+
+ 提交 +
+
+
+
+ 提交 +
@@ -334,7 +340,7 @@ import { ElMessage } from "element-plus"; import { ref } from "vue"; const { - query: { courseId, id: taskId, infoId, type, pName, sName, chapterOrStageId }, + query: { courseId, id: taskId, infoId, type, pName, sName, chapterOrStageId, projectStatus, projectEndTime }, } = useRoute(); const router = useRouter(); const returnclick = () => {