diff --git a/.env.development b/.env.development index 90f97634..115d2fcd 100644 --- a/.env.development +++ b/.env.development @@ -6,7 +6,7 @@ ENV = 'development' # app入口 -VITE_APP_BASE_API_Url = 'http://25.16.122.65:7001' +#VITE_APP_BASE_API_Url = 'http://25.16.122.65:7001' #VITE_APP_BASE_API_Url = 'http://25.16.122.91:9786' #VITE_APP_BASE_API_Url = 'http://25.18.122.66:9786' @@ -14,7 +14,7 @@ VITE_APP_BASE_API_Url = 'http://25.16.122.65:7001' # VITE_APP_BASE_H5_API_Url = 'http://25.16.122.65:7001' # VITE_APP_BASE_H5_API_Url = 'http://25.18.122.21:9786' -# VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7002' +VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7001' # dev #VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' diff --git a/src/pages/testingHall/components/content-item.vue b/src/pages/testingHall/components/content-item.vue index aebdc57d..4bee10da 100644 --- a/src/pages/testingHall/components/content-item.vue +++ b/src/pages/testingHall/components/content-item.vue @@ -7,7 +7,7 @@ 起止时间: - {{ item.examStartTm }}至{{ item.examEndTm }} + {{ item.examStartTm.substr(0 , 10) }}至{{ item.examEndTm.substr(0 , 10) }} 完成人数: diff --git a/src/pages/testingHall/details.vue b/src/pages/testingHall/details.vue index 4208445d..89409129 100644 --- a/src/pages/testingHall/details.vue +++ b/src/pages/testingHall/details.vue @@ -101,14 +101,14 @@ - + 开始考试 @@ -152,9 +152,25 @@ return sum + (item.tgtGrade || 0); }, 0) ); + const isTimeInvalid = computed(() => { + // 检查detailData是否存在 + const startTime = new Date(detailData.examStartTm); + const endTime = new Date(detailData.examEndTm); + const currentTime = new Date(); + + // 检查日期是否有效 + if (isNaN(startTime.getTime()) || isNaN(endTime.getTime())) { + return true; // 时间格式无效时视为有效(或根据需求调整) + } + const current = currentTime.getTime(); + const start = startTime.getTime(); + const end = endTime.getTime(); + // 未开始或已结束都返回true(不符合时间要求) + return current < start || current > end; + }); + const goto_examination = async () => { if (detailData.limitTyp === 'SG' && detailData.examStatText === 'Y') return common.msg('考试已完成'); - const startTime = new Date(detailData.examStartTm); const endTime = new Date(detailData.examEndTm); const currentTime = new Date(); // 当前时间 @@ -168,7 +184,6 @@ return common.msg('考试时间已结束'); } } - common.loading(); startTraExamPapersInfo({ examId: detailData.examId