@@ -115,7 +115,7 @@
- {{ data.remark || "暂无公告" }}
+ {{ data.notice || "暂无公告" }}
-
{{ dialogVisibleTip }}
取消
- 确定
+ 确定
@@ -374,18 +370,18 @@ const dialogVisibleTip = ref('该任务无法学习，请联系管理员进行
// }
function introductionPro() {
- dialogVisibleTip.value =data.value.remark;
+ dialogVisibleTip.value = data.value.remark;
dialogVisible.value = true;
}
-function toFinish(d, sName, chapterId) {
- console.log("dddddd", d, sName);
+function toFinish(d, sName, chapterOrStageId) {
+ console.log("dddddd", d, sName, chapterOrStageId);
// 作业过期判断
if (d.type == 4) {
let date1 = new Date(d.endTime).getTime();
let date2 = new Date().getTime();
if (date1 < date2) {
- dialogVisibleTip.value ='当前作业已结束';
+ dialogVisibleTip.value = '当前作业已结束';
dialogVisible.value = true;
// ElMessage.error("当前作业已结束")
return
@@ -396,7 +392,7 @@ function toFinish(d, sName, chapterId) {
let date1 = new Date(d.endTime).getTime();
let date2 = new Date().getTime();
if (date1 < date2) {
- dialogVisibleTip.value ='当前直播已结束';
+ dialogVisibleTip.value = '当前直播已结束';
dialogVisible.value = true;
return
}
@@ -405,7 +401,7 @@ function toFinish(d, sName, chapterId) {
if (d.type == 5) {
if (d.taskStatus == 1 || d.taskStatus == 2) {
// ElMessage.error("该任务无法学习，请联系管理员进行替换。")
- dialogVisibleTip.value ='该任务无法学习，请联系管理员进行替换！';
+ dialogVisibleTip.value = '该任务无法学习，请联系管理员进行替换！';
dialogVisible.value = true;
return
}
@@ -414,7 +410,7 @@ function toFinish(d, sName, chapterId) {
if (d.type == 11) {
if (d.taskStatus == 1 || d.taskStatus == 2) {
// ElMessage.error("该任务无法学习，请联系管理员进行替换。")
- dialogVisibleTip.value ='该任务无法学习，请联系管理员进行替换！';
+ dialogVisibleTip.value = '该任务无法学习，请联系管理员进行替换！';
dialogVisible.value = true;
return
}
@@ -424,7 +420,7 @@ function toFinish(d, sName, chapterId) {
let date1 = new Date(d.endTime).getTime();
let date2 = new Date().getTime();
if (date1 < date2) {
- dialogVisibleTip.value ='当前活动已结束';
+ dialogVisibleTip.value = '当前活动已结束';
dialogVisible.value = true;
return
}
@@ -433,7 +429,7 @@ function toFinish(d, sName, chapterId) {
if (d.type == 1) {
if (d.taskStatus == 1 || d.taskStatus == 2) {
// ElMessage.error("该任务无法学习，请联系管理员进行替换。")
- dialogVisibleTip.value ='该任务无法学习，请联系管理员进行替换！';
+ dialogVisibleTip.value = '该任务无法学习，请联系管理员进行替换！';
dialogVisible.value = true;
return
}
@@ -442,7 +438,7 @@ function toFinish(d, sName, chapterId) {
if (d.type == 2) {
if (d.taskStatus == 1 || d.taskStatus == 2) {
// ElMessage.error("该任务无法学习，请联系管理员进行替换。")
- dialogVisibleTip.value ='该任务无法学习，请联系管理员进行替换！';
+ dialogVisibleTip.value = '该任务无法学习，请联系管理员进行替换！';
dialogVisible.value = true;
return
}
@@ -475,6 +471,7 @@ function toFinish(d, sName, chapterId) {
courseId: d.courseId,
pName: data.value.name,
sName,
+ chapterOrStageId
},
});
} else if (typeof types.value.path[d.type] === "function") {
@@ -491,21 +488,23 @@ function whiteTypes(type) {
.el-dialog__header {
display: none;
}
+
.crumb {
color: #fff;
display: flex;
font-size: 14px;
line-height: 24px;
+
.return {
position: absolute;
right: 10%;
.text {
- text-align: center;
- display: flex;
- flex-direction: row;
- align-items: center;
- }
+ text-align: center;
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ }
}
}
diff --git a/src/views/roadmap/LearnPath.vue b/src/views/roadmap/LearnPath.vue
index 7a25d22..412d4f2 100644
--- a/src/views/roadmap/LearnPath.vue
+++ b/src/views/roadmap/LearnPath.vue
@@ -1,79 +1,80 @@
-
-
-
-
-
学习路径图
-
-
-
{{ userInfo.jobName }}
-
-
-
-
{{ userInfo.bandDesc }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 返回列表
-
-
-
-
-
-
-
- ![]()
-
-
-
-
-
- {{ scope.row.remark }}
-
-
-
+
+
+
+
+
学习路径图
+
+
+
{{ userInfo.jobName }}
+
+
+
+
{{ userInfo.bandDesc }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 返回列表
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+ {{ scope.row.remark }}
+
+
+
-
-
- ![]()
+
+ ![]()
-
-
-
-
-
-
-
-
-
-
-
![]()
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue
index 283789e..338c838 100644
--- a/src/views/roadmap/PathDetails.vue
+++ b/src/views/roadmap/PathDetails.vue
@@ -1,12 +1,12 @@
-
-
-
-
{{ routerName }}
-
/
-
路径图详情
+
+
+
+
{{ routerName }}
+
/
+
路径图详情
-
+
返回
@@ -65,307 +65,259 @@
{{ types.typeName[value.type] || "" }}
-
-
-
-
-
-
-
-
-
-
-
当前进度
-
-
-
-
-
+
+
+
+
+
+
+
+
+
当前进度
+
+
+
+
+
- {{ value.currentRatio }}%
-
-
-
-
-
- {{
- value.status === 1
- ? "已完成"
- : types.path[value.type]
- ? types.toName[value.type]
- : "未开放"
- }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
- {{ data.remark || "暂无公告" }}
-
-
-
+
+
+
+
+
+ {{ data.remark || "暂无公告" }}
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
个人信息
-
-
-
-
-
![]()
-
-
-
- {{ userInfo?.realName }}
-
-
-
-
-
-
{{ userInfo?.bandDesc }}
-
-
-
-
-
-
-
学习进度
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
个人信息
+
+
+
+
+
![]()
+
+
+
+ {{ userInfo?.realName }}
+
+
+
+
+
+
{{ userInfo?.bandDesc }}
+
+
+
+
+
+
+
学习进度
+
+
+
-
-
-
总进度
-
-
-
-
-
- {{ parseInt(data.currentChapterCnt/data.totalChapterCnt * 100) }}%
-
-
-
-
-
-
-
必修进度
-
-
-
-
-
+
+
总进度
+
+
+
+
+
+ {{ parseInt(data.currentChapterCnt / data.totalChapterCnt * 100) }}%
+
+
+
+
+
+
+
必修进度
+
+
+
+
+
- {{ parseInt(data.currentReqCnt/data.totalReqCnt * 100) }}%
-
-
-
-
-
-
-
-
-
-
-
-
+ {{ parseInt(data.currentReqCnt / data.totalReqCnt * 100) }}%
+
+
+
- 
- 
- 
- 
-