hz/fe-student
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-student.git synced 2025-12-09 19:06:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'yunxiao/master' into zcwy-zsx

Browse Source
This commit is contained in:
670788339
2024-05-25 22:35:54 +08:00
parent 0e74a6d927 a94ce3f20a
commit 739ba9c626
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/project/ProjectDetails.vue
View File

@@ -70,8 +70,8 @@
</div> </div>
</div> </div>
<el-dropdown trigger="click"> <el-dropdown trigger="click">
<div class="goclass" @click="toFinish(value, i.stageName, i.id)" :style="{ background: (value.statusName !== '已结束' && (value.statusName || data.unlockMode === 1)) ? '#2478ff' : '#999' }"> <div class="goclass" @click="toFinish(value, i.stageName, i.id, i.studyModel)" :style="{ background: (value.statusName !== '已结束' && (value.statusName || data.unlockMode === 1)) ? i.studyModel==0 ? '#2478ff' : '#999' : i.studyModel==0 ? '#2478ff' : '#999' }">
{{ value.statusName || (data.unlockMode === 1 ? TASK_TYPES.toName[value.type] : '未解锁') }} {{ i.studyModel==0 ? value.statusName|| (data.unlockMode === 1 ? i.studyModel==0 ? TASK_TYPES.toName[value.type] : '未解锁' : i.studyModel==0 ? TASK_TYPES.toName[value.type] : '未解锁') : (data.unlockMode === 1 ? i.studyModel==0 ? TASK_TYPES.toName[value.type] : '未解锁' : i.studyModel==0 ? TASK_TYPES.toName[value.type] : '未解锁') }}
</div> </div>
<!-- <template #dropdown v-if="value.type===2 && value.targetId?.split(',')?.length > 1"> <!-- <template #dropdown v-if="value.type===2 && value.targetId?.split(',')?.length > 1">
<el-dropdown-menu> <el-dropdown-menu>
@@ -463,8 +463,8 @@ function judgeTaskIsEnd(type, endTimes, status) {
return isEnd; return isEnd;
} }
async function toFinish(d, sName, chapterOrStageId) { async function toFinish(d, sName, chapterOrStageId, studyModel) {
if (data.value.unlockMode !== 1 && !d.statusName) { if (studyModel != 0) {
ElMessage.warning("当前未解锁") ElMessage.warning("当前未解锁")
return return
} }