diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue index 018fa898..4c584b29 100644 --- a/src/components/drawers/AddEval.vue +++ b/src/components/drawers/AddEval.vue @@ -242,7 +242,6 @@ export default { console.log("创建成功", res); message.success("创建成功"); closeDrawer(); - console.log("1111", props.learn); if (props.learn == 0) apitaskadd .addTask({ @@ -257,7 +256,11 @@ export default { }) .then((res) => { console.log("调用项目添加接口后", res.data); + //自定义事件给父组件传值 ctx.emit("changeData", false); + //重新获取任务列表 + // apiTask.getTask({ projectId: 28 }); + // router.push("/taskadd"); }) .catch((err) => { console.log(err); @@ -274,12 +277,6 @@ export default { type: 10, }; RouterEditTask(editObj1) - .then((res) => { - console.log("调用学历路径添加接口后", res.data); - }) - .catch((err) => { - console.log(err); - }); } }) .catch((err) => { diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue index 9e9e9c1d..274910e2 100644 --- a/src/components/drawers/AddInvist.vue +++ b/src/components/drawers/AddInvist.vue @@ -74,6 +74,7 @@ import { reactive, toRefs } from "vue"; import * as api from "../../api/indexInvist"; import * as apitaskadd from "../../api/indexTaskadd"; import { message } from "ant-design-vue"; +import { RouterEditTask } from "@/api/indexTask"; export default { name: "AddInvist", // components: { @@ -83,6 +84,14 @@ export default { type: Boolean, default: false, }, + edit: { + type: Boolean, + default: false, + }, + learn: { + type: Number, + default: 0, + }, }, setup(props, ctx) { const state = reactive({ @@ -198,6 +207,7 @@ export default { message.success("创建成功"); closeDrawer(); getAllInvistText(); + if (props.learn == 0) apitaskadd .addTask({ courseId: 0, @@ -210,12 +220,29 @@ export default { type: 11, }) .then((res) => { - console.log("调用项目添加接口后", res.data); - ctx.emit("changeData", false); - }) - .catch((err) => { - console.log(err); - }); + 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.appraiseName, + routerId: 92, + routerTaskId: 0, + type: 11, + }; + RouterEditTask(editObj1) + } }) .catch((err) => { console.log("创建失败", err); diff --git a/src/components/drawers/AddVote.vue b/src/components/drawers/AddVote.vue index 196f6966..512871f5 100644 --- a/src/components/drawers/AddVote.vue +++ b/src/components/drawers/AddVote.vue @@ -52,8 +52,7 @@
- +
@@ -111,6 +110,7 @@ import * as api from "../../api/indexVote"; import * as apitaskadd from "../../api/indexTaskadd"; import { message } from "ant-design-vue"; import { toDate } from "../../api/method"; +import { RouterEditTask } from "@/api/indexTask"; const options1 = ref([ { value: "value1", @@ -144,6 +144,14 @@ export default { type: Boolean, default: false, }, + edit: { + type: Boolean, + default: false, + }, + learn: { + type: Number, + default: 0, + }, }, setup(props, ctx) { const state = reactive({ @@ -205,10 +213,10 @@ export default { api .createVote(obj) .then((res) => { - console.log("创建成功", res); + console.log("创建成功", res); message.success("创建成功"); - // changeStemId(); closeDrawer(); + if (props.learn == 0) apitaskadd .addTask({ courseId: 0, @@ -219,16 +227,36 @@ export default { projectTaskId: 0, stageId: 3, type: 12, - }); + }) + .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.voteName, + routerId: 92, + routerTaskId: 0, + type: 12, + }; + RouterEditTask(editObj1) + } }) .catch((err) => { console.log("创建失败", err); - // state.createLoading = false; }); }; - const changeStemId = (stemId) => { - console.log(stemId); - } return { ...toRefs(state), showDrawerCreVote, @@ -237,7 +265,6 @@ export default { rowSelection, options1, createVoteText, - changeStemId, }; }, }; diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index 6b91d9f3..7599d8d3 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -258,14 +258,15 @@
评估
- -
- -
- + +
+ +
+
@@ -275,11 +276,12 @@
投票
- +
@@ -525,18 +527,20 @@ -
- -
+
+ +
-
- -
+
+ +
{ state.addinvistvisible = true; + state.learn = 1; }; const showDrawerAddVote = () => { state.addvotevisible = true; + state.learn = 1; }; // tableData数据赋值方法 @@ -1099,8 +1105,8 @@ export default { { - console.log("编辑id",e.record.routerTaskId); - console.log("编辑类型",e.record.lei); + console.log("编辑id", e.record.routerTaskId); + console.log("编辑类型", e.record.lei); state.editID = e.record.routerTaskId; //state.addhomeworkvisible = true; }} @@ -1409,7 +1415,7 @@ export default { showDrawerAddInvist, showDrawerAddVote, deleteLevelTask, - showDrawerAddLive, + showDrawerAddLive, showDrawerAddRef, closeDeleteModel, clearEditData,