From 7e3bf495bff62ca7b5c0cd5237ec7b8b856fccf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= <icho.yang@scai-global.com>
Date: Wed, 3 Dec 2025 20:08:02 +0800
Subject: [PATCH] =?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 @@
 					<view class="back-icon" @click="common.navigateBack()"></view>
 				</view>
 			</view>
-			<view class="analytics-box">
+			<view class="analytics-box" v-if="loading">
+				<CommonLoading color="#06f" class="loading-box" />
+			</view>
+			<view class="analytics-box" v-if="!loading">
 				<view class="tabs-box">
 					<uv-tabs :list="tabList" @click="changeTab" :scrollable="true" active-style="font-weight:bold; color:#000;"
 						:current="currentTab" class="font_pf my_tabs"
@@ -52,7 +55,7 @@
 							完成任务数
 						</view>
 						<view class="analytics-item-value">
-							<text class="analytics-item-value-v">{{statisticsObj.completeTaskCnt  }}</text>
+							<text class="analytics-item-value-v">{{statisticsObj.completeTaskCnt }}</text>
 							<text class="analytics-item-value-unit"></text>
 						</view>
 					</view>
@@ -61,7 +64,7 @@
 							完成考试数
 						</view>
 						<view class="analytics-item-value">
-							<text class="analytics-item-value-v">{{statisticsObj.completedExamCnt  }}</text>
+							<text class="analytics-item-value-v">{{statisticsObj.completedExamCnt }}</text>
 							<text class="analytics-item-value-unit"></text>
 						</view>
 					</view>
@@ -70,7 +73,7 @@
 							考试及格率
 						</view>
 						<view class="analytics-item-value">
-							<text class="analytics-item-value-v">{{statisticsObj.passExamRate  }}</text>
+							<text class="analytics-item-value-v">{{statisticsObj.passExamRate }}</text>
 							<text class="analytics-item-value-unit">%</text>
 						</view>
 					</view>
@@ -104,7 +107,7 @@
 				</view>
 			</view>
 			<view class="evaluation-box dens" v-if="loading">
-				<CommonLoading color="#06f" class="loading-box"/>
+				<CommonLoading color="#06f" class="loading-box" />
 			</view>
 			<view class="evaluation-box dens" v-if="!loading">
 				<view class="dens-item" v-for="(item, index) in dimesionList">
@@ -113,7 +116,7 @@
 				</view>
 			</view>
 			<view class="evaluation-box study" v-if="loading">
-				<CommonLoading color="#06f" class="loading-box"/>
+				<CommonLoading color="#06f" class="loading-box" />
 			</view>
 			<view class="evaluation-box study" v-if="!loading">
 				<view class="study-item" v-for="(item, index) in studyList">
@@ -122,7 +125,7 @@
 				</view>
 			</view>
 			<view class="evaluation-box study1" v-if="loading">
-				<CommonLoading color="#06f" class="loading-box"/>
+				<CommonLoading color="#06f" class="loading-box" />
 			</view>
 			<view class="evaluation-box study1" v-if="!loading">
 				<view class="study1-item">
@@ -130,7 +133,7 @@
 				</view>
 			</view>
 			<view class="evaluation-box course" v-if="loading">
-				<CommonLoading color="#06f" class="loading-box"/>
+				<CommonLoading color="#06f" class="loading-box" />
 			</view>
 			<view class="evaluation-box course" v-if="!loading">
 				<CourseItem v-for="item in courseList" :itemInfo="item" @clickItem="toCourseDetail(item)" />
@@ -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);