From ab77132dc9fda8811ece27652ae4a7c9daa0665f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Thu, 4 Sep 2025 16:42:14 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20bug=20=E8=80=83=E8=AF=95=E6=8E=92?= =?UTF-8?q?=E8=A1=8C=E6=A6=9C=E4=BC=A0=E5=8F=82=E9=97=AE=E9=A2=98=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/examination/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/examination/index.vue b/src/pages/examination/index.vue index 2aa91a7a..a40602ff 100644 --- a/src/pages/examination/index.vue +++ b/src/pages/examination/index.vue @@ -312,7 +312,7 @@ } // 记录起始时间 examinationStartTime = new Date().getTime(); - paperData.crsId = examination.crsId; + paperData.crsId = examination.crsId ?? ''; paperData.execId = examination.execId; paperData.examId = examination.examId; paperData.papersId = examination.papersId; From f5521bb36af8f215a299fcd63e49cbbc8bbca7db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= Date: Thu, 4 Sep 2025 16:47:35 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/examination/index.vue | 2 +- src/pages/practice/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/examination/index.vue b/src/pages/examination/index.vue index 2d0dfaf2..7a2065eb 100644 --- a/src/pages/examination/index.vue +++ b/src/pages/examination/index.vue @@ -12,7 +12,7 @@ - 答题进度 + 当前题目/总题数 {{ questionNumber + 1 }} /{{ topicList.length }} diff --git a/src/pages/practice/index.vue b/src/pages/practice/index.vue index 05f751bd..0f5f2724 100644 --- a/src/pages/practice/index.vue +++ b/src/pages/practice/index.vue @@ -12,7 +12,7 @@ - 答题进度 + 当前题目/总题数 {{ questionNumber + 1 }} /{{ storageTopicList.length }} From 42af736ff70fef7c2555831257cf4e30757860b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Thu, 4 Sep 2025 18:07:08 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix=EF=BC=9A=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 5 ++--- src/pages/index/components/history.vue | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.env.development b/.env.development index 6ee69cc3..0b7218c4 100644 --- a/.env.development +++ b/.env.development @@ -27,9 +27,8 @@ VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786' # VITE_APP_BASE_H5_API_Url = 'http://25.18.122.78:9786' # 任东 -# VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.16.130:9601' -# VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.130:9602' - +VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.16.130:9601' +VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.130:9602' # VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.140:9604' # 张建成 diff --git a/src/pages/index/components/history.vue b/src/pages/index/components/history.vue index 06888043..16694b17 100644 --- a/src/pages/index/components/history.vue +++ b/src/pages/index/components/history.vue @@ -28,6 +28,7 @@ const historyPopupRef = ref() const historyList = ref([]) const open = () => { + historyList.value = [] openFeedback(true) } const close = () => { From 63e68bf18b4443d3b3c125a3a9e31c4148f330ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= Date: Thu, 4 Sep 2025 19:20:33 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AD=94=E9=A2=98?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=94=B6=E8=B5=B7=E9=97=AE=E7=AD=94=E9=A2=98?= =?UTF-8?q?=E7=AD=94=E9=A2=98=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 ++-- src/pages/courseRecord/components/practiceRecordItem.vue | 2 +- src/pages/courseRecord/components/studyRecordItem.vue | 1 + src/pages/examination/index.vue | 3 ++- src/pages/practice/index.vue | 2 +- src/pages/wrongQuestionRecord/correct.vue | 6 +++--- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.env.development b/.env.development index 6ee69cc3..7146d671 100644 --- a/.env.development +++ b/.env.development @@ -15,13 +15,13 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001' # h5专用地址 -# VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7001' +VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7001' # VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7002' # dev # VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' # sit -VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786' +# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786' # UAT # VITE_APP_BASE_H5_API_Url = 'http://25.18.122.78:9786' diff --git a/src/pages/courseRecord/components/practiceRecordItem.vue b/src/pages/courseRecord/components/practiceRecordItem.vue index 9cbb1ffa..ef84054e 100644 --- a/src/pages/courseRecord/components/practiceRecordItem.vue +++ b/src/pages/courseRecord/components/practiceRecordItem.vue @@ -104,13 +104,13 @@ // 计算两个标准时间的时间差值 const formatDuration = (startTm, endTm) => { + if(endTm === null || startTm === null) return "00:00:00"; // 解析时间字符串为时间戳（毫秒） const startTime = new Date(startTm).getTime(); const endTime = new Date(endTm).getTime(); // 计算时间差（秒），确保为正数 const seconds = Math.abs(Math.floor((endTime - startTime) / 1000)); - // 计算时、分、秒 const hours = Math.floor(seconds / 3600); const minutes = Math.floor((seconds % 3600) / 60); diff --git a/src/pages/courseRecord/components/studyRecordItem.vue b/src/pages/courseRecord/components/studyRecordItem.vue index 81a78169..170810dc 100644 --- a/src/pages/courseRecord/components/studyRecordItem.vue +++ b/src/pages/courseRecord/components/studyRecordItem.vue @@ -110,6 +110,7 @@ // 计算两个标准时间的时间差值 const formatDuration = (startTm, endTm) => { + if(endTm === null || startTm === null) return "00:00:00"; // 解析时间字符串为时间戳（毫秒） const startTime = new Date(startTm).getTime(); const endTime = new Date(endTm).getTime(); diff --git a/src/pages/examination/index.vue b/src/pages/examination/index.vue index 257c7cdd..4672b003 100644 --- a/src/pages/examination/index.vue +++ b/src/pages/examination/index.vue @@ -199,8 +199,9 @@ get: () => topicList[questionNumber.value], set: (val) => (topicList[questionNumber.value] = val) }); + const showTouchBtn = computed(() => { - return topicList[questionNumber.value]['qnsTyp'] === 'ES'; + return topic.value?.qnsTyp === 'ES' && !topic.value?.my_answer.anserResult; }); // 答题卡判断每道题的状态 diff --git a/src/pages/practice/index.vue b/src/pages/practice/index.vue index 0f5f2724..68b89ef0 100644 --- a/src/pages/practice/index.vue +++ b/src/pages/practice/index.vue @@ -121,7 +121,7 @@ }); const showTouchBtn = computed(() => { - return topic.value?.qnsTyp === 'ES'; + return topic.value?.qnsTyp === 'ES' && !topic.value?.my_answer.anserResult; }); // 下面语音组件的禁用状态判断 diff --git a/src/pages/wrongQuestionRecord/correct.vue b/src/pages/wrongQuestionRecord/correct.vue index 14267c43..a5acfa6e 100644 --- a/src/pages/wrongQuestionRecord/correct.vue +++ b/src/pages/wrongQuestionRecord/correct.vue @@ -110,11 +110,11 @@ get: () => topicList[questionNumber.value], set: (val) => (topicList[questionNumber.value] = val) }); - + const showTouchBtn = computed(() => { - return topic.value?.qnsTyp === 'ES'; + return topic.value?.qnsTyp === 'ES' && !topic.value?.my_answer.anserResult; }); - + // 下面语音组件的禁用状态判断 const touchIsDisabled = computed(() => topic.value?.es_status !== '' && topic.value?.es_status !== undefined);