Merge branch 'dev-20250930' of http://25.13.9.101:9000/K17_AITS/tra-app into dev-20250930

src/pages/charts/index.vue

@@ -112,7 +112,7 @@
 					<!-- 自定义 header -->
 					<template v-slot:header>
 						<text style="width: 20%;text-align: center;margin-top:15rpx"
-							:class="item.userId == userId?'active-rank-sty':'rank-sty'">{{index + 4}}</text>
+							:class="item.userId == userId?'active-rank-sty':'rank-sty'">{{item.position}}</text>
 					</template>
 					<!-- 自定义 body -->
 					<template v-slot:body>
@@ -186,16 +186,16 @@
 	import common from '@/common/common';
 	const userId = ref("");
 	const itemIndex = ref(0);
-	const learnTimeList = ref([])
-	const practCntList = ref([])
-	const examCntList = ref([])
-	const crsCntList = ref([])
+	const learnTimeList = ref({})
+	const practCntList = ref({})
+	const examCntList = ref({})
+	const crsCntList = ref({})
 	const myselfObj = ref({})
 	const tableLastName = ref("学习时长(h)");
 	const taskRef = ref(null);
 	const tabAct = ref(0);
 	const tabDateAct = ref(0);
-	const allChartsList = ref([]);
+	const allChartsList = ref({});
 	const newChartsList = ref([]);
 	const tabList = ref([{
 		name: '学习时长'
@@ -326,7 +326,7 @@
 	onMounted(() => {
 		getLeaderBoardStdyTmApi().then(res => {
 			console.log(res, 'getLeaderBoardStdyTmApi')
-			learnTimeList.value = res.body || [];
+			learnTimeList.value = res.body || {};
 			allChartsList.value = learnTimeList.value;
 			chartsList.value = allChartsList.value.annual?allChartsList.value.annual.list:[];
 			myselfObj.value = allChartsList.value.annual?allChartsList.value.annual.self:{};
@@ -345,17 +345,17 @@
 		})
 		getLeaderBoardPractCntApi().then(res => {
 			console.log(res, 'getLeaderBoardPractCntApi')
-			practCntList.value = res.body || [];
+			practCntList.value = res.body || {};
 			console.log(practCntList.value, 'practCntList')
 		})
 		getLeaderBoardExamCntApi().then(res => {
 			console.log(res, 'getLeaderBoardExamCntApi')
-			examCntList.value = res.body || [];
+			examCntList.value = res.body || {};
 			console.log(examCntList.value, 'examCntList')
 		})
 		getLeaderBoardCrsCntApi().then(res => {
 			console.log(res, 'getLeaderBoardCrsCntApi')
-			crsCntList.value = res.body || [];
+			crsCntList.value = res.body || {};
 			console.log(crsCntList.value, 'crsCntList')
 		})
 
@@ -665,20 +665,24 @@
 			.rank-content-backgound-color1 {
 				margin-top: 32rpx;
 				width: 206rpx;
-				height: 418rpx;
+				// height: 418rpx;
+				padding-bottom: 20rpx;
 				background-color: #E8F3FF;
+				padding-bottom: 10rpx;
 			}
 
 			.rank-content-backgound-color2 {
 				width: 220rpx;
-				height: 432rpx;
+				// height: 432rpx;
+				padding-bottom: 20rpx;
 				background: linear-gradient(180deg, #FEEFB7 0%, #FADB66 100%);
 			}
 
 			.rank-content-backgound-color3 {
 				margin-top: 42rpx;
 				width: 206rpx;
-				height: 418rpx;
+				// height: 418rpx;
+				padding-bottom: 20rpx;
 				background: linear-gradient(180deg, #FCDAB7 0%, #F9B16C 100%);
 			}
 		}
@@ -690,7 +694,10 @@
 		:deep(.uni-table) {
 			min-width: 0 !important;
 		}
-
+		:deep(.uni-list--border-top) {
+			display: none;
+		}
+		
 		.rank-uni-sty {
 			font-weight: 400;
 			font-size: 26rpx;