diff --git a/src/App.vue b/src/App.vue index 61c6fb6..1cfbda6 100644 --- a/src/App.vue +++ b/src/App.vue @@ -10,7 +10,6 @@
- -
@@ -29,8 +26,7 @@
{{ - dayjs(data.planDto?.beginTime).format('YYYY-MM-DD HH:mm') + " 至 " + - dayjs(data.planDto?.endTime).format('YYYY-MM-DD HH:mm') + data.planDto?.beginTime + " 至 " + data.planDto?.endTime }}
@@ -39,7 +35,23 @@
{{ data.planDto?.address }}
- {{data.isSignUp ?'已报名':'立即报名'}} + + {{ + data.isRefused ? '审核拒绝' : data.isSignUp? '已报名' :'立即报名' + }} + + + 重新报名 +
@@ -47,7 +59,6 @@ -
@@ -102,11 +113,9 @@
-
-
@@ -198,7 +207,6 @@
-
@@ -211,7 +219,6 @@ @current-change="handleCurrentChange" />
-
@@ -256,18 +263,17 @@
- -
此课程无附件
-
-
- 下载 -
- +
+ 下载 +
@@ -314,7 +320,6 @@ - - + \ No newline at end of file diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index ccc5121..b5507c5 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -229,7 +229,7 @@ - + @@ -267,7 +267,7 @@
-
@@ -290,7 +290,7 @@
-
@@ -306,7 +306,7 @@
-
@@ -364,7 +364,7 @@ const { commit, dispatch, state } = useStore() const store = useStore() const userInfo = computed(() => state.userInfo) const data = computed(() => state.projectInfo) - +console.log(data) onMounted(() => { dispatch('getProjectInfo', { projectId }) }) @@ -407,7 +407,6 @@ const tabChange = (tabs) => { myIndex.value = res.data.myIndex myPoint.value = res.data.myPointsCount }) - tableRankData.value = 12 } const myIndex = ref('') const myPoint = ref('') diff --git a/src/views/roadmap/LearnPath.vue b/src/views/roadmap/LearnPath.vue index c4fa330..a3fe9a4 100644 --- a/src/views/roadmap/LearnPath.vue +++ b/src/views/roadmap/LearnPath.vue @@ -52,7 +52,7 @@
diff --git a/src/views/roadmap/PathChapterDetails.vue b/src/views/roadmap/PathChapterDetails.vue new file mode 100644 index 0000000..947b9dc --- /dev/null +++ b/src/views/roadmap/PathChapterDetails.vue @@ -0,0 +1,33 @@ + + + + diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index 2c923a3..bb4f469 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -219,7 +219,7 @@
-
+
{{ parseInt((data.currentReqCnt || 0) / (data.totalReqCnt || 1) * 100) }}%
@@ -473,6 +470,7 @@ async function toFinish(d) { targetId: data.value.id, logo: ROUTER, type: ROUTER, + taskType: d.type, stageOrChapterId: data.value.currentStageId, taskId: d.id, }); diff --git a/src/views/survey/SurveyDetail.vue b/src/views/survey/SurveyDetail.vue index a5bb3cc..583325e 100644 --- a/src/views/survey/SurveyDetail.vue +++ b/src/views/survey/SurveyDetail.vue @@ -348,7 +348,7 @@ const returnclick = () => { clearInterval(timers) router.back(); }; -const {nextPage,prevPage,hasPrev, hasNext} = useTaskPage() +const {nextPage,prevPage,hasPrev, hasNext} = type==3 ? '' : useTaskPage() const fielPath = ref(import.meta.env.VITE_FILE_PATH); const { data } = useRequest(ASSESSMENT_QUERY(courseId), { id: courseId, type, chapterOrStageId, targetId: infoId ? infoId : 0 }); console.log(data) diff --git a/src/views/testscore/ExternalExamination.vue b/src/views/testscore/ExternalExamination.vue index a1b1561..3bbfee4 100644 --- a/src/views/testscore/ExternalExamination.vue +++ b/src/views/testscore/ExternalExamination.vue @@ -60,7 +60,7 @@
- {{ state.datainfo.externalExplain ? state.datainfo.externalExplain : "暂无考试说明" }} + {{ state.datainfo.examinationExplain ? state.datainfo.examinationExplain : "暂无考试说明" }}