From 0b347d90aaaee43ac3be0cbd3d2f621ab84a4d38 Mon Sep 17 00:00:00 2001 From: dongwug Date: Mon, 7 Nov 2022 18:26:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=E8=AF=84=E4=BC=B0=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddEval.vue | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue index 4ace14c4..eb7db3d6 100644 --- a/src/components/drawers/AddEval.vue +++ b/src/components/drawers/AddEval.vue @@ -147,6 +147,10 @@ export default { type: Number, default: null, }, + EditEvalId: { + type: Number, + default: null, + }, }, setup(props, ctx) { const state = reactive({ @@ -245,7 +249,7 @@ export default { createUser: 0, evaluationEndTime: state.endTimes, evaluationFlag: "", - evaluationId: "", + evaluationId: 0, evaluationPictureAddress: "", evaluationStartTime: state.startTimes, evaluationTag: "", @@ -259,7 +263,7 @@ export default { createUser: 0, evaluationEndTime: "", evaluationFlag: "", - evaluationId: 125, + evaluationId: props.EditEvalId == null ? 0 : props.EditEvalId, evaluationName: state.inputV1, evaluationPictureAddress: "", evaluationStartTime: "", @@ -276,11 +280,11 @@ export default { console.log("创建成功", res); message.success("创建成功"); closeDrawer(); - //渲染到学历路径 + //渲染到项目列表 if (props.learn == 0) apitaskadd .addTask({ - courseId: 0, + courseId: res.data.data.evaluationId, duration: 0, flag: true, name: obj.evaluationName, @@ -300,11 +304,11 @@ export default { .catch((err) => { console.log(err); }); - //渲染到项目列表 + //渲染到学历路径 else { let editObj1 = { chapterId: props.isactive, - courseId: 0, + courseId: res.data.data.evaluationId, duration: 0, flag: true, name: obj.evaluationName, @@ -322,11 +326,12 @@ export default { } else { api - .queryEvaluationDetailById(obj.evaluationId) + .queryEvaluationDetailById(objedit.evaluationId) .then((res) => { setTimeout(() => { - console.log("获取成功", res,obj.evaluationId); + console.log("获取成功", res,objedit.evaluationId); message.success("获取成功"); + }, 1000); }) .catch((err) => { From 2d824f9dceeb84be92528768c5b1076f41b9763c Mon Sep 17 00:00:00 2001 From: dongwug Date: Mon, 7 Nov 2022 18:27:14 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat=EF=BC=9A=E6=B5=8B=E8=AF=84=E7=BC=96?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddInvist.vue | 8 ++-- src/views/projectcenter/TaskAdd.vue | 62 +++++++--------------------- 2 files changed, 18 insertions(+), 52 deletions(-) diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue index b4fc7bc8..61f36c1d 100644 --- a/src/components/drawers/AddInvist.vue +++ b/src/components/drawers/AddInvist.vue @@ -237,7 +237,7 @@ export default { .queryAssessmentDetailList(obj) .then((res) => { if (res.status === 200) { - console.log("获取全部评估信息", res.data.data); + // console.log("获取全部评估信息", res.data.data); let arr = res.data.data.rows; if ( arr.length === 0 && @@ -250,9 +250,9 @@ export default { getTableDate(arr); state.tableDataTotal = Number(res.data.data.total); } - console.log("获取全部评估信息接口成功", res); - message.success("获取全部评估信息接口成功"); - console.log(obj); + // console.log("获取全部评估信息接口成功", res); + // message.success("获取全部评估信息接口成功"); + // console.log(obj); }) .catch((err) => { console.log("获取全部评估信息接口失败", err); diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index a978fea0..0cef1374 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -252,6 +252,7 @@ v-model:edit="edit" v-model:projectId="projectId" v-model:chooseStageId="chooseStageId" + v-model:EditEvalId="EditEvalId" /> @@ -288,9 +289,9 @@ @@ -844,6 +845,7 @@ export default { chooseStageId: null, isRefEdit: 1, //外链编辑 EditRefId: null, //要编辑的外链的id + EditEvalId:null, projectNameList: [ { id: 1, @@ -1506,49 +1508,7 @@ export default { }); }; - //编辑测评信息 - const editEvalPath = () => { - let obj = { - createTime: "", - createUser: 0, - evaluationEndTime: "", - evaluationFlag: "", - evaluationId: "", - evaluationName: "", - evaluationPictureAddress: "", - evaluationStartTime: "", - evaluationTag: "", - evaluationTypeId: 0, - evaluationTypeName: "", - updateTime: "", - updateUser: 0, - }; - apieval - .queryEvaluationDetailById(obj.evaluationId) - .then((res) => { - setTimeout(() => { - console.log("获取成功", res,obj.evaluationId); - message.success("获取成功"); - }, 1000); - }) - .catch((err) => { - console.log("获取失败", err); - }); - apieval - .updateEvaluation(obj) - .then((res) => { - setTimeout(() => { - console.log("修改成功", res); - message.success("修改成功"); - }, 1000); - }) - .catch((err) => { - console.log("修改失败", err); - // state.createLoading = false; - //重新获取列表 - getTask(); - }); - }; + //编辑直播信息 const editLiveBroadcast = () => { @@ -1939,6 +1899,12 @@ export default { state.isRefEdit = 2; state.EditRefId = id; }; + //打开测评外链的弹窗 + const showEditEvalDrawer = (id) => { + console.log('222222222222222222222',id); + state.addevalvisible = true; + state.EditRefId = id; + }; //编辑的按钮 const decideType = (type, id) => { state.edit = true, @@ -1947,7 +1913,7 @@ export default { showEditRefDrawer(id); } else if (type == "测评") { - showDrawerAddEval(id) + showEditEvalDrawer(id) } else if (type == "评估") { showDrawerAddInvist(id) @@ -1980,6 +1946,7 @@ export default { showDrawerAddDiscuss, showDrawerAddActive, showDrawerAddEval, + showEditEvalDrawer, showDrawerAddInvist, showDrawerAddVote, showConfirm, @@ -1999,7 +1966,6 @@ export default { deleteActivity, deleteVoteText, editActivity, - editEvalPath, deleteInvistText, editLiveBroadcast, editExternal, From 74b52ac5fca4e857f6349432284451c7c779db22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B2=B3=E4=BD=B3=E9=91=AB?= Date: Mon, 7 Nov 2022 19:33:21 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=BC=96=E8=BE=91=E8=AE=A8=E8=AE=BA?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddDiscuss.vue | 17 ++++++++++++----- src/views/projectcenter/TaskAdd.vue | 10 +++++++++- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue index 2dea4b15..bc4903b2 100644 --- a/src/components/drawers/AddDiscuss.vue +++ b/src/components/drawers/AddDiscuss.vue @@ -168,14 +168,21 @@ export default { }; if(props.edit){ //console.log("编辑"); + console.log("props.editDiscussId",props.editDiscussId) + + let obj = { + discussId: props.editDiscussId, + } + console.log(obj) api - .updateDiscuss(obj) + .getDiscussDetail(obj) .then((res) => { - console.log("编辑成功", res); - message.success("编辑成功"); - closeDrawer(); + console.log("获取成功",res.data); }) - .catch((err) => console.log(err)); + .catch((err) => { + console.log("获取失败",err.data); + }) + }else{ api .createDiscuss(obj) diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index f675c128..4c7eb81a 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -852,6 +852,7 @@ export default { isLiveEdit: 1, //直播编辑 EditRefId: null, //要编辑的外链的id EditLiveId: null, //要编辑的直播的id + editDiscussId:null,//要编辑的讨论的id projectNameList: [ { id: 1, @@ -1776,6 +1777,11 @@ export default { const showDrawerAddDiscuss = () => { state.adddiscussvisible = true; }; + //打开编辑讨论的弹窗 + const showEditAddDiscuss = (id)=>{ + state.editDiscussId = id + state.adddiscussvisible = true; + } const showDrawerAddActive = () => { state.addactivevisible = true; }; @@ -1899,7 +1905,9 @@ export default { } else if (type == "投票") { showDrawerAddVote(id); } else if (type == "讨论") { - showDrawerAddDiscuss(id); + showEditAddDiscuss(id); + } else if (type == "活动") { + showDrawerAddActive(id); } }; return {