diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue index d0193b61..3867f3e1 100644 --- a/src/components/drawers/AddActive.vue +++ b/src/components/drawers/AddActive.vue @@ -9,7 +9,7 @@ >
-
添加活动
+
添加活动
{ + console.log("新增关卡任务成功",res); + closeDrawer(); + }).catch(err => { + console.log("新增关卡任务失败",err); }) - .then((res) => { - console.log("调用项目添加接口后", res.data); - ctx.emit("changeData", false); - //重新获取任务列表 - // apiTask.getTask({ projectId: 28 }); - // router.push("/taskadd"); - }) - .catch((err) => { - console.log(err); - }); + }else{ + apiTask + .addTask({ + courseId: 0, + duration: obj.activityDuration, + flag: true, + name: obj.activityName, + projectId: 28, + projectTaskId: 0, + stageId: 3, + type: 9, + }) + .then((res) => { + console.log("调用项目添加接口后", res.data); + ctx.emit("changeData", false); + //重新获取任务列表 + // apiTask.getTask({ projectId: 28 }); + // router.push("/taskadd"); + }) + .catch((err) => { + console.log(err); + }); + } + }) .catch((err) => { console.log("创建失败",err); diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue index 56a53e9d..fd16928c 100644 --- a/src/components/drawers/AddDiscuss.vue +++ b/src/components/drawers/AddDiscuss.vue @@ -72,6 +72,7 @@ import { reactive, toRefs, ref } from "vue"; import * as api from "../../api/indexDiscuss"; import * as apiTask from "../../api/indexTaskadd"; +import { RouterEditTask } from "@/api/indexTask" import { message } from "ant-design-vue"; const rowSelection = ref({ checkStrictly: false, @@ -98,14 +99,18 @@ export default { type: Boolean, default: false, }, + isStudiscuss: { + type: Boolean, + default: false, + } }, setup(props, ctx) { + console.log("学习路径",props.isStudiscuss); const state = reactive({ inputV1: "", inputV2: "", textV1: "", checkedC1: "", - add: true, }); const closeDrawer = () => { ctx.emit("update:adddiscussVisible", false); @@ -116,7 +121,7 @@ export default { console.log("state", bool); }; - //创建讨论 + //创建讨论(项目任务列表) const createDiscuss = () => { if (!state.inputV1) { message.destroy(); @@ -144,7 +149,27 @@ export default { message.success("创建成功"); ctx.emit("update:adddiscussVisible", false); //console.log("discussName",obj.discussName); - apiTask + console.log("学习路径",props.isStudiscuss); + if(props.isStudiscuss){ + let editObj1 = { + chapterId:36, + courseId: 0, + duration: 0, + flag: true, + name: obj.discussName, + routerId: 92, + routerTaskId: 0, + type: 8, + } + RouterEditTask(editObj1).then(res => { + console.log("新增关卡任务成功",res); + closeDrawer(); + }).catch(err => { + console.log("新增关卡任务失败",err); + }) + }else{ + console.log("项目添加讨论"); + apiTask .addTask({ courseId: 0, duration: 0, @@ -165,7 +190,8 @@ export default { .catch((err) => { console.log(err); }); - }) + } + }) .catch((err) => { console.log("创建失败", err); }); diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index 1137c1d6..6b91d9f3 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -216,7 +216,7 @@
-
+
@@ -225,7 +225,7 @@
-
+
@@ -234,7 +234,7 @@
-
+
@@ -252,25 +252,41 @@
-
+
评估
+ +
+ +
+
-
+
投票
+ +
+ +
+
-
+
+ +
+ +
+ + +
+ +
+ { + state.adddiscussvisible = true; + state.isStudiscuss = true; + }; + const showDrawerAddActive = () => { + state.addactivevisible = true; + state.isStudiscuss = true; + }; //新建关卡 const editChapter = () => { if (!state.value1) return message.warning("请输入关卡名称"); @@ -1054,8 +1099,10 @@ export default { { + console.log("编辑id",e.record.routerTaskId); + console.log("编辑类型",e.record.lei); state.editID = e.record.routerTaskId; - state.addhomeworkvisible = true; + //state.addhomeworkvisible = true; }} > 编辑 @@ -1087,6 +1134,7 @@ export default { "直播", "外链", "讨论", + "活动", "测评", "评估", "投票", @@ -1361,10 +1409,12 @@ export default { showDrawerAddInvist, showDrawerAddVote, deleteLevelTask, - showDrawerAddLive, + showDrawerAddLive, showDrawerAddRef, closeDeleteModel, clearEditData, + showDrawerAddDiscuss, + showDrawerAddActive, }; }, };