From e688448cf96cc734ebbcffcbc642bf12517c0f32 Mon Sep 17 00:00:00 2001 From: dongwug Date: Mon, 7 Nov 2022 15:39:43 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E8=AE=A8=E4=B9=B1=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddDiscuss.vue | 10 +- src/components/drawers/AddEval.vue | 154 ++++++++-------------- src/views/learningpath/LevelAddDetail.vue | 2 + src/views/projectcenter/TaskAdd.vue | 4 + 4 files changed, 72 insertions(+), 98 deletions(-) diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue index 8c6548ea..8c92c0e3 100644 --- a/src/components/drawers/AddDiscuss.vue +++ b/src/components/drawers/AddDiscuss.vue @@ -7,8 +7,9 @@ @after-visible-change="afterVisibleChange" >
-
-
添加讨论
+
+
编辑讨论
+
添加讨论
{ ctx.emit("update:adddiscussVisible", false); + ctx.emit("update:edit", false); state.inputV1 = ""; state.textV1 = ""; }; diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue index a716691d..4ace14c4 100644 --- a/src/components/drawers/AddEval.vue +++ b/src/components/drawers/AddEval.vue @@ -139,6 +139,14 @@ export default { type: Number, default: null, }, + isactive: { + type: Number, + default: null, + }, + routerId: { + type: Number, + default: null, + }, }, setup(props, ctx) { const state = reactive({ @@ -209,50 +217,8 @@ export default { }; - //编辑测评信息 - // const editEvalPath = () => { - // let obj = { - // createTime: "", - // createUser: 0, - // evaluationEndTime: "", - // evaluationFlag: "", - // evaluationId: 125, - // 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 createEvalText = () => { if (!state.inputV1) { message.destroy(); @@ -294,7 +260,7 @@ export default { evaluationEndTime: "", evaluationFlag: "", evaluationId: 125, - evaluationName: "", + evaluationName: state.inputV1, evaluationPictureAddress: "", evaluationStartTime: "", evaluationTag: "", @@ -304,62 +270,62 @@ export default { updateUser: 0, }; if (props.edit == false) { - api - .createEvaluation(obj) - .then((res) => { - console.log("创建成功", res); - message.success("创建成功"); - closeDrawer(); - //渲染到学历路径 - if (props.learn == 0) - apitaskadd - .addTask({ + api + .createEvaluation(obj) + .then((res) => { + console.log("创建成功", res); + message.success("创建成功"); + closeDrawer(); + //渲染到学历路径 + if (props.learn == 0) + apitaskadd + .addTask({ + courseId: 0, + duration: 0, + flag: true, + name: obj.evaluationName, + projectId: props.projectId, + projectTaskId: 0, + stageId: props.chooseStageId, + type: 10, + }) + .then((res) => { + console.log("调用项目添加接口后", res.data); + //自定义事件给父组件传值 + ctx.emit("changeData", false); + //重新获取任务列表 + // apiTask.getTask({ projectId: 28 }); + // router.push("/taskadd"); + }) + .catch((err) => { + console.log(err); + }); + //渲染到项目列表 + else { + let editObj1 = { + chapterId: props.isactive, courseId: 0, duration: 0, flag: true, name: obj.evaluationName, - projectId: props.projectId, - projectTaskId: 0, - stageId: props.chooseStageId, + routerId: props.routerId, + routerTaskId: 0, type: 10, - }) - .then((res) => { - console.log("调用项目添加接口后", res.data); - //自定义事件给父组件传值 - ctx.emit("changeData", false); - //重新获取任务列表 - // apiTask.getTask({ projectId: 28 }); - // router.push("/taskadd"); - }) - .catch((err) => { - console.log(err); - }); - //渲染到项目列表 - else { - let editObj1 = { - chapterId: 36, - courseId: 0, - duration: 0, - flag: true, - name: obj.evaluationName, - routerId: 92, - routerTaskId: 0, - type: 10, - }; - RouterEditTask(editObj1) - } - }) - .catch((err) => { - console.log("创建失败", err); - // state.createLoading = false; - }); + }; + RouterEditTask(editObj1) + } + }) + .catch((err) => { + console.log("创建失败", err); + // state.createLoading = false; + }); } else { api - .queryEvaluationDetailById(objedit.evaluationId) + .queryEvaluationDetailById(obj.evaluationId) .then((res) => { setTimeout(() => { - console.log("获取成功", res,objedit.evaluationId); + console.log("获取成功", res,obj.evaluationId); message.success("获取成功"); }, 1000); }) @@ -387,12 +353,8 @@ export default { ...toRefs(state), afterVisibleChange, closeDrawer, - //增删改查 + //增改 createEvalText, - // getEvalPath, - // changePagination, - // deleteEvalPath, - // editEvalPath, //上传组件 fileList, loading, diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index fd0d8140..1223de1b 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -280,6 +280,8 @@ v-model:addevalVisible="addevalvisible" v-model:edit="edit" v-model:learn="learn" + v-model:isactive="isactive" + v-model:routerId="routerId" />
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index c115aec3..a978fea0 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -209,6 +209,7 @@