diff --git a/src/views/project/ProjectDetails.vue b/src/views/project/ProjectDetails.vue
index 377bd40..aa6d8f6 100644
--- a/src/views/project/ProjectDetails.vue
+++ b/src/views/project/ProjectDetails.vue
@@ -21,8 +21,8 @@
- {{ i.stageStatusName }}
+ :style="(i.statusName === '已完成' || i.statusName === '进行中') ? 'color:#0060ff' : 'color:#999'">
+ {{ i.statusName || (data.unlockMode === 1 ? '未开始' : '未解锁') }}
@@ -440,8 +435,39 @@ const router = useRouter();
const {data} = useRequest(PROJECT_PROCESS, {
projectId: projectId || courseId,
});
+
+
watch(() => data.value.stageProcessList, () => {
- data.value.stageProcessList.forEach((t)=>{t.stageStatusName = getTaskStatus(t)})
+ // data.value.unlockMode 1自由模式 2闯关模式 3 闯关模式 必修 flag true
+ if (data.value.status === -1) {
+ data.value.stageProcessList.forEach((t) => {
+ t.statusName = '已结束';
+ t.taskProcessList?.forEach((s) => s.statusName = '已结束')
+ })
+ return
+ }
+ if (data.value.unlockMode === 1) {
+ data.value.stageProcessList.forEach((t) => {
+ t.statusName = '进行中'
+ const stageState = t.taskProcessList?.every((s) => {
+ s.statusName = s.status === 1 ? '已完成' : types.value.toName[s.type]
+ return s.status === 1
+ })
+ stageState && (t.statusName = '已完成')
+ })
+ return
+ }
+ data.value.stageProcessList.some((t) => {
+ t.statusName = '已完成'
+ const stageState = t.taskProcessList?.some((s) => {
+ s.unlock = true
+ s.statusName = '已完成'
+ s.status !== 1 && (s.statusName = types.value.toName[s.type])
+ return data.value.unlockMode === 2 ? s.status !== 1 : (s.status !== 1 && s.flag)
+ })
+ stageState && (t.statusName = '进行中');
+ return stageState
+ })
}, {deep: true})
@@ -524,23 +550,6 @@ request(PointList, {projectId: projectId}).then(res => {
console.log(err)
});
-
-function getTaskStatus(d){
- if (data.value.status !== 3) {
- return '已结束'
- }
- if (dayjs().isBefore(dayjs(d.beginTime)) || !d.taskProcessList?.filter(t => t.status === 1)?.length) {
- return '未开始'
- }
- if (dayjs().isAfter(dayjs(data.value.endTime))) {
- return '已结束'
- }
- if (d.taskProcessList?.filter(t => t.status === 1)?.length === d.taskProcessList?.length) {
- return '已完成'
- }
- return '进行中'
-}
-
const loading = ref(false);
loading.value = ElLoading.service({
lock: true,
@@ -630,7 +639,6 @@ const dialogVisibleTip = ref('该任务无法学习,请联系管理员进行
// 判断当前任务已结束及时间意义上的结束 提示用户
function judgeTaskIsEnd(type, endTimes, status) {
// type 任务类型 endTime 结束时间 status 任务状态 (状态 0 未完成 1 已完成 2 未开始 -1 已结束)
- console.log(type, endTimes, status);
let isEnd = false;
let nowTime = new Date().getTime();
let endTime = new Date().getTime(endTimes);
@@ -656,7 +664,10 @@ function judgeTaskIsEnd(type, endTimes, status) {
}
async function toFinish(d, sName, chapterOrStageId) {
- console.log("dddddd", d, sName, chapterOrStageId);
+ if (data.value.unlockMode !==1 && !d.statusName) {
+ ElMessage.warning("当前未解锁")
+ return
+ }
if (judgeTaskIsEnd(d.type, data.value.endTime, data.value.status)) {
ElMessage.error("当前任务已结束")
return
diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue
index 2f0a845..8add397 100644
--- a/src/views/roadmap/PathDetails.vue
+++ b/src/views/roadmap/PathDetails.vue
@@ -1,64 +1,70 @@
-
-
+
+
-
+
-
- {{ data.name }}
-
- 关卡说明>
-
-
+
+ {{ data.name }}
+
+ 关卡说明>
+
+
-
-
-
-
-
-
{{ data.currentStageName }}
-
-
![]()
-
{{stageStatusName}}
-
-
-
-
-
-
- {{ value.name }}
-
-
+
+
+
+
+
+
{{ data.currentStageName }}
+
+
![]()
+
+ {{ data.statusName || (data.unlockMode === 1 ? '未开始' : '未解锁') }}
+
+
+
+
+
+
+
+ {{ value.name }}
+
+
-
- {{ value.name }}
-
-
-
- 必修
-
-
- 选修
-
-
- {{ types.typeName[value.type] || "" }}
-
+
+ {{ value.name }}
+
+
+
+ 必修
+
+
+ 选修
+
+
+ {{ types.typeName[value.type] || "" }}
+
-
-
-
-
-
-
-
-
-
-
-
当前进度
-
-
-
+
+
+
+
+
+
+
+
+
当前进度
+
+
- {{ parseInt(value.currentRatio) }}%
-
-
-
-
-
- {{ value.status === 1 ? "已完成" : types.path[value.type] ? types.toName[value.type] : "未开放" }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
- {{ data.remark || "暂无说明" }}
-
-
+
+
+
+
+
+
+
+
+ {{ data.remark || "暂无说明" }}
+
+
-
-
-
+
+
-
-
-
{{ value.name }}
-
-

-
下载
-
-
-
-
-
-
-
-
-
-
-
-

-
个人信息
-
-
-
-
-
![]()
-
-
-
- {{ userInfo?.realName }}
-
-
-
-
-
-
{{ userInfo?.bandDesc }}
-
-
-
-
-
-

-
学习进度
-
-
+
+
+
{{ value.name }}
+
+

+
下载
+
+
+
+
+
+
+
+
+
+
+
+

+
个人信息
+
+
+
+
+
![]()
+
+
+
+ {{ userInfo?.realName }}
+
+
+
+
+
+
{{ userInfo?.bandDesc }}
+
+
+
+
+
+

+
学习进度
+
+
-
-
上次学到:{{ data.lastLearned }}
-
继续学习
-
-
-
-
总进度
-
-
-
+ 上次学到:{{ data.lastLearned }}
+
+ 继续学习
+
+
+
+
+
总进度
+
+
- {{ parseInt(data.currentChapterCnt / data.totalChapterCnt * 100) }}%
-
-
-
-
-
-
-
必修进度
-
-
-
+
+
必修进度
+
+
- {{ parseInt(data.currentReqCnt / data.totalReqCnt * 100) }}%
-
-
-
-
-
-
-
-
-
-
-
-
- {{ dialogVisibleTip }}
-
+ {{ parseInt(data.currentReqCnt / data.totalReqCnt * 100) }}%
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ dialogVisibleTip }}
+
取消
确定
-
-
+
+
@@ -647,289 +671,289 @@ function continueLearn(taskname, datas){