fix:任务ID传递

This commit is contained in:
wyx
2023-02-14 00:39:07 +08:00
parent ff8533e607
commit ec533355d0
3 changed files with 63 additions and 43 deletions

View File

@@ -794,6 +794,7 @@ export default {
projectTaskId: props.projectTaskId || 0, projectTaskId: props.projectTaskId || 0,
stageId: props.chooseStageId || 0, stageId: props.chooseStageId || 0,
type: 2, type: 2,
id: props.taskIdDraft
}) })
.then(() => { .then(() => {
//message.success(`${props.EditFaceId ? "编辑" : "新增"}阶段任务成功` ); //message.success(`${props.EditFaceId ? "编辑" : "新增"}阶段任务成功` );

View File

@@ -427,6 +427,10 @@ export default {
type: Number, type: Number,
default: null, default: null,
}, },
taskCourseID: {
type: Number,
default: null,
},
isactive: { isactive: {
type: Number, type: Number,
default: null, default: null,
@@ -667,7 +671,7 @@ export default {
state.test.targetId = 0; state.test.targetId = 0;
state.test.type = 0; state.test.type = 0;
state.test.chapterId=0; state.test.chapterId=0;
state.test.id = props.taskIdDraft; state.test.id = props.taskCourseID;
console.log("props.offCourseId",props.offCourseId); console.log("props.offCourseId",props.offCourseId);
if (props.faceLevel && props.offCourseId > 0) { if (props.faceLevel && props.offCourseId > 0) {
state.test.targetId = props.offCourseId; state.test.targetId = props.offCourseId;
@@ -755,7 +759,7 @@ export default {
examinationName:state.test1.externalName, examinationName:state.test1.externalName,
examinationExplain:state.test1.externalExplain, examinationExplain:state.test1.externalExplain,
source:state.test1.source, source:state.test1.source,
id: props.taskIdDraft id: props.EditTestId
} }
updateExternalExam(obj) updateExternalExam(obj)
.then(async (res) => { .then(async (res) => {

View File

@@ -204,7 +204,7 @@
v-model:isactive="isactive" v-model:routerId="routerId" v-model:routerTaskId="routerTaskId" v-model:isactive="isactive" v-model:routerId="routerId" v-model:routerTaskId="routerTaskId"
v-model:projectId="projectId" v-model:chooseStageId="chooseStageId" v-model:projectId="projectId" v-model:chooseStageId="chooseStageId"
v-model:projectTaskId="projectTaskId" v-model:edit="edit" v-model:EditOnlineId="EditOnlineId" v-model:projectTaskId="projectTaskId" v-model:edit="edit" v-model:EditOnlineId="EditOnlineId"
:isLevel="isLevel" v-model:taskIdDraft="taskIdDraft" /> :isLevel="isLevel" v-model:taskIdDraft="taskIdDraft" v-model:taskCourseID="taskCourseID" />
</div> </div>
<!-- 添加在线侧弹窗 --> <!-- 添加在线侧弹窗 -->
<div class="lin"></div> <div class="lin"></div>
@@ -219,7 +219,7 @@
<!-- 添加面授 --> <!-- 添加面授 -->
<add-faceteach @changeData="updateTableData" v-model:edit="edit" v-model:isactive="isactive" <add-faceteach @changeData="updateTableData" v-model:edit="edit" v-model:isactive="isactive"
v-model:routerId="routerId" v-model:chooseStageId="chooseStageId" v-model:routerTaskId="routerTaskId" v-model:routerId="routerId" v-model:chooseStageId="chooseStageId" v-model:routerTaskId="routerTaskId"
v-model:addfaceteachVisible="addfaceteachVisible" v-model:EditFaceId="EditFaceId" :isLevel="isLevel" v-model:taskIdDraft="taskIdDraft" /> v-model:addfaceteachVisible="addfaceteachVisible" v-model:EditFaceId="EditFaceId" :isLevel="isLevel" v-model:taskIdDraft="taskIdDraft" v-model:taskCourseID="taskCourseID" />
<!-- 添加面授 --> <!-- 添加面授 -->
<div class="lin"></div> <div class="lin"></div>
</div> </div>
@@ -236,7 +236,7 @@
v-model:isactive="isactive" v-model:routerId="routerId" v-model:routerTaskId="routerTaskId" v-model:isactive="isactive" v-model:routerId="routerId" v-model:routerTaskId="routerTaskId"
v-model:projectId="projectId" v-model:chooseStageId="chooseStageId" v-model:projectId="projectId" v-model:chooseStageId="chooseStageId"
v-model:projectTaskId="projectTaskId" v-model:edit="edit" v-model:EditCaseId="EditCaseId" v-model:projectTaskId="projectTaskId" v-model:edit="edit" v-model:EditCaseId="EditCaseId"
:isLevel="isLevel" v-model:taskIdDraft="taskIdDraft" /> :isLevel="isLevel" v-model:taskIdDraft="taskIdDraft" v-model:taskCourseID="taskCourseID" />
</div> </div>
<!-- 添加案例侧弹窗 --> <!-- 添加案例侧弹窗 -->
<div class="lin"></div> <div class="lin"></div>
@@ -253,7 +253,7 @@
<add-homework v-model:addhomeworkVisible="addhomeworkvisible" :isLevel="isLevel" <add-homework v-model:addhomeworkVisible="addhomeworkvisible" :isLevel="isLevel"
@changeData="updateTableData" v-model:isactive="isactive" v-model:edit="edit" @changeData="updateTableData" v-model:isactive="isactive" v-model:edit="edit"
v-model:routerId="routerId" v-model:chooseStageId="chooseStageId" v-model:EditWorkId="EditWorkId" v-model:routerId="routerId" v-model:chooseStageId="chooseStageId" v-model:EditWorkId="EditWorkId"
v-model:routerTaskId="routerTaskId" v-model:taskIdDraft="taskIdDraft" /> v-model:routerTaskId="routerTaskId" v-model:taskIdDraft="taskIdDraft" v-model:taskCourseID="taskCourseID" />
</div> </div>
<div class="lin"></div> <div class="lin"></div>
</div> </div>
@@ -269,7 +269,7 @@
<add-test v-model:addtestVisible="addtestvisible" :isLevel="isLevel" @changeData="updateTableData" <add-test v-model:addtestVisible="addtestvisible" :isLevel="isLevel" @changeData="updateTableData"
v-model:isactive="isactive" v-model:edit="edit" v-model:routerId="routerId" v-model:isactive="isactive" v-model:edit="edit" v-model:routerId="routerId"
v-model:chooseStageId="chooseStageId" v-model:EditTestId="EditTestId" v-model:chooseStageId="chooseStageId" v-model:EditTestId="EditTestId"
v-model:routerTaskId="routerTaskId" v-model:taskIdDraft="taskIdDraft" /> v-model:routerTaskId="routerTaskId" v-model:taskIdDraft="taskIdDraft" v-model:taskCourseID="taskCourseID" />
</div> </div>
<div class="lin"></div> <div class="lin"></div>
</div> </div>
@@ -283,7 +283,7 @@
<div> <div>
<add-live v-model:addliveVisible="addlivevisible" :isLevel="isLevel" @changeData="updateTableData" <add-live v-model:addliveVisible="addlivevisible" :isLevel="isLevel" @changeData="updateTableData"
v-model:isactive="isactive" v-model:routerId="routerId" v-model:chooseStageId="chooseStageId" v-model:isactive="isactive" v-model:routerId="routerId" v-model:chooseStageId="chooseStageId"
v-model:routerTaskId="routerTaskId" v-model:edit="edit" v-model:EditLiveId="EditLiveId" v-model:taskIdDraft="taskIdDraft" /> v-model:routerTaskId="routerTaskId" v-model:edit="edit" v-model:EditLiveId="EditLiveId" v-model:taskIdDraft="taskIdDraft" v-model:taskCourseID="taskCourseID" />
</div> </div>
<div class="lin"></div> <div class="lin"></div>
</div> </div>
@@ -297,7 +297,7 @@
<div> <div>
<add-ref v-model:addrefVisible="addrefvisible" :isLevel="isLevel" @changeData="updateTableData" <add-ref v-model:addrefVisible="addrefvisible" :isLevel="isLevel" @changeData="updateTableData"
v-model:isactive="isactive" v-model:routerId="routerId" v-model:chooseStageId="chooseStageId" v-model:isactive="isactive" v-model:routerId="routerId" v-model:chooseStageId="chooseStageId"
v-model:routerTaskId="routerTaskId" v-model:edit="edit" v-model:EditRefId="EditRefId" v-model:taskIdDraft="taskIdDraft" /> v-model:routerTaskId="routerTaskId" v-model:edit="edit" v-model:EditRefId="EditRefId" v-model:taskIdDraft="taskIdDraft" v-model:taskCourseID="taskCourseID" />
</div> </div>
<div class="lin"></div> <div class="lin"></div>
</div> </div>
@@ -313,7 +313,7 @@
<add-discuss v-model:adddiscussVisible="adddiscussvisible" @changeData="updateTableData" <add-discuss v-model:adddiscussVisible="adddiscussvisible" @changeData="updateTableData"
:isLevel="isLevel" v-model:isactive="isactive" v-model:edit="edit" v-model:routerId="routerId" :isLevel="isLevel" v-model:isactive="isactive" v-model:edit="edit" v-model:routerId="routerId"
v-model:chooseStageId="chooseStageId" v-model:routerTaskId="routerTaskId" v-model:chooseStageId="chooseStageId" v-model:routerTaskId="routerTaskId"
v-model:EditDiscussId="EditDiscussId" v-model:taskIdDraft="taskIdDraft" /> v-model:EditDiscussId="EditDiscussId" v-model:taskIdDraft="taskIdDraft" v-model:taskCourseID="taskCourseID" />
</div> </div>
<div class="lin"></div> <div class="lin"></div>
</div> </div>
@@ -328,7 +328,7 @@
<add-active v-model:addactiveVisible="addactivevisible" :isLevel="isLevel" v-model:edit="edit" <add-active v-model:addactiveVisible="addactivevisible" :isLevel="isLevel" v-model:edit="edit"
v-model:isactive="isactive" @changeData="updateTableData" v-model:routerId="routerId" v-model:isactive="isactive" @changeData="updateTableData" v-model:routerId="routerId"
v-model:chooseStageId="chooseStageId" v-model:routerTaskId="routerTaskId" v-model:chooseStageId="chooseStageId" v-model:routerTaskId="routerTaskId"
v-model:EditActiveId="EditActiveId" v-model:taskIdDraft="taskIdDraft" /> v-model:EditActiveId="EditActiveId" v-model:taskIdDraft="taskIdDraft" v-model:taskCourseID="taskCourseID" />
</div> </div>
<div class="lin"></div> <div class="lin"></div>
</div> </div>
@@ -344,7 +344,7 @@
v-model:isactive="isactive" v-model:routerId="routerId" v-model:routerTaskId="routerTaskId" v-model:isactive="isactive" v-model:routerId="routerId" v-model:routerTaskId="routerTaskId"
v-model:projectId="projectId" v-model:chooseStageId="chooseStageId" v-model:projectId="projectId" v-model:chooseStageId="chooseStageId"
v-model:projectTaskId="projectTaskId" v-model:edit="edit" v-model:EditEvalId="EditEvalId" v-model:projectTaskId="projectTaskId" v-model:edit="edit" v-model:EditEvalId="EditEvalId"
:isLevel="isLevel" v-model:taskIdDraft="taskIdDraft" /> :isLevel="isLevel" v-model:taskIdDraft="taskIdDraft" v-model:taskCourseID="taskCourseID" />
</div> </div>
<!-- 添加测评侧弹窗 --> <!-- 添加测评侧弹窗 -->
</div> </div>
@@ -361,7 +361,7 @@
<add-invist v-model:addinvistVisible="addinvistvisible" :isLevel="isLevel" @changeData="updateTableData" <add-invist v-model:addinvistVisible="addinvistvisible" :isLevel="isLevel" @changeData="updateTableData"
v-model:isactive="isactive" v-model:edit="edit" v-model:routerId="routerId" v-model:isactive="isactive" v-model:edit="edit" v-model:routerId="routerId"
v-model:chooseStageId="chooseStageId" v-model:EditInvistId="EditInvistId" v-model:chooseStageId="chooseStageId" v-model:EditInvistId="EditInvistId"
v-model:routerTaskId="routerTaskId" v-model:taskIdDraft="taskIdDraft" /> v-model:routerTaskId="routerTaskId" v-model:taskIdDraft="taskIdDraft" v-model:taskCourseID="taskCourseID" />
</div> </div>
<!-- 添加评估侧弹窗 --> <!-- 添加评估侧弹窗 -->
</div> </div>
@@ -379,7 +379,7 @@
<add-vote v-model:addvoteVisible="addvotevisible" :isLevel="isLevel" @changeData="updateTableData" <add-vote v-model:addvoteVisible="addvotevisible" :isLevel="isLevel" @changeData="updateTableData"
v-model:isactive="isactive" v-model:edit="edit" v-model:routerId="routerId" v-model:isactive="isactive" v-model:edit="edit" v-model:routerId="routerId"
v-model:chooseStageId="chooseStageId" v-model:EditVoteId="EditVoteId" v-model:chooseStageId="chooseStageId" v-model:EditVoteId="EditVoteId"
v-model:routerTaskId="routerTaskId" v-model:taskIdDraft="taskIdDraft" /> v-model:routerTaskId="routerTaskId" v-model:taskIdDraft="taskIdDraft" v-model:taskCourseID="taskCourseID" />
</div> </div>
</div> </div>
@@ -396,7 +396,7 @@
<add-project v-model:addprojvisible="addprojvisible" :isLevel="isLevel" @changeData="updateTableData" <add-project v-model:addprojvisible="addprojvisible" :isLevel="isLevel" @changeData="updateTableData"
v-model:isactive="isactive" v-model:edit="edit" v-model:routerId="routerId" v-model:isactive="isactive" v-model:edit="edit" v-model:routerId="routerId"
v-model:chooseStageId="chooseStageId" v-model:EditProjectId="EditProjectId" v-model:chooseStageId="chooseStageId" v-model:EditProjectId="EditProjectId"
v-model:routerTaskId="routerTaskId" v-model:chooseProjectList="chooseProjectList" v-model:taskIdDraft="taskIdDraft" /> v-model:routerTaskId="routerTaskId" v-model:chooseProjectList="chooseProjectList" v-model:taskIdDraft="taskIdDraft" v-model:taskCourseID="taskCourseID" />
</div> </div>
</div> </div>
</div> </div>
@@ -550,7 +550,8 @@
element.lei, element.lei,
element.courseId, element.courseId,
element.id, element.id,
element.routerTaskId element.routerTaskId,
element.courseId
)"> )">
编辑 编辑
</span> </span>
@@ -958,6 +959,7 @@ export default {
EditProjectId: "", EditProjectId: "",
routerTaskId: "", routerTaskId: "",
taskIdDraft: "", taskIdDraft: "",
taskCourseID: "",
chapterId: "", chapterId: "",
stageId: "", stageId: "",
cC: false, cC: false,
@@ -1179,95 +1181,108 @@ export default {
} }
//在线抽屉 //在线抽屉
const showDrawerAddOnline = (id, eleId, routerTaskId) => { const showDrawerAddOnline = (id, eleId, routerTaskId, courseId) => {
state.addonlinevisible = true; state.addonlinevisible = true;
state.EditOnlineId = id; state.EditOnlineId = id;
state.routerTaskId = routerTaskId; state.routerTaskId = routerTaskId;
state.taskIdDraft = eleId; state.taskIdDraft = eleId;
state.taskCourseID = courseId;
}; };
//面授抽屉 //面授抽屉
const showAddface = (id, eleId, routerTaskId) => { const showAddface = (id, eleId, routerTaskId, courseId) => {
state.addfaceteachVisible = true; state.addfaceteachVisible = true;
state.EditFaceId = id; state.EditFaceId = id;
state.routerTaskId = routerTaskId; state.routerTaskId = routerTaskId;
state.taskIdDraft = eleId; state.taskIdDraft = eleId;
state.taskCourseID = courseId;
}; };
//案例抽屉 //案例抽屉
const showDrawerAddCase = (id, eleId, routerTaskId) => { const showDrawerAddCase = (id, eleId, routerTaskId, courseId) => {
state.addcasevisible = true; state.addcasevisible = true;
state.EditCaseId = id; state.EditCaseId = id;
state.routerTaskId = routerTaskId; state.routerTaskId = routerTaskId;
state.taskIdDraft = eleId; state.taskIdDraft = eleId;
state.taskCourseID = courseId;
}; };
// 作业抽屉 // 作业抽屉
const showDrawerAddHomework = (id, eleId, routerTaskId) => { const showDrawerAddHomework = (id, eleId, routerTaskId, courseId) => {
state.addhomeworkvisible = true; state.addhomeworkvisible = true;
state.EditWorkId = id; state.EditWorkId = id;
state.routerTaskId = routerTaskId; state.routerTaskId = routerTaskId;
state.taskIdDraft = eleId; state.taskIdDraft = eleId;
state.taskCourseID = courseId;
}; };
//考试抽屉 //考试抽屉
const showDrawerAddTest = (id, eleId, routerTaskId) => { const showDrawerAddTest = (id, eleId, routerTaskId, courseId) => {
state.addtestvisible = true; state.addtestvisible = true;
state.EditTestId = id; state.EditTestId = id;
state.routerTaskId = routerTaskId; state.routerTaskId = routerTaskId;
state.taskIdDraft = eleId; state.taskIdDraft = eleId;
state.taskCourseID = courseId;
}; };
//测试抽屉 //测试抽屉
const showDrawerAddEval = (id, eleId, routerTaskId) => { const showDrawerAddEval = (id, eleId, routerTaskId, courseId) => {
state.addevalvisible = true; state.addevalvisible = true;
state.EditEvalId = id; state.EditEvalId = id;
state.routerTaskId = routerTaskId; state.routerTaskId = routerTaskId;
state.taskIdDraft = eleId; state.taskIdDraft = eleId;
state.taskCourseID = courseId;
}; };
//评估抽屉 //评估抽屉
const showDrawerAddInvist = (id, eleId, routerTaskId) => { const showDrawerAddInvist = (id, eleId, routerTaskId, courseId) => {
state.addinvistvisible = true; state.addinvistvisible = true;
state.routerTaskId = routerTaskId; state.routerTaskId = routerTaskId;
state.EditInvistId = id; state.EditInvistId = id;
state.taskIdDraft = eleId; state.taskIdDraft = eleId;
state.taskCourseID = courseId;
}; };
//投票抽屉 //投票抽屉
const showDrawerAddVote = (id, eleId, routerTaskId) => { const showDrawerAddVote = (id, eleId, routerTaskId, courseId) => {
state.addvotevisible = true; state.addvotevisible = true;
state.EditVoteId = id; state.EditVoteId = id;
state.routerTaskId = routerTaskId; state.routerTaskId = routerTaskId;
state.taskIdDraft = eleId; state.taskIdDraft = eleId;
state.taskCourseID = courseId;
}; };
//直播抽屉 //直播抽屉
const showDrawerAddLive = (id, eleId, routerTaskId) => { const showDrawerAddLive = (id, eleId, routerTaskId, courseId) => {
state.addlivevisible = true; state.addlivevisible = true;
state.EditLiveId = id; state.EditLiveId = id;
state.routerTaskId = routerTaskId; state.routerTaskId = routerTaskId;
state.taskIdDraft = eleId; state.taskIdDraft = eleId;
state.taskCourseID = courseId;
}; };
//外链抽屉 //外链抽屉
const showDrawerAddRef = (id, eleId, routerTaskId) => { const showDrawerAddRef = (id, eleId, routerTaskId, courseId) => {
state.addrefvisible = true; state.addrefvisible = true;
state.EditRefId = id; state.EditRefId = id;
state.routerTaskId = routerTaskId; state.routerTaskId = routerTaskId;
state.taskIdDraft = eleId; state.taskIdDraft = eleId;
state.taskCourseID = courseId;
}; };
//讨论抽屉 //讨论抽屉
const showDrawerAddDiscuss = (id, eleId, routerTaskId) => { const showDrawerAddDiscuss = (id, eleId, routerTaskId, courseId) => {
state.adddiscussvisible = true; state.adddiscussvisible = true;
state.EditDiscussId = id; state.EditDiscussId = id;
state.routerTaskId = routerTaskId; state.routerTaskId = routerTaskId;
state.taskIdDraft = eleId; state.taskIdDraft = eleId;
state.taskCourseID = courseId;
}; };
//活动抽屉 //活动抽屉
const showDrawerAddActive = (id, eleId, routerTaskId) => { const showDrawerAddActive = (id, eleId, routerTaskId, courseId) => {
state.addactivevisible = true; state.addactivevisible = true;
state.EditActiveId = id; state.EditActiveId = id;
state.routerTaskId = routerTaskId; state.routerTaskId = routerTaskId;
state.taskIdDraft = eleId; state.taskIdDraft = eleId;
state.taskCourseID = courseId;
}; };
//打开项目抽屉 //打开项目抽屉
const showDrawerAddProj = (id, eleId, routerTaskId) => { const showDrawerAddProj = (id, eleId, routerTaskId, courseId) => {
state.addprojvisible = true; state.addprojvisible = true;
state.EditProjectId = id; state.EditProjectId = id;
state.routerTaskId = routerTaskId; state.routerTaskId = routerTaskId;
state.taskIdDraft = eleId; state.taskIdDraft = eleId;
state.taskCourseID = courseId;
}; };
//tableData数据赋值方法 //tableData数据赋值方法
const dataAssignment = (id) => { const dataAssignment = (id) => {
@@ -1689,35 +1704,35 @@ export default {
} }
}; };
//编辑的按钮 //编辑的按钮
const decideType = (type, id, eleId, routerTaskId) => { const decideType = (type, id, eleId, routerTaskId, courseId) => {
state.edit = true; state.edit = true;
console.log(type, id); console.log(type, id);
if (type == "外链") { if (type == "外链") {
showDrawerAddRef(id, eleId, routerTaskId); showDrawerAddRef(id, eleId, routerTaskId, courseId);
} else if (type == "直播") { } else if (type == "直播") {
showDrawerAddLive(id, eleId, routerTaskId); showDrawerAddLive(id, eleId, routerTaskId, courseId);
} else if (type == "作业") { } else if (type == "作业") {
showDrawerAddHomework(id, eleId, routerTaskId); showDrawerAddHomework(id, eleId, routerTaskId, courseId);
} else if (type == "考试") { } else if (type == "考试") {
showDrawerAddTest(id, eleId, routerTaskId); showDrawerAddTest(id, eleId, routerTaskId, courseId);
} else if (type == "讨论") { } else if (type == "讨论") {
showDrawerAddDiscuss(id, eleId, routerTaskId); showDrawerAddDiscuss(id, eleId, routerTaskId, courseId);
} else if (type == "活动") { } else if (type == "活动") {
showDrawerAddActive(id, eleId, routerTaskId); showDrawerAddActive(id, eleId, routerTaskId, courseId);
} else if (type == "测评") { } else if (type == "测评") {
showDrawerAddEval(id, eleId, routerTaskId); showDrawerAddEval(id, eleId, routerTaskId, courseId);
} else if (type == "评估") { } else if (type == "评估") {
showDrawerAddInvist(id, eleId, routerTaskId); showDrawerAddInvist(id, eleId, routerTaskId, courseId);
} else if (type == "投票") { } else if (type == "投票") {
showDrawerAddVote(id, eleId, routerTaskId); showDrawerAddVote(id, eleId, routerTaskId, courseId);
} else if (type == "项目") { } else if (type == "项目") {
showDrawerAddProj(id, eleId, routerTaskId); showDrawerAddProj(id, eleId, routerTaskId, courseId);
} else if (type == "在线") { } else if (type == "在线") {
showDrawerAddOnline(id, eleId, routerTaskId); showDrawerAddOnline(id, eleId, routerTaskId, courseId);
} else if (type == "案例") { } else if (type == "案例") {
showDrawerAddCase(id, eleId, routerTaskId); showDrawerAddCase(id, eleId, routerTaskId, courseId);
} else if (type == "面授") { } else if (type == "面授") {
showAddface(id, eleId, routerTaskId); showAddface(id, eleId, routerTaskId, courseId);
} }
}; };