From 7e3bf495bff62ca7b5c0cd5237ec7b8b856fccf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Wed, 3 Dec 2025 20:08:02 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E5=AD=A6=E4=B9=A0=E5=88=86=E6=9E=90?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0loading=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development.yh | 1 + src/pages/analytics/study.vue | 82 ++++++++++++++++++++++------------- 2 files changed, 52 insertions(+), 31 deletions(-) diff --git a/.env.development.yh b/.env.development.yh index c56d90fd..193ce295 100644 --- a/.env.development.yh +++ b/.env.development.yh @@ -11,4 +11,5 @@ VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786' # VITE_APP_BASE_H5_API_Url_TRAPRACTICE = 'http://25.64.32.156:9603' # VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.32.154:9601' # VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.32.158:9601' +# VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.32.154:9602' diff --git a/src/pages/analytics/study.vue b/src/pages/analytics/study.vue index 9c52ab1c..f9bad360 100644 --- a/src/pages/analytics/study.vue +++ b/src/pages/analytics/study.vue @@ -6,7 +6,10 @@ - + + + + - {{statisticsObj.completeTaskCnt }} + {{statisticsObj.completeTaskCnt }} @@ -61,7 +64,7 @@ 完成考试数 - {{statisticsObj.completedExamCnt }} + {{statisticsObj.completedExamCnt }} @@ -70,7 +73,7 @@ 考试及格率 - {{statisticsObj.passExamRate }} + {{statisticsObj.passExamRate }} % @@ -104,7 +107,7 @@ - + @@ -113,7 +116,7 @@ - + @@ -122,7 +125,7 @@ - + @@ -130,7 +133,7 @@ - + @@ -186,15 +189,15 @@ }) const calendarRef = ref() const statisticsObj = ref({ - crsStdyTmLen: 0, - completeTaskCnt: 0, - completedExamCnt: 0, - passExamRate: 0, - partnerCnt: 0, - askCnt: 0, - completeCrsCnt: 0, - crsCompleteRate: 0, - partnerRate: 0 + crsStdyTmLen: 0, + completeTaskCnt: 0, + completedExamCnt: 0, + passExamRate: 0, + partnerCnt: 0, + askCnt: 0, + completeCrsCnt: 0, + crsCompleteRate: 0, + partnerRate: 0 }) const dimesionList = ref([]) const studyList = ref([]) @@ -225,17 +228,20 @@ loading.value = true try { let _res1 = await queryStudyStatistics(params) - statisticsObj.value = {..._res1.body} + statisticsObj.value = { + ..._res1.body + } let _res2 = await queryDimesionInfo(params) dimesionList.value = [..._res2.body] let _res3 = await queryHabitInfo(params) studyList.value = [..._res3.body] let _res4 = await querySuggestInfo(params) - if(_res4.body && _res4.body.length > 0){ - suggestObj.value = {..._res4.body[0]} + if (_res4.body && _res4.body.length > 0) { + suggestObj.value = { + ..._res4.body[0] + } } - } catch { - } finally{ + } catch {} finally { loading.value = false } } @@ -246,9 +252,9 @@ const changeTab = (info) => { activeTabVal.value = info.value if (info.value === '04') { - dateinputRef.value&&dateinputRef.value?.clear() + dateinputRef.value && dateinputRef.value?.clear() daterange.value = ['', ''] - }else{ + } else { getInfoNow({ dateType: activeTabVal.value }) @@ -364,6 +370,13 @@ margin-bottom: 24rpx; backdrop-filter: blur(10rpx); + .loading-box { + position: absolute; + top: 120rpx; + left: 50%; + transform: translateX(-50%); + } + .calendar-box { position: absolute; right: 25rpx; @@ -385,6 +398,7 @@ padding-bottom: 20rpx; width: 100%; overflow: hidden; + position: relative; .analytics-item { padding-bottom: 12rpx; @@ -405,6 +419,7 @@ &-value { font-size: 54rpx; font-weight: 600; + &-v { font-family: DINAlternate, DINAlternate; } @@ -428,13 +443,15 @@ margin-bottom: 24rpx; position: relative; min-height: 200rpx; - .loading-box{ + + .loading-box { position: absolute; top: 120rpx; left: 50%; transform: translateX(-50%); } - &::before{ + + &::before { content: ''; display: block; position: absolute; @@ -445,26 +462,27 @@ top: -12rpx; background-size: cover; } + &.dens { - &::before{ + &::before { background-image: url(@/static/images/analytics/weidu-1.png); } } &.study { - &::before{ + &::before { background-image: url(@/static/images/analytics/study1-1.png) } } &.study1 { - &::before{ + &::before { background-image: url(@/static/images/analytics/study-1.png); } } &.course { - &::before{ + &::before { background-image: url(@/static/images/analytics/course-1.png); } } @@ -524,11 +542,13 @@ background-repeat: no-repeat; background-size: 100% 100%; } - &.study2-tip{ + + &.study2-tip { &::before { background-image: url(@/static/images/analytics/den-tips2.png); } } + &.bg-tm { padding-left: 54rpx; background-image: url(@/static/images/analytics/time-icon.png); From 6cb5cce542a2f700546fe1e2e6309b5eb6849a0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Wed, 3 Dec 2025 21:01:17 +0800 Subject: [PATCH 2/5] fix: bug --- .env.development.yh | 6 +++--- src/pages/index/preview.vue | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.env.development.yh b/.env.development.yh index 193ce295..3930e2a8 100644 --- a/.env.development.yh +++ b/.env.development.yh @@ -2,14 +2,14 @@ ENV = 'development.yh' # 'development.yh' -# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' +VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' -VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786' +# 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_API_Url = 'https://aitstest.jlbank.com.cn:7002' # VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.32.154:9604' # VITE_APP_BASE_H5_API_Url_TRAPRACTICE = 'http://25.64.32.156:9603' -# VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.32.154:9601' +VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.32.154:9601' # VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.32.158:9601' # VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.32.154:9602' diff --git a/src/pages/index/preview.vue b/src/pages/index/preview.vue index ff9740b3..2c023f37 100644 --- a/src/pages/index/preview.vue +++ b/src/pages/index/preview.vue @@ -41,7 +41,7 @@ export default { this.fileApiSrc = params.fileApiSrc } const userInfo = getUserInfo(); - this.userParams = '/' + (userInfo?.loginName??'') + this.userParams = '/' + (userInfo?.loginName??'') + '?tk=' + getToken() }, onShow() { if (getPhoneEnvBool('AND')) { From b82956d560e1bb9d175364c31e3a32fb40aead9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Thu, 4 Dec 2025 09:05:34 +0800 Subject: [PATCH 3/5] fix: bug --- .env.development.yh | 6 +++--- src/pages/index/preview.vue | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.env.development.yh b/.env.development.yh index 3930e2a8..193ce295 100644 --- a/.env.development.yh +++ b/.env.development.yh @@ -2,14 +2,14 @@ ENV = 'development.yh' # 'development.yh' -VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' +# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' -# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786' +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_API_Url = 'https://aitstest.jlbank.com.cn:7002' # VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.32.154:9604' # VITE_APP_BASE_H5_API_Url_TRAPRACTICE = 'http://25.64.32.156:9603' -VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.32.154:9601' +# VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.32.154:9601' # VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.32.158:9601' # VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.32.154:9602' diff --git a/src/pages/index/preview.vue b/src/pages/index/preview.vue index 2c023f37..94ed0383 100644 --- a/src/pages/index/preview.vue +++ b/src/pages/index/preview.vue @@ -84,8 +84,8 @@ export default { const base_url = get_base_url(this.fileApiSrc) let _id = data?.fileId let fileUrl = base_url + this.fileApiSrc + _id + this.userParams - this.showUrl = this.viewerUrl + '?url=' + fileUrl - console.log(this.showUrl) + this.showUrl = this.viewerUrl + '?url=' + encodeURIComponent(fileUrl) + console.log(this.showUrl) this.showView = true } } From db2eb8cf2b2362d598537d44dcdc0f60bb022379 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Thu, 4 Dec 2025 10:57:30 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix=EF=BC=9B=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../image-preview/video-preview.vue | 7 ++-- src/pages/sparring/index.vue | 34 +++++++++---------- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/src/components/image-preview/video-preview.vue b/src/components/image-preview/video-preview.vue index bfd3d5df..290596ba 100644 --- a/src/components/image-preview/video-preview.vue +++ b/src/components/image-preview/video-preview.vue @@ -31,6 +31,7 @@ import { useStorageStore } from "@/store/storage.js" import { get_base_url } from '@/api/request.js' import imagePreviewVue from './image-preview.vue' + import { getToken } from '@/common/common.js' export default { name:"video-preview", components:{ imagePreviewVue }, @@ -75,7 +76,7 @@ fileId: { handler(newval, oldval) { if(newval.indexOf('http') === 0){ - this.fileUrlShow = newval + this.fileUrlShow = newval + '?tk=' + getToken() }else{ if (newval && this.watching) { this.getPreviewUrlBlob(newval); @@ -129,7 +130,7 @@ return } let _newDate = new Date().getTime() - this.fileUrlShow = getPreviewFileUrl(this.fileId)+'?t=' + _newDate + this.fileUrlShow = getPreviewFileUrl(this.fileId) + '?tk=' + getToken() + '&t=' + _newDate // downloadFile(id).then(res=>{ // this.fileUrlShow = res.tempFilePath // this.storageStore.setStorage('video', id, this.fileUrlShow) @@ -150,7 +151,7 @@ if (this.fileId) { let _newDate = new Date().getTime() if(this.fileId.indexOf('http') === 0){ - this.fileUrlShow = this.fileId + '?t=' + _newDate + this.fileUrlShow = this.fileId + '?tk=' + getToken() + '&t=' + _newDate }else{ this.getPreviewUrlBlob(this.fileId); } diff --git a/src/pages/sparring/index.vue b/src/pages/sparring/index.vue index 8f30784c..d6201185 100644 --- a/src/pages/sparring/index.vue +++ b/src/pages/sparring/index.vue @@ -384,16 +384,16 @@ currentTabSec.value = 0 activeTabId.value = '' activeTabSecId.value = '' - queryTraPartnerCatelogList().then(res => { - catelogList.value = res.body || [] - }) - getTraTagListApi().then(res => { - tagsTree.value = res.body || [] - }) - changeTab({ - name: '全部', - value: '' - }) + // queryTraPartnerCatelogList().then(res => { + // catelogList.value = res.body || [] + // }) + // getTraTagListApi().then(res => { + // tagsTree.value = res.body || [] + // }) + // changeTab({ + // name: '全部', + // value: '' + // }) uni.$on('refresh_sparring_list', () => { changeTab({ name: activeTab.value || '全部', @@ -415,13 +415,13 @@ activeTabId.value = '' activeTabSecId.value = '' // 重新获取标签信息 - getTraTagListApi().then(res => { - tagsTree.value = res.body || [] - }) - changeTab({ - name: '全部', - value: '' - }) + // getTraTagListApi().then(res => { + // tagsTree.value = res.body || [] + // }) + // changeTab({ + // name: '全部', + // value: '' + // }) }) onShow(() => { console.log('onShow') From d2982f847694bd3f5d297b736c13b11b0bcf8b2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= Date: Thu, 4 Dec 2025 13:58:32 +0800 Subject: [PATCH 5/5] fix; bug --- .../image-preview/preview-detail.vue | 19 +++++++-------- src/pages/analytics/study.vue | 23 +++++++++++++++---- 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/src/components/image-preview/preview-detail.vue b/src/components/image-preview/preview-detail.vue index 80ea81aa..5b369f42 100644 --- a/src/components/image-preview/preview-detail.vue +++ b/src/components/image-preview/preview-detail.vue @@ -22,6 +22,7 @@ import { useStorageStore } from "@/store/storage.js" import { get_base_url } from '@/api/request.js' import imagePreviewVue from './image-preview.vue' + import { getToken } from '@/common/common.js' export default { name:"video-preview", components:{imagePreviewVue}, @@ -74,11 +75,11 @@ handler(newval, oldval) { if(this.fileType === 'image'){ if (newval.indexOf('/') === 0) { - this.fileUrlShow = this.base_url + newval; + this.fileUrlShow = this.base_url + newval + '?tk=' + getToken(); return; } if (newval.indexOf('http') === 0) { - this.fileUrlShow = newval; + this.fileUrlShow = newval + '?tk=' + getToken(); return; } if (newval && this.watching) { @@ -87,7 +88,7 @@ } if(this.fileType === 'video'){ if(newval.indexOf('http') === 0){ - this.fileUrlShow = newval + this.fileUrlShow = newval + '?tk=' + getToken() }else{ if (newval && this.watching) { this.getPreviewUrlBlob(newval); @@ -102,9 +103,9 @@ src: { handler(newval, oldval) { if(newval.indexOf('http') === 0){ - this.fileUrlShow = newval + this.fileUrlShow = newval + '?tk=' + getToken() }else{ - this.fileUrlShow = this.base_url + newval + this.fileUrlShow = this.base_url + newval + '?tk=' + getToken() } }, immediate: true, @@ -132,7 +133,7 @@ return; } previewCacheThumbImage(id, this.width, this.height).then((res) => { - this.fileUrlShow = res; + this.fileUrlShow = res + '?tk=' + getToken(); this.storageStore.setStorage('image', `/${id}/${this.width}/${this.height}`, res); }); } else { @@ -183,7 +184,7 @@ if (this.fileId) { let _newDate = new Date().getTime() if(this.fileId.indexOf('http') === 0){ - this.fileUrlShow = this.fileId + '?t=' + _newDate + this.fileUrlShow = this.fileId + '?tk=' + getToken() + '&t=' + _newDate }else{ this.getPreviewUrlBlob(this.fileId); } @@ -213,7 +214,7 @@ return } let _newDate = new Date().getTime() - this.fileUrlShow = getPreviewFileUrl(this.fileId)+'?t=' + _newDate + this.fileUrlShow = getPreviewFileUrl(this.fileId) + '?tk=' + getToken() + '&t=' + _newDate // downloadFile(id).then(res=>{ // this.fileUrlShow = res.tempFilePath // this.storageStore.setStorage('video', id, this.fileUrlShow) @@ -222,7 +223,7 @@ getPreviewFileUrlNow(id){ let _newDate = new Date().getTime() if(id.indexOf('http') === 0){ - this.fileUrlShow = id + '?t=' + _newDate + this.fileUrlShow = id + '?tk=' + getToken() + '&t=' + _newDate return } if (id && this.watching) { diff --git a/src/pages/analytics/study.vue b/src/pages/analytics/study.vue index f9bad360..94896e34 100644 --- a/src/pages/analytics/study.vue +++ b/src/pages/analytics/study.vue @@ -6,10 +6,11 @@ - + + +