feat:修改跳转及按钮

This commit is contained in:
lixg
2023-03-10 17:03:41 +08:00
parent d555d87919
commit 90f1fdee9b
11 changed files with 64 additions and 20 deletions

View File

@@ -221,6 +221,7 @@ import ReturnHead from "@/components/ReturnHead.vue";
import { PROJECT, TASK_TYPES } from "@/api/CONST";
import dayjs from "dayjs";
import { useStore } from "vuex";
import { changeTime } from "@/api/method";
const {
query: { courseId, projectId, type },
} = useRoute();
@@ -371,7 +372,8 @@ function judgeTaskIsEnd(type, endTimes, status) {
console.log("judgeTaskIsEnd", type, endTimes, status);
let isEnd = false;
let nowTime = new Date().getTime();
let endTime = new Date().getTime(endTimes);
let endTime = new Date().getTime(changeTime(endTimes));
console.log("endTime---------", endTime);
switch (type) {
case 1:
status == -1
@@ -424,7 +426,7 @@ function toFinish(d, sName, chapterOrStageId) {
return;
}
if (d.type == 2) {
let date1 = new Date(d.endTime).getTime();
let date1 = new Date(changeTime(d.endTime)).getTime();
let date2 = new Date().getTime();
if (date1 < date2) {
ElMessage.warning("当前面授课已结束");
@@ -434,7 +436,7 @@ function toFinish(d, sName, chapterOrStageId) {
}
// 作业过期判断
if (d.type == 4) {
let date1 = new Date(d.endTime).getTime();
let date1 = new Date(changeTime(d.endTime)).getTime();
let date2 = new Date().getTime();
if (date1 < date2) {
ElMessage.warning("当前作业已结束");
@@ -443,7 +445,7 @@ function toFinish(d, sName, chapterOrStageId) {
}
// 直播结束时间
if (d.type == 6) {
let date1 = new Date(d.endTime).getTime();
let date1 = new Date(changeTime(d.endTime)).getTime();
let date2 = new Date().getTime();
if (date1 < date2) {
ElMessage.warning("当前直播已结束");
@@ -492,7 +494,7 @@ function toFinish(d, sName, chapterOrStageId) {
}
// 其他活动 结束时间
if (d.type == 9) {
let date1 = new Date(d.endTime).getTime();
let date1 = new Date(changeTime(d.endTime)).getTime();
let date2 = new Date().getTime();
if (date1 < date2) {
ElMessage.warning("当前活动已结束");