diff --git a/src/App.vue b/src/App.vue index 61e36da..b147a29 100644 --- a/src/App.vue +++ b/src/App.vue @@ -36,7 +36,7 @@ import {useStore} from "vuex"; import {onMounted} from "vue"; import router from "@/router"; -console.log("版本1.0.5------------"); +console.log("版本1.0.6------------"); const store = useStore(); onMounted(() => { getUserInfo(); diff --git a/src/components/PathDetailImage.vue b/src/components/PathDetailImage.vue index cc58d73..1cca01b 100644 --- a/src/components/PathDetailImage.vue +++ b/src/components/PathDetailImage.vue @@ -3,7 +3,9 @@
+ class="nameClass" + :title="item.name" + :style="{background: `url('${current===i?currentBack:nameBack}')`,backgroundSize:'100%',width:`${current===i?107:93}px`,height:`${current===i?80:70}px`,lineHeight:'50px',color:'#FFF'}"> {{ item.name }}
@@ -31,11 +33,12 @@ const imageAttrs = { width: 1437, height: 594, positions: [ - {left: 84, top: 518}, - {left: 307, top: 370}, - {left: 848, top: 275}, - {left: 617, top: 69}, - {left: 1047, top: 42}, + {left: 63, top: 503}, + {left: 828, top: 455}, + {left: 268, top: 325}, + {left: 1087, top: 183}, + {left: 647, top: 84}, + {left: 1180, top: 40}, ] } } @@ -79,4 +82,12 @@ function close() { position: absolute; cursor: pointer; } +.nameClass{ + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + -o-text-overflow: ellipsis; + padding:0 20px 0 50px; + font-size: 12px; +} \ No newline at end of file diff --git a/src/views/faceteach/FaceTeachSignUp.vue b/src/views/faceteach/FaceTeachSignUp.vue index ce4d1a1..e50dbab 100644 --- a/src/views/faceteach/FaceTeachSignUp.vue +++ b/src/views/faceteach/FaceTeachSignUp.vue @@ -1,504 +1,504 @@ diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue index 19abed3..d85c454 100644 --- a/src/views/project/ProjectDetails.vue +++ b/src/views/project/ProjectDetails.vue @@ -451,11 +451,11 @@ function toFinish(d, sName, chapterOrStageId) { return; } if (d.type == 3 || d.type == 7) { - request(STUDY_RECORD, { + d.status || request(STUDY_RECORD, { studentId: data.value.userInfoBo.userId, targetId: data.value.routerId, logo: 2, - stageOrChapterId: chapterId, + stageOrChapterId: chapterOrStageId, taskId: d.projectTaskId, }); } diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index 839e4a8..9ec08a1 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -88,7 +88,7 @@
当前进度
-
- {{ value.currentRatio * 100 }}% + {{ value.currentRatio }}%
@@ -118,7 +118,7 @@
- {{ value.currentRatio === 1 ? "已完成" : types.path[value.type] ? types.toName[value.type] : "未开放" }} + {{ value.status === 1 ? "已完成" : types.path[value.type] ? types.toName[value.type] : "未开放" }}
@@ -460,7 +460,7 @@ function toFinish(d) { } } if (d.type === 3 || d.type === 7) { - request(STUDY_RECORD, { + d.status || request(STUDY_RECORD, { studentId: userInfo.value.id, targetId: data.value.routerId, logo: 1, @@ -477,8 +477,8 @@ function toFinish(d) { router.push({ path: types.value.path[d.type], query: { - // id: d.routerTaskId, - id: routerId, + id: d.routerTaskId, + // id: routerId, type: 1, taskId: routerId, taskIds: routerId,