diff --git a/.env.development b/.env.development
index ba6775df..88d981fc 100644
--- a/.env.development
+++ b/.env.development
@@ -5,6 +5,7 @@ ENV = 'development'
#VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7001'
+
VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7003'
@@ -12,7 +13,7 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7003'
#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 @@
-
+
- {{dataInfo.progress}}%
+ {{progress}}
做任务
@@ -25,6 +25,7 @@
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');