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/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);
         });

src/views/learningpath/LevelAddDetail.vue

@@ -216,7 +216,7 @@
           </div>
           <div class="lin"></div>
         </div>
-        <div class="item">
+        <div class="item" @click="showDrawerAddDiscuss">
           <div class="itcon">
             <div class="img">
               <img src="../../assets/images/leveladd/tao.png" />
@@ -225,7 +225,7 @@
           </div>
           <div class="lin"></div>
         </div>
-        <div class="item">
+        <div class="item" @click="showDrawerAddActive">
           <div class="itcon">
             <div class="img">
               <img src="../../assets/images/leveladd/huo.png" />
@@ -234,7 +234,7 @@
           </div>
           <div class="lin"></div>
         </div>
-        <div class="item">
+        <div class="item" @click="showDrawerAddEval">
           <div class="itcon">
             <div class="img">
               <img src="../../assets/images/leveladd/ce.png" />
@@ -252,25 +252,41 @@
           </div>
           <div class="lin"></div>
         </div>
-        <div class="item">
+        <div class="item" @click="showDrawerAddInvist">
           <div class="itcon">
             <div class="img">
               <img src="../../assets/images/leveladd/diao.png" />
             </div>
             <div class="text">评估</div>
+                      <!-- 添加评估侧弹窗 -->
+          <div>
+            <add-invist
+              v-model:addinvistVisible="addinvistvisible"
+              @changeData="updateTableData"
+            />
+          </div>
+          <!-- 添加评估侧弹窗 -->
           </div>
           <div class="lin"></div>
         </div>
-        <div class="item">
+        <div class="item" @click="showDrawerAddVote">
           <div class="itcon">
             <div class="img">
               <img src="../../assets/images/leveladd/tou.png" />
             </div>
             <div class="text">投票</div>
+                        <!-- 添加投票侧弹窗 -->
+            <div>
+              <add-vote
+                v-model:addvoteVisible="addvotevisible"
+                @changeData="updateTableData"
+              />
+            </div>
+            <!-- 添加投票侧弹窗 -->
           </div>
           <div class="lin"></div>
         </div>
-        <div class="item">
+        <div class="item" @click="showDrawerAddVote">
           <div class="itcon">
             <div class="img">
               <img
@@ -508,6 +524,20 @@
     <add-stu v-model:AddSvisible="AddSvisible" />
     <!-- 导入学员抽屉 -->
     <imp-stu v-model:AddImpStuvisible="AddImpStuvisible" />
+    <!-- 添加讨论侧弹窗 -->
+          <div>
+            <add-discuss
+              v-model:adddiscussVisible="adddiscussvisible" v-model:isStudiscuss="isStudiscuss"
+            />
+          </div>
+    <!-- 添加讨论侧弹窗 -->
+    <!-- 添加活动侧弹窗 -->
+          <div>
+            <add-active
+              v-model:addactiveVisible="addactivevisible" v-model:isStudiscuss="isStudiscuss"
+            />
+          </div>
+    <!-- 添加活动侧弹窗 -->
     <!-- 批量删除学员弹窗 -->
     <a-modal
       v-model:visible="deleteAll"
@@ -585,9 +615,11 @@ import AddStu from "../../components/drawers/AddLevelAddStu";
 import ImpStu from "../../components/drawers/AddLevelImportStu";
 import AddHomework from "../../components/drawers/AddHomework.vue";
 import AddTest from "../../components/drawers/AddTest.vue";
+import AddDiscuss from "../../components/drawers/AddDiscuss.vue";
+import AddActive from "../../components/drawers/AddActive.vue";
 import AddEval from "../../components/drawers/AddEval.vue";
-// import AddInvist from "../../components/drawers/AddInvist.vue";
+import AddInvist from "../../components/drawers/AddInvist.vue";
-// import AddVote from "../../components/drawers/AddVote.vue";
+import AddVote from "../../components/drawers/AddVote.vue";
 import AddLive from "../../components/drawers/AddLive.vue";
 import AddRef from "../../components/drawers/AddRef.vue";
 import * as api from "../../api/indexLevel";
@@ -599,9 +631,12 @@ export default {
     AddStu,
     ImpStu,
     AddHomework,
+    AddDiscuss,
+    AddActive,
     AddTest,
     AddEval,
-
+    AddInvist,
+   AddVote,
     AddLive,
     AddRef,
   },
@@ -822,6 +857,9 @@ export default {
       gqxy_hs: true,
       isactive: 0,
       projectChecked: null, //项目单选框
+      adddiscussvisible: false, //讨论抽屉
+      isStudiscuss: false,
+      addactivevisible: false, //活动抽屉
       addhomeworkvisible: false,
       addtestvisible: false,
       addevalvisible: false,
@@ -831,7 +869,14 @@ export default {
       // 表示当前触发列表的id,用来发送编辑和删除
       ListChoosedId: 0,
     });
-
+    const showDrawerAddDiscuss = () => {
+      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 {
                   <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;
                     }}
                   >
                     编辑
@@ -1087,6 +1134,7 @@ export default {
         "直播",
         "外链",
         "讨论",
+        "活动",
         "测评",
         "评估",
         "投票",
@@ -1361,10 +1409,12 @@ export default {
       showDrawerAddInvist,
       showDrawerAddVote,
       deleteLevelTask,
-      showDrawerAddLive,
+       showDrawerAddLive,
       showDrawerAddRef,
       closeDeleteModel,
       clearEditData,
+      showDrawerAddDiscuss,
+      showDrawerAddActive,
     };
   },
 };