diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue index 8a81426..18cd10a 100644 --- a/src/views/faceteach/FaceTeach.vue +++ b/src/views/faceteach/FaceTeach.vue @@ -78,11 +78,7 @@
- +
{{ el.slice(el.indexOf('-') + 1) }}
@@ -123,7 +119,7 @@ 此课程无作业
- +
@@ -229,29 +225,29 @@ let timer = null; //判断能否签到 function isSignClick() { timer = setInterval(() => { - let beginTime = new Date(data.value.planDto.beginTime).getTime(); - let endTime = !data.value.planDto.afterStart - ? new Date(data.value.planDto.endTime).getTime() - : new Date(data.value.planDto.beginTime).getTime(); + let beginTime = new Date(data.value.planDto?.beginTime).getTime(); + let endTime = !data.value.planDto?.afterStart + ? 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) { + if (data.value.planDto?.beforeStart && data.value.planDto?.afterStart) { //有开始前有开始后 - beginTime = beginTime - data.value.planDto.beforeStart * 60 * 1000; - endTime = endTime + data.value.planDto.afterStart * 60 * 1000; + 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.planDto?.beforeStart && + !data.value.planDto?.afterStart ) { //只有开始前无开始后 - beginTime = beginTime - data.value.planDto.beforeStart * 60 * 1000; + beginTime = beginTime - data.value.planDto?.beforeStart * 60 * 1000; console.log("11112222"); } else if ( - !data.value.planDto.beforeStart && - data.value.planDto.afterStart + !data.value.planDto?.beforeStart && + data.value.planDto?.afterStart ) { //无开始前有开始后 - endTime = endTime + data.value.planDto.afterStart * 60 * 1000; + endTime = endTime + data.value.planDto?.afterStart * 60 * 1000; console.log("1111333"); } if (nowTime < endTime && nowTime > beginTime) { diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index 640acbc..dead039 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -377,6 +377,16 @@ const dialogVisibleTip = ref('该任务无法学习,请联系管理员进行 function toFinish(d, sName, chapterOrStageId) { console.log("dddddd", d, sName, chapterOrStageId); + if (d.type == 2) { + let date1 = new Date(d.endTime).getTime(); + let date2 = new Date().getTime(); + if (date1 < date2) { + dialogVisibleTip.value = '当前面授课已结束'; + dialogVisible.value = true; + + //return + } + } // 作业过期判断 if (d.type == 4) { let date1 = new Date(d.endTime).getTime(); @@ -385,7 +395,7 @@ function toFinish(d, sName, chapterOrStageId) { dialogVisibleTip.value = '当前作业已结束'; dialogVisible.value = true; - return + //return } } // 直播结束时间 @@ -395,7 +405,7 @@ function toFinish(d, sName, chapterOrStageId) { if (date1 < date2) { dialogVisibleTip.value = '当前直播已结束'; dialogVisible.value = true; - return + //return } } // 考试 停用 @@ -423,7 +433,7 @@ function toFinish(d, sName, chapterOrStageId) { if (date1 < date2) { dialogVisibleTip.value = '当前活动已结束'; dialogVisible.value = true; - return + //return } } // 在线课 停用 -- 暂时没有在线课停用标记 diff --git a/src/views/project/ProjectManage.vue b/src/views/project/ProjectManage.vue index 2fd095f..586495c 100644 --- a/src/views/project/ProjectManage.vue +++ b/src/views/project/ProjectManage.vue @@ -31,7 +31,7 @@
- +
diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index 10c341b..2b2a930 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -366,6 +366,16 @@ function toFinish(d) { ElMessage.error("暂时未开放"); return; } + if (d.type == 2) { + let date1 = new Date(d.endTime).getTime(); + let date2 = new Date().getTime(); + if (date1 < date2) { + dialogVisibleTip.value = '当前面授课已结束'; + dialogVisible.value = true; + + //return + } + } if (d.type == 4) { let date1 = new Date(d.endTime).getTime(); let date2 = new Date().getTime(); @@ -373,7 +383,7 @@ function toFinish(d) { dialogVisibleTip.value = '当前作业已结束'; dialogVisible.value = true; - return + //return } } // 直播结束时间 @@ -383,7 +393,7 @@ function toFinish(d) { if (date1 < date2) { dialogVisibleTip.value = '当前直播已结束'; dialogVisible.value = true; - return + //return } } // 考试 停用 @@ -411,7 +421,7 @@ function toFinish(d) { if (date1 < date2) { dialogVisibleTip.value = '当前活动已结束'; dialogVisible.value = true; - return + //return } } // 在线课 停用 -- 暂时没有在线课停用标记