From aa10f1e5232ae79df585a01d9dccf18eeac69f9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Tue, 4 Nov 2025 14:57:17 +0800 Subject: [PATCH 01/18] fix: bug --- .env.development | 2 +- src/pages/index/dialog.vue | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.env.development b/.env.development index 4264db8c..22ef690e 100644 --- a/.env.development +++ b/.env.development @@ -14,7 +14,7 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' # app入口 -# VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001' +VITE_APP_BASE_API_Url = 'http://25.18.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' diff --git a/src/pages/index/dialog.vue b/src/pages/index/dialog.vue index 7b00709f..ae4b1569 100644 --- a/src/pages/index/dialog.vue +++ b/src/pages/index/dialog.vue @@ -1111,6 +1111,7 @@ .talking-list { height: calc(100% - 772rpx); + min-height: 300rpx; padding: 12rpx 24rpx; box-sizing: border-box; From 12b7ba13609b010c5435baa8c331d9c6be892907 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= Date: Tue, 4 Nov 2025 15:16:38 +0800 Subject: [PATCH 02/18] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=BB=91=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/login/login.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue index 02979bcc..1acfe4f0 100644 --- a/src/pages/login/login.vue +++ b/src/pages/login/login.vue @@ -354,7 +354,7 @@ .main_div { display: flex; flex-direction: column; - overflow: hidden; + // overflow: hidden; max-height: 100vh; } From 0ee6d7324055cbe76b996cb1af192f468743a0b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= Date: Wed, 5 Nov 2025 14:09:48 +0800 Subject: [PATCH 03/18] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E7=BB=83=E4=B9=A0=E5=92=8C=E8=80=83=E8=AF=95=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E7=9A=84nan=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- .../components/practiceRecordItem.vue | 4 +- .../components/studyRecordItem.vue | 4 +- src/pages/courseRecord/useItemList.js | 38 +++++++++---------- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.env.development b/.env.development index 22ef690e..74be489f 100644 --- a/.env.development +++ b/.env.development @@ -14,7 +14,7 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' # app入口 -VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001' +#VITE_APP_BASE_API_Url = 'http://25.18.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' diff --git a/src/pages/courseRecord/components/practiceRecordItem.vue b/src/pages/courseRecord/components/practiceRecordItem.vue index 94d44492..eb7ecc94 100644 --- a/src/pages/courseRecord/components/practiceRecordItem.vue +++ b/src/pages/courseRecord/components/practiceRecordItem.vue @@ -40,7 +40,7 @@ - 练习时长:{{ formatDuration(item_list.exrStartTm, item_list.exrEndTm) }} + 练习时长:{{ item_list.item_list || '--' }} @@ -61,7 +61,7 @@ import { computed, ref, reactive } from 'vue'; import common from '@/common/common'; import { queryPracticeHis } from '@/api/courseRecord.js'; - import { useItemList, formatDuration } from '../useItemList.js'; + import { useItemList } from '../useItemList.js'; const props = defineProps({ item: { diff --git a/src/pages/courseRecord/components/studyRecordItem.vue b/src/pages/courseRecord/components/studyRecordItem.vue index 7941a248..61bae4c6 100644 --- a/src/pages/courseRecord/components/studyRecordItem.vue +++ b/src/pages/courseRecord/components/studyRecordItem.vue @@ -40,7 +40,7 @@ - 学习时长:{{ formatDuration(item_list.startTm, item_list.endTm) }} + 学习时长:{{ item_list.item_list || '--' }} @@ -61,7 +61,7 @@ import { computed } from 'vue'; import common from '@/common/common'; import { queryStdyBatchByCrsId } from '@/api/courseRecord.js'; - import { useItemList, formatDuration, secondsToHours } from '../useItemList.js'; + import { useItemList, secondsToHours } from '../useItemList.js'; const props = defineProps({ item: { type: Object, diff --git a/src/pages/courseRecord/useItemList.js b/src/pages/courseRecord/useItemList.js index 2ff3c9b1..dca33100 100644 --- a/src/pages/courseRecord/useItemList.js +++ b/src/pages/courseRecord/useItemList.js @@ -7,25 +7,25 @@ import { // 计算两个标准时间的时间差值 -export 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); - const remainingSeconds = seconds % 60; - - // 补零格式化函数(统一处理所有单位) - const formatNumber = (num) => num.toString().padStart(2, '0'); - - // 小时、分钟、秒均保持两位数格式 - return `${formatNumber(hours)}:${formatNumber(minutes)}:${formatNumber(remainingSeconds)}`; -}; +// export 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); +// const remainingSeconds = seconds % 60; +// +// // 补零格式化函数(统一处理所有单位) +// const formatNumber = (num) => num.toString().padStart(2, '0'); +// +// // 小时、分钟、秒均保持两位数格式 +// return `${formatNumber(hours)}:${formatNumber(minutes)}:${formatNumber(remainingSeconds)}`; +// }; // 秒数转换成小时,带小数点的小时 export const secondsToHours = (seconds) => { From 8bd1b835c932ae3e0aae82f941af9d08fea4d53e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= Date: Wed, 5 Nov 2025 15:10:19 +0800 Subject: [PATCH 04/18] =?UTF-8?q?=E6=94=B9=E9=94=99=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BA=86=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=AF=BE=E7=A8=8B=E5=AD=A6?= =?UTF-8?q?=E4=B9=A0=E5=92=8C=E8=80=83=E8=AF=95=E8=AE=B0=E5=BD=95=E7=9A=84?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/courseRecord/components/practiceRecordItem.vue | 2 +- src/pages/courseRecord/components/studyRecordItem.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/courseRecord/components/practiceRecordItem.vue b/src/pages/courseRecord/components/practiceRecordItem.vue index eb7ecc94..10da90da 100644 --- a/src/pages/courseRecord/components/practiceRecordItem.vue +++ b/src/pages/courseRecord/components/practiceRecordItem.vue @@ -40,7 +40,7 @@ - 练习时长:{{ item_list.item_list || '--' }} + 练习时长:{{ item_list.stdtTmLenS || '--' }} diff --git a/src/pages/courseRecord/components/studyRecordItem.vue b/src/pages/courseRecord/components/studyRecordItem.vue index 61bae4c6..446f92ed 100644 --- a/src/pages/courseRecord/components/studyRecordItem.vue +++ b/src/pages/courseRecord/components/studyRecordItem.vue @@ -40,7 +40,7 @@ - 学习时长:{{ item_list.item_list || '--' }} + 学习时长:{{ item_list.stdtTmLenS || '--' }} From a6cbc27dfb2ede929eb63fa6ac6e4b16152901bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Wed, 5 Nov 2025 15:35:13 +0800 Subject: [PATCH 05/18] fix: bug --- src/pages/course/components/touchBtn.vue | 192 ++++++++++++----------- 1 file changed, 99 insertions(+), 93 deletions(-) diff --git a/src/pages/course/components/touchBtn.vue b/src/pages/course/components/touchBtn.vue index fee712ec..12b2337b 100644 --- a/src/pages/course/components/touchBtn.vue +++ b/src/pages/course/components/touchBtn.vue @@ -1,54 +1,24 @@