Merge branch 'master' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage

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
+            console.log("学习路径",props.isStudiscuss);
-            .addTask({
+            if(props.isStudiscuss){
+              let editObj1 = {
+              chapterId:36,
               courseId: 0,
               duration: obj.activityDuration,
               flag: true,
               name: obj.activityName,
-              projectId: 28,
+              routerId: 92,
-              projectTaskId: 0,
+              routerTaskId: 0,
-              stageId: 3,
               type: 9,
+            }
+              RouterEditTask(editObj1).then(res => {
+              console.log("新增关卡任务成功",res);
+              closeDrawer();
+            }).catch(err => {
+              console.log("新增关卡任务失败",err);
             })
-            .then((res) => {
+            }else{
-              console.log("调用项目添加接口后", res.data);
+              apiTask
-              ctx.emit("changeData", false);
+              .addTask({
-              //重新获取任务列表
+                courseId: 0,
-              // apiTask.getTask({ projectId: 28 });
+                duration: obj.activityDuration,
-              // router.push("/taskadd");
+                flag: true,
-            })
+                name: obj.activityName,
-            .catch((err) => {
+                projectId: 28,
-              console.log(err);
+                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);

src/components/drawers/AddLive.vue

@@ -291,6 +291,7 @@ import { message } from "ant-design-vue";
 import * as api from "../../api/indexLiveBroadcast";
 import * as apiTask from "../../api/indexTaskadd";
 import { toDate } from "@/api/method";
+import { RouterEditTask } from "@/api/indexTask";
 // import { useRouter } from "vue-router";
 function getBase64(img, callback) {
   const reader = new FileReader();
@@ -329,6 +330,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    isStudy: {
+      type: Number,
+      default: null,
+    },
   },
   setup(props, ctx) {
     // const router = useRouter();
@@ -441,6 +446,7 @@ export default {
     });
     const closeDrawer = () => {
       ctx.emit("update:addliveVisible", false);
+      console.log(props, "props");
       state.radioV1 = "";
       state.playback = false;
       state.inputV6 = "";
@@ -565,7 +571,7 @@ export default {
         updateTime: "",
         updateUser: 0,
       };
-
+      let name = state.inputV1;
       api
         .createLiveBroadcast(state.obj)
         .then((res) => {
@@ -573,28 +579,50 @@ export default {
           // console.log(state, 2222);
           message.success("提交成功");
           closeDrawer();
-          apiTask
+
-            .addTask({
+          if (props.isStudy == 1) {
+            console.log("hhhhh", name);
+            let objj = {
+              chapterId: 36,
               courseId: 0,
               duration: state.obj.liveDuration,
               flag: true,
-              name: state.obj.liveName,
+              name: name,
-              projectId: 28,
+              routerId: 92,
-              projectTaskId: 0,
+              routerTaskId: 0,
-              stageId: 3,
               type: 6,
-            })
+            };
-            .then((res) => {
+            RouterEditTask(objj)
-              console.log("调用项目添加接口后", res.data);
+              .then((res) => {
-              //自定义事件给父组件传值
+                console.log(res, 11111);
-              ctx.emit("changeData", false);
+              })
-              //重新获取任务列表
+              .catch((err) => {
-              // apiTask.getTask({ projectId: 28 });
+                console.log(err, 1111);
-              // router.push("/taskadd");
+              });
-            })
+          } else {
-            .catch((err) => {
+            apiTask
-              console.log(err);
+              .addTask({
-            });
+                courseId: 0,
+                duration: state.obj.liveDuration,
+                flag: true,
+                name: state.obj.liveName,
+                projectId: 28,
+                projectTaskId: 0,
+                stageId: 3,
+                type: 6,
+              })
+              .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, 2222);

src/components/drawers/AddRef.vue

@@ -81,6 +81,7 @@ import { reactive, toRefs, ref } from "vue";
 import * as api from "../../api/indexExternalChain";
 import * as apiTask from "../../api/indexTaskadd";
 import { message } from "ant-design-vue";
+import { RouterEditTask } from "@/api/indexTask";
 const rowSelection = ref({
   checkStrictly: false,
   onChange: (selectedRowKeys, selectedRows) => {
@@ -106,6 +107,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    isStudy: {
+      type: Number,
+      default: null,
+    },
   },
   setup(props, ctx) {
     const state = reactive({
@@ -114,6 +119,7 @@ export default {
       textV1: "",
     });
     const closeDrawer = () => {
+      console.log(props, 1111);
       ctx.emit("update:addrefVisible", false);
       state.inputV2 = "";
       state.inputV1 = "";
@@ -144,27 +150,47 @@ export default {
           message.success("提交成功");
           closeDrawer();
 
-          apiTask
+          if (props.isStudy == 1) {
-            .addTask({
+            let objj = {
+              chapterId: 36,
               courseId: 0,
               duration: 0,
               flag: true,
               name: obj.linkName,
-              projectId: 28,
+              routerId: 92,
-              projectTaskId: 0,
+              routerTaskId: 0,
-              stageId: 3,
               type: 7,
-            })
+            };
-            .then((res) => {
+            RouterEditTask(objj)
-              console.log("调用项目添加接口后111", res.data);
+              .then((res) => {
-              ctx.emit("changeData", false);
+                console.log(res, 11111);
-              //重新获取任务列表
+              })
-              // apiTask.getTask({ projectId: 28 });
+              .catch((err) => {
-              // router.push("/taskadd");
+                console.log(err, 1111);
-            })
+              });
-            .catch((err) => {
+          } else {
-              console.log(err);
+            apiTask
-            });
+              .addTask({
+                courseId: 0,
+                duration: 0,
+                flag: true,
+                name: obj.linkName,
+                projectId: 28,
+                projectTaskId: 0,
+                stageId: 3,
+                type: 7,
+              })
+              .then((res) => {
+                console.log("调用项目添加接口后111", res.data, 11111);
+                ctx.emit("changeData", false);
+                //重新获取任务列表
+                // apiTask.getTask({ projectId: 28 });
+                // router.push("/taskadd");
+              })
+              .catch((err) => {
+                console.log(err, 111111);
+              });
+          }
         })
         .catch((err) => {
           console.log(err);

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>
     <!-- 添加活动侧弹窗 -->
@@ -569,8 +569,12 @@
       </div>
     </a-modal>
     <!-- 添加直播抽屉 -->
-    <add-live v-model:addliveVisible="addlivevisible" />
+    <add-live
-    <add-ref v-model:addrefVisible="addrefvisible" />
+      v-model:addliveVisible="addlivevisible"
+      v-model:isStudy="isStudy"
+    />
+    <!-- 添加外链抽屉 -->
+    <add-ref v-model:addrefVisible="addrefvisible" v-model:isStudy="isStudy" />
     <!-- 是否确认删除任务弹窗 -->
     <!-- 确认删除阶段弹窗 -->
     <a-modal
@@ -843,6 +847,7 @@ export default {
       deleteModal: false, // 删除弹窗
       deleteID: "", // 要删除的任务的id
       editID: "", // 要编辑的任务id
+      isStudy: 1,
       cC: false,
       value1: "",
       value2: "",
@@ -870,6 +875,7 @@ export default {
     };
     const showDrawerAddActive = () => {
       state.addactivevisible = true;
+      state.isStudiscuss = true;
     };
     //新建关卡
     const editChapter = () => {
@@ -1093,8 +1099,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 +1134,7 @@ export default {
         "直播",
         "外链",
         "讨论",
+        "活动",
         "测评",
         "评估",
         "投票",