Merge branch 'master' into zcwy-zsx

src/views/project/ProjectDetails.vue

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