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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source 
# Conflicts:
#	src/views/project/ProjectDetails.vue
This commit is contained in:
yuping
2022-12-30 16:18:26 +08:00
parent 76588c05a1 4d9b51b3ce
commit 6eb6bacc9c
8 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -401,6 +401,7 @@ function judgeTaskIsEnd(type, endTimes, status) {
function toFinish(d, sName, chapterOrStageId) {
console.log("dddddd", d, sName, chapterOrStageId);
if(judgeTaskIsEnd(d.type ,data.value.endTime, data.value.status)){
ElMessage.error("当前任务已结束")
return
@@ -496,6 +497,7 @@ function toFinish(d, sName, chapterOrStageId) {
taskId: d.projectTaskId,
});
}
if (typeof types.value.path[d.type] === "string") {
types.value.path[d.type] &&
types.value.path[d.type].startsWith("http") &&