From 603a4aa255cfeca19b6d4e39a7f0e05451a05f48 Mon Sep 17 00:00:00 2001 From: wyx Date: Mon, 13 Feb 2023 21:50:54 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E6=89=80=E6=9C=89?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddActive.vue | 8 ++++++++ src/components/drawers/AddDiscuss.vue | 7 +++++++ src/components/drawers/AddEval.vue | 8 ++++++++ src/components/drawers/AddFaceteach.vue | 8 +++++++- src/components/drawers/AddHomework.vue | 8 +++++++- src/components/drawers/AddInvist.vue | 7 +++++++ src/components/drawers/AddLive.vue | 8 ++++++++ src/components/drawers/AddOnline.vue | 5 +++++ src/components/drawers/AddProject.vue | 5 +++++ src/components/drawers/AddRef.vue | 7 +++++++ src/components/drawers/AddTest.vue | 15 ++++++++++++++- src/components/vote/AddVote.vue | 7 +++++++ 12 files changed, 90 insertions(+), 3 deletions(-) diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue index 7bb814d5..3515061c 100644 --- a/src/components/drawers/AddActive.vue +++ b/src/components/drawers/AddActive.vue @@ -264,6 +264,10 @@ export default { type: Number, default: null, }, + taskIdDraft: { + type: Number, + default: null, + }, edit: { // 是否为编辑 type: Boolean, @@ -403,6 +407,7 @@ export default { routerId: props.routerId, routerTaskId: props.routerTaskId || 0, type: 9, + id: props.taskIdDraft }) .then(() => { //message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); @@ -420,6 +425,7 @@ export default { projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId || 0, type: 9, + id: props.taskIdDraft }) .then(() => { //message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); @@ -437,6 +443,7 @@ export default { projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId || 0, type: 9, + id: props.taskIdDraft }) .then(() => { ctx.emit("changeData", false); @@ -491,6 +498,7 @@ export default { beforeSignIn: state.inputV4 ? state.inputV4 : 0, //活动开始前多少分钟签到 signOutTime: state.inputV6, //签退开始时间 standardSettings: state.radioV1, //标准设置 + id: props.edit ? props.taskIdDraft : "" }; console.log("obj", obj); if (props.edit) { diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue index 020507ca..7c6d32a3 100644 --- a/src/components/drawers/AddDiscuss.vue +++ b/src/components/drawers/AddDiscuss.vue @@ -91,6 +91,10 @@ export default { type: Number, default: null, }, + taskIdDraft: { + type: Number, + default: null, + }, edit: { // 是否为编辑 type: Boolean, @@ -203,6 +207,7 @@ export default { routerId: props.routerId, routerTaskId: props.routerTaskId || 0, type: 8, + id: props.taskIdDraft }) .then(() => { //message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); @@ -219,6 +224,7 @@ export default { projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId || 0, type: 8, + id: props.taskIdDraft }) .then(() => { //message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); @@ -255,6 +261,7 @@ export default { discussSettings: state.discussSettings, //讨论设置 discussId: props.edit ? props.EditDiscussId : 0, //讨论Id projectId: 0, //项目id,接口多余字段， + id: props.edit?props.taskIdDraft:"" }; if (props.edit) { api diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue index 8b698b0a..7ce0b020 100644 --- a/src/components/drawers/AddEval.vue +++ b/src/components/drawers/AddEval.vue @@ -105,6 +105,10 @@ export default { type: Number, default: null, }, + taskIdDraft: { + type: Number, + default: null, + }, edit: { // 是否为编辑 type: Boolean, @@ -194,6 +198,7 @@ export default { routerId: props.routerId, routerTaskId: props.routerTaskId || 0, type: 10, + id: props.taskIdDraft }) .then(() => { //message.success(`${props.EditTestId ? "编辑" : "新增"}关卡任务成功`); @@ -212,6 +217,7 @@ export default { projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId || 0, type: 10, + id: props.taskIdDraft }) .then(() => { //message.destroy() @@ -229,6 +235,7 @@ export default { projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId || 0, type: 10, + id: props.taskIdDraft }) .then(() => { //message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); @@ -301,6 +308,7 @@ export default { evaluationTag: "", updateTime: "", type:state.type, + id: props.edit ? props.taskIdDraft : "" }; api .updateEvaluation(objei) diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue index 69ed5074..cbdaf3d7 100644 --- a/src/components/drawers/AddFaceteach.vue +++ b/src/components/drawers/AddFaceteach.vue @@ -408,6 +408,10 @@ export default { type: Boolean, default: false, }, + taskIdDraft: { + type: Number, + default: null, + }, EditFaceId: { // 要编辑的workId type: Number, @@ -707,7 +711,7 @@ export default { testId: state.EditTestId, duration: state.duration, attach:state.attach, - + id: props.taskIdDraft }; console.log("obj============", obj, "6" + "9"); console.log("222222222"); @@ -748,6 +752,7 @@ export default { routerId: props.routerId, routerTaskId: props.routerTaskId || 0, type: 2, + id: props.taskIdDraft }; await RouterEditTask(editObj1) .then(() => { @@ -768,6 +773,7 @@ export default { projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId || 0, type: 2, + id: props.taskIdDraft }; // 新增编辑或新增项目 await ProjectEditTask(editObj) diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue index 92eca057..beb7b089 100644 --- a/src/components/drawers/AddHomework.vue +++ b/src/components/drawers/AddHomework.vue @@ -115,6 +115,10 @@ export default { type: Boolean, default: null, }, + taskIdDraft: { + type: Number, + default: null, + }, projectId: { type: Number, default: null, @@ -356,6 +360,7 @@ export default { routerId: props.routerId, routerTaskId: props.routerTaskId || 0, type: 4, + id: props.taskIdDraft }; RouterEditTask(editObj1) @@ -377,6 +382,7 @@ export default { projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId || 0, type: 4, + id: props.taskIdDraft }; console.log("editObj", editObj); ProjectEditTask(editObj) @@ -460,7 +466,7 @@ export default { disabledDate, disabledDateTime, afterVisibleChange, - FILE_UPLOAD_URL, + FILE_UPLOAD_URL, closeDrawer, closeDrawer2, changevalue, diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue index aab3d6dc..2ffdf49d 100644 --- a/src/components/drawers/AddInvist.vue +++ b/src/components/drawers/AddInvist.vue @@ -46,6 +46,10 @@ export default { type: Boolean, default: false, }, + taskIdDraft: { + type: Number, + default: null, + }, EditInvistId: { type: Number, default: null, @@ -165,6 +169,7 @@ export default { courseTaskId: l_data_id, routerId: props.routerId, type: 11, + id: props.taskIdDraft }) .then((res) => { console.log("shifouchongfu", res); @@ -191,6 +196,7 @@ export default { routerId: props.routerId, routerTaskId: props.routerTaskId || 0, type: 11, + id: props.taskIdDraft }) .then(() => { message.destroy(); @@ -225,6 +231,7 @@ export default { projectId: props.projectId, stageId: props.chooseStageId || 0, type: 11, + id: props.taskIdDraft }) .then((res) => { console.log(res); diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue index 37982c4f..189f1f27 100644 --- a/src/components/drawers/AddLive.vue +++ b/src/components/drawers/AddLive.vue @@ -404,6 +404,10 @@ export default { type: Boolean, default: false, }, + taskIdDraft: { + type: Number, + default: null, + }, EditLiveId: { type: Number, default: null, @@ -621,6 +625,7 @@ export default { routerId: props.routerId, routerTaskId: props.routerTaskId || 0, type: 6, + id: props.taskIdDraft }) .then(() => { //message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); @@ -639,6 +644,7 @@ export default { projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId || 0, type: 6, + id: props.taskIdDraft }) .then(() => { //message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); @@ -657,6 +663,7 @@ export default { projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId || 0, type: 6, + id: props.taskIdDraft }) .then(() => { //message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); @@ -747,6 +754,7 @@ export default { signOutTime: state.inputV8, standardSettings: state.radioV1, //1或2 isEvaluate: state.needEval ? "1" : "0", + id: props.edit? props.taskIdDraft : "" }; console.log("我是要更新的数据", state.obj); diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue index 3fe6438d..402b60c3 100644 --- a/src/components/drawers/AddOnline.vue +++ b/src/components/drawers/AddOnline.vue @@ -194,6 +194,10 @@ export default { type: Number, default: null, }, + taskIdDraft: { + type: Number, + default: null, + }, edit: { // 是否为编辑 type: Boolean, @@ -532,6 +536,7 @@ export default { routerTaskId: props.routerTaskId || 0, type: 1, duration: value.studyTime, + id: props.taskIdDraft }) .then((res) => { if (res.data.code == 200) { diff --git a/src/components/drawers/AddProject.vue b/src/components/drawers/AddProject.vue index 1e839168..3b7f5c86 100644 --- a/src/components/drawers/AddProject.vue +++ b/src/components/drawers/AddProject.vue @@ -244,6 +244,10 @@ export default { type: Boolean, default: false, }, + taskIdDraft: { + type: Number, + default: null, + }, EditProjectId: { type: Number, default: null, @@ -574,6 +578,7 @@ export default { routerId: props.routerId, routerTaskId: props.routerTaskId || 0, type: 13, + id: props.taskIdDraft }) .then(() => { message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); diff --git a/src/components/drawers/AddRef.vue b/src/components/drawers/AddRef.vue index 4f467503..4ede6963 100644 --- a/src/components/drawers/AddRef.vue +++ b/src/components/drawers/AddRef.vue @@ -108,6 +108,10 @@ export default { type: Number, default: null, }, + taskIdDraft: { + type: Number, + default: null, + }, edit: { // 是否为编辑 type: Boolean, @@ -194,6 +198,7 @@ export default { routerId: props.routerId, routerTaskId: props.routerTaskId || 0, type: 7, + id: props.taskIdDraft }) .then(async () => { // message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); @@ -213,6 +218,7 @@ export default { projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId || 0, type: 7, + id: props.taskIdDraft }) .then(() => { // message.success(`${props.EditTestId ? "编辑" : "新增"}阶段任务成功`); @@ -231,6 +237,7 @@ export default { projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId || 0, type: 7, + id: props.taskIdDraft }) .then(() => { //message.success( `${props.EditTestId ? "编辑" : "新增"}阶段任务成功`); diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index af7da93b..fa8df3fc 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -423,6 +423,10 @@ export default { type: Number, default: null, }, + taskIdDraft: { + type: Number, + default: null, + }, isactive: { type: Number, default: null, @@ -663,6 +667,7 @@ export default { state.test.targetId = 0; state.test.type = 0; state.test.chapterId=0; + state.test.id = props.taskIdDraft; console.log("props.offCourseId",props.offCourseId); if (props.faceLevel && props.offCourseId > 0) { state.test.targetId = props.offCourseId; @@ -724,6 +729,7 @@ export default { state.test1.targetId = 0; state.test1.type = 0; state.test1.chapterId=0; + state.test1.id = props.taskIdDraft; console.log("props.offCourseId",props.offCourseId); if (props.faceLevel && props.offCourseId > 0) { state.test1.targetId = props.offCourseId; @@ -748,7 +754,8 @@ export default { examinationId:props.EditTestId, examinationName:state.test1.externalName, examinationExplain:state.test1.externalExplain, - source:state.test1.source + source:state.test1.source, + id: props.taskIdDraft } updateExternalExam(obj) .then(async (res) => { @@ -793,6 +800,7 @@ export default { routerId: props.routerId, routerTaskId: props.routerTaskId || 0, type: 5, + id: props.taskIdDraft }; RouterEditTask(editObj1) .then(() => { @@ -815,6 +823,7 @@ export default { projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId || 0, type: 5, + id: props.taskIdDraft }; // 新增编辑或新增项目 ProjectEditTask(editObj) @@ -837,6 +846,7 @@ export default { projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId || 0, type: 5, + id: props.taskIdDraft }) .then(() => { message.success(`${props.edit ? "编辑" : "新增"}任务成功`); @@ -871,6 +881,7 @@ export default { routerId: props.routerId, routerTaskId: props.routerTaskId || 0, type: 5, + id: props.taskIdDraft }; RouterEditTask(editObj1) .then(() => { @@ -892,6 +903,7 @@ export default { projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId || 0, type: 5, + id: props.taskIdDraft }; // 新增编辑或新增项目 ProjectEditTask(editObj) @@ -913,6 +925,7 @@ export default { projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId || 0, type: 5, + id: props.taskIdDraft }) .then(() => { message.success(`${props.edit ? "编辑" : "新增"}任务成功`); diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue index da5efedb..c1fbabd3 100644 --- a/src/components/vote/AddVote.vue +++ b/src/components/vote/AddVote.vue @@ -154,6 +154,10 @@ export default { type: Boolean, default: false, }, + taskIdDraft: { + type: Number, + default: null, + }, edit: { type: Boolean, default: false, @@ -299,6 +303,7 @@ export default { routerId: props.routerId, routerTaskId: props.routerTaskId || 0, type: 12, + id: props.taskIdDraft }).then(() => { ctx.emit("changeData", false); state.addLoading = false; @@ -311,6 +316,7 @@ export default { projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId || 0, type: 12, + id: props.taskIdDraft }) .then(() => { ctx.emit("changeData", false); @@ -323,6 +329,7 @@ export default { projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId || 0, type: 12, + id: props.taskIdDraft }) .then(() => { ctx.emit("changeData", false);