From 1c4fb3930b4ad0af52f074abd61d892cebe02676 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B2=B3=E4=BD=B3=E9=91=AB?= <yuejx@dongwu-inc.com>
Date: Fri, 4 Nov 2022 14:09:35 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=B4=BB=E5=8A=A8=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=88=B0=E5=85=B3=E5=8D=A1=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddActive.vue      | 59 +++++++++++++++++------
 src/views/learningpath/LevelAddDetail.vue |  8 ++-
 2 files changed, 49 insertions(+), 18 deletions(-)

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 @@
   >
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">添加活动</div>
+        <div class="headerTitle" >添加活动</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
@@ -225,6 +225,7 @@
 import { reactive, toRefs, ref } from "vue";
 import * as api from "../../api/indexActivity";
 import * as apiTask from "../../api/indexTaskadd";
+import { RouterEditTask } from "@/api/indexTask"
 import { message } from "ant-design-vue";
 import { toDate } from "../../api/method.js";
 const rowSelection = ref({
@@ -252,8 +253,13 @@ export default {
       type: Boolean,
       default: false,
     },
+    isStudiscuss: {
+      type: Boolean,
+      default: false,
+    },
   },
   setup(props, ctx) {
+    //console.log("学习路径",props.isStudiscuss);
     const state = reactive({
       inputV1: "",
       inputV2: "",
@@ -347,27 +353,48 @@ export default {
             state.textV2 = "";
             state.time = "";
             ctx.emit("update:addactiveVisible", false);
-            apiTask
-            .addTask({
+            console.log("学习路径",props.isStudiscuss);
+            if(props.isStudiscuss){
+              let editObj1 = {
+              chapterId:36,
               courseId: 0,
               duration: obj.activityDuration,
               flag: true,
               name: obj.activityName,
-              projectId: 28,
-              projectTaskId: 0,
-              stageId: 3,
+              routerId: 92,
+              routerTaskId: 0,
               type: 9,
+            }
+              RouterEditTask(editObj1).then(res => {
+              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/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 3c94173d..d5af320d 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -534,7 +534,7 @@
     <!-- 添加活动侧弹窗 -->
           <div>
             <add-active
-              v-model:addactiveVisible="addactivevisible"
+              v-model:addactiveVisible="addactivevisible" v-model:isStudiscuss="isStudiscuss"
             />
           </div>
     <!-- 添加活动侧弹窗 -->
@@ -870,6 +870,7 @@ export default {
     };
     const showDrawerAddActive = () => {
       state.addactivevisible = true;
+      state.isStudiscuss = true;
     };
     //新建关卡
     const editChapter = () => {
@@ -1093,8 +1094,10 @@ export default {
                   <span
                     style="color:#4EA6FF;margin-right:25px;cursor:pointer"
                     onClick={() => {
+                      console.log("编辑id",e.record.routerTaskId);
+                      console.log("编辑类型",e.record.lei);
                       state.editID = e.record.routerTaskId;
-                      state.addhomeworkvisible = true;
+                      //state.addhomeworkvisible = true;
                     }}
                   >
                     编辑
@@ -1126,6 +1129,7 @@ export default {
         "直播",
         "外链",
         "讨论",
+        "活动",
         "测评",
         "评估",
         "投票",