mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-student.git
synced 2025-12-10 11:26:49 +08:00
修改阶段状态
This commit is contained in:
@@ -21,8 +21,8 @@
|
|||||||
<div class="titleR" :style="{ display: 'flex' }">
|
<div class="titleR" :style="{ display: 'flex' }">
|
||||||
<img src="../../assets/image/pathdetails/circle.png"/>
|
<img src="../../assets/image/pathdetails/circle.png"/>
|
||||||
<div class="titleRT"
|
<div class="titleRT"
|
||||||
:style="(i.stageStatusName === '未开始' || i.stageStatusName === '已结束') && 'color:#999'">
|
:style="(i.statusName === '已完成' || i.statusName === '进行中') ? 'color:#0060ff' : 'color:#999'">
|
||||||
{{ i.stageStatusName }}
|
{{ i.statusName || (data.unlockMode === 1 ? '未开始' : '未解锁') }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<!-- <div class="titleR" :style="{ display: i.status === 2 ? 'flex' : 'none' }">
|
<!-- <div class="titleR" :style="{ display: i.status === 2 ? 'flex' : 'none' }">
|
||||||
@@ -90,14 +90,9 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="goclass" @click="toFinish(value, i.stageName, i.stageId)">
|
<div class="goclass" @click="toFinish(value, i.stageName, i.stageId)"
|
||||||
{{
|
:style="{background:(value.statusName !=='已结束' && (value.statusName || data.unlockMode === 1)) ?'#2478ff':'#999'}">
|
||||||
value.status === 1
|
{{ value.statusName || (data.unlockMode === 1 ? types.toName[value.type] : '未解锁') }}
|
||||||
? "已完成"
|
|
||||||
: types.path[value.type]
|
|
||||||
? types.toName[value.type]
|
|
||||||
: "未开放"
|
|
||||||
}}
|
|
||||||
</div>
|
</div>
|
||||||
<!-- <div :style="{ display: value.status === 1 ? 'block' : 'none' }">-->
|
<!-- <div :style="{ display: value.status === 1 ? 'block' : 'none' }">-->
|
||||||
<!-- <div-->
|
<!-- <div-->
|
||||||
@@ -440,8 +435,39 @@ const router = useRouter();
|
|||||||
const {data} = useRequest(PROJECT_PROCESS, {
|
const {data} = useRequest(PROJECT_PROCESS, {
|
||||||
projectId: projectId || courseId,
|
projectId: projectId || courseId,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
watch(() => data.value.stageProcessList, () => {
|
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})
|
}, {deep: true})
|
||||||
|
|
||||||
|
|
||||||
@@ -524,23 +550,6 @@ request(PointList, {projectId: projectId}).then(res => {
|
|||||||
console.log(err)
|
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);
|
const loading = ref(false);
|
||||||
loading.value = ElLoading.service({
|
loading.value = ElLoading.service({
|
||||||
lock: true,
|
lock: true,
|
||||||
@@ -630,7 +639,6 @@ const dialogVisibleTip = ref('该任务无法学习,请联系管理员进行
|
|||||||
// 判断当前任务已结束及时间意义上的结束 提示用户
|
// 判断当前任务已结束及时间意义上的结束 提示用户
|
||||||
function judgeTaskIsEnd(type, endTimes, status) {
|
function judgeTaskIsEnd(type, endTimes, status) {
|
||||||
// type 任务类型 endTime 结束时间 status 任务状态 (状态 0 未完成 1 已完成 2 未开始 -1 已结束)
|
// type 任务类型 endTime 结束时间 status 任务状态 (状态 0 未完成 1 已完成 2 未开始 -1 已结束)
|
||||||
console.log(type, endTimes, status);
|
|
||||||
let isEnd = false;
|
let isEnd = false;
|
||||||
let nowTime = new Date().getTime();
|
let nowTime = new Date().getTime();
|
||||||
let endTime = new Date().getTime(endTimes);
|
let endTime = new Date().getTime(endTimes);
|
||||||
@@ -656,7 +664,10 @@ function judgeTaskIsEnd(type, endTimes, status) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function toFinish(d, sName, chapterOrStageId) {
|
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)) {
|
if (judgeTaskIsEnd(d.type, data.value.endTime, data.value.status)) {
|
||||||
ElMessage.error("当前任务已结束")
|
ElMessage.error("当前任务已结束")
|
||||||
return
|
return
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user