From 58832f8b71933cb1d8f92c7473905e4dde74af36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= <tybb88x@gmail.com>
Date: Mon, 9 Mar 2026 17:21:20 +0800
Subject: [PATCH] =?UTF-8?q?JLBA202505130001=5F=E5=85=B3=E4=BA=8E=E5=90=89?=
 =?UTF-8?q?=E6=9E=97=E9=93=B6=E8=A1=8C=E6=96=B0=E5=BB=BAAI=E6=99=BA?=
 =?UTF-8?q?=E8=83=BD=E5=9F=B9=E8=AE=AD=E7=B3=BB=E7=BB=9F=E7=9A=84=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=5F=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E5=88=B0=E4=BB=BB=E5=8A=A1=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E5=87=A0=E4=B8=AA=E5=AD=97=E6=AE=B5=E4=B8=8D=E5=AF=B9=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                                    |  4 ++--
 src/pages/index/components/todo-com/task.vue        | 11 +++++++++--
 src/pages/index/components/todo.vue                 |  6 +++++-
 src/pages/learningTasks/components/content-item.vue |  4 ++--
 src/pages/learningTasks/components/details-item.vue |  2 +-
 src/pages/learningTasks/details.vue                 |  5 ++---
 6 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/.env.development b/.env.development
index 93437482..a2d38ce8 100644
--- a/.env.development
+++ b/.env.development
@@ -5,14 +5,14 @@ ENV = 'development'
 #VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7001'
 
 
-VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
+#VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
 
 
 # DEV
 #VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001'
 
 # sit
-#VITE_APP_BASE_API_Url = 'http://25.18.122.91:9786'
+VITE_APP_BASE_API_Url = 'http://25.18.122.91:9786'
 
 # UAT
 # VITE_APP_BASE_API_Url = 'http://25.18.122.78:9786'
diff --git a/src/pages/index/components/todo-com/task.vue b/src/pages/index/components/todo-com/task.vue
index 20cb79aa..5fa26947 100644
--- a/src/pages/index/components/todo-com/task.vue
+++ b/src/pages/index/components/todo-com/task.vue
@@ -14,10 +14,10 @@
 			<view class="item-info-item inline-item">
 				<view class="bg-block inline-item">
 					<view class="bg-gray">
-						<view class="bg-blue" :style="`width: ${ dataInfo.progress }%;`"></view>
+						<view class="bg-blue" :style="`width: ${ progress };`"></view>
 					</view>
 				</view>
-				<view class="color-blue inline-item">{{dataInfo.progress}}%</view>
+				<view class="color-blue inline-item">{{progress}}</view>
 			</view>
 		</view>
 		<view class="item-btn">做任务</view>
@@ -25,6 +25,7 @@
 </template>
 
 <script setup>
+	import {computed } from 'vue';
 	const props = defineProps({
 		dataInfo: {
 			default: () => ({
@@ -33,6 +34,12 @@
 			type: Object
 		}
 	})
+	const progress = computed(() => {
+		const total = props.dataInfo.sumCrs ?? props.dataInfo.taskNumber ?? 0;
+		if (total === 0) return '0%';
+		const completed = props.dataInfo.finishCrs ?? props.dataInfo.learnedNumber ?? 0;
+		return Math.min(Math.round((completed / total) * 1000) / 10, 100) + '%';
+	});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/pages/index/components/todo.vue b/src/pages/index/components/todo.vue
index 5f8688b9..07a545ba 100644
--- a/src/pages/index/components/todo.vue
+++ b/src/pages/index/components/todo.vue
@@ -38,6 +38,7 @@
 		page: 1,
 		limit: 10
 	});
+	
 	const changeDate = (date) => {
 		activeDate.value = date;
 		getDataList(date, 1);
@@ -91,7 +92,10 @@
 				common.setPageCache('learning_tasks_details', {
 					...item,
 					taskId: item.id,
-					taskName: item.name
+					taskName: item.name,
+					taskSums:item.planPersionNumber,
+					taskFinishSums:item.realPersionNumber,
+					ossAddr:item.ossKey,
 				});
 				common.navigateTo('/pages/learningTasks/details?taskId=' + item.id);
 				break;
diff --git a/src/pages/learningTasks/components/content-item.vue b/src/pages/learningTasks/components/content-item.vue
index 5586e011..e65e6058 100644
--- a/src/pages/learningTasks/components/content-item.vue
+++ b/src/pages/learningTasks/components/content-item.vue
@@ -49,7 +49,7 @@
 		const total = item.value.sumCrs ?? item.value.taskNumber ?? 0;
 		if (total === 0) return '0%';
 		const completed = item.value.finishCrs ?? item.value.learnedNumber ?? 0;
-		return Math.min(Math.round((completed / total) * 10000) / 100, 100) + '%';
+		return Math.min(Math.round((completed / total) * 1000) / 10, 100) + '%';
 	});
 	const getStatusClass = (item) => {
 		if (item.isFinish === '02') return 'completed';
@@ -65,7 +65,7 @@
 				return common.msg('任务已结束');
 			}
 		}
-
+		
 		setPageCache('learning_tasks_details', item);
 		common.navigateTo('/pages/learningTasks/details?taskId=' + item.taskId);
 	};
diff --git a/src/pages/learningTasks/components/details-item.vue b/src/pages/learningTasks/components/details-item.vue
index 67fc81a4..985e5284 100644
--- a/src/pages/learningTasks/components/details-item.vue
+++ b/src/pages/learningTasks/components/details-item.vue
@@ -96,7 +96,7 @@
 		} else {
 			styleArray.push('not_unlocked');
 		}
-		console.log('styleArray', styleArray);
+		// console.log('styleArray', styleArray);
 		return styleArray;
 	});
 
diff --git a/src/pages/learningTasks/details.vue b/src/pages/learningTasks/details.vue
index dc360999..7d9246a0 100644
--- a/src/pages/learningTasks/details.vue
+++ b/src/pages/learningTasks/details.vue
@@ -94,13 +94,12 @@
 	const data_list = ref([]);
 	const total = ref(-1);
 	const taskId = ref('');
-	// const progress = computed(() => '30%');
 	const progress = computed(() => {
 		// 计算进度百分比（保留两位小数）
 		const total = detailData.sumCrs ?? detailData.taskNumber ?? 0;
 		if (total === 0) return '0%';
 		const completed = detailData.finishCrs ?? detailData.learnedNumber ?? 0;
-		return Math.min(Math.round((completed / total) * 10000) / 100, 100) + '%';
+		return Math.min(Math.round((completed / total) * 1000) / 10, 100) + '%';
 	});
 	const queryList = async (pageNo, pageSize, from) => {
 		const requests = [queryAllTraTaskCrsInfo({ taskId: taskId.value })];
@@ -217,7 +216,7 @@
 	onMounted(() => {
 		pagingRef.value.reload();
 	});
-	onShow(() => {});
+	
 	onLoad((e) => {
 		taskId.value = e.taskId;
 		const learning_tasks_details = getPageCache('learning_tasks_details');