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 1/3] =?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 {
         "直播",
         "外链",
         "讨论",
+        "活动",
         "测评",
         "评估",
         "投票",

From 459d7d15a0828556e5e6aef5b7924e2302395f10 Mon Sep 17 00:00:00 2001
From: songwc <songwc@dongwu-inc.com>
Date: Fri, 4 Nov 2022 14:46:00 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat=EF=BC=9A=E5=AE=8C=E6=88=90=E5=AD=A6?=
 =?UTF-8?q?=E4=B9=A0=E8=B7=AF=E5=BE=84=E7=9B=B4=E6=92=AD=20=E5=A4=96?=
 =?UTF-8?q?=E9=93=BE=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddLive.vue        | 66 ++++++++++++++++-------
 src/components/drawers/AddRef.vue         | 58 ++++++++++++++------
 src/views/learningpath/LevelAddDetail.vue |  9 +++-
 3 files changed, 96 insertions(+), 37 deletions(-)

diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue
index 7dc5fe6d..f364e100 100644
--- a/src/components/drawers/AddLive.vue
+++ b/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,
-              projectId: 28,
-              projectTaskId: 0,
-              stageId: 3,
+              name: name,
+              routerId: 92,
+              routerTaskId: 0,
               type: 6,
-            })
-            .then((res) => {
-              console.log("调用项目添加接口后", res.data);
-              //自定义事件给父组件传值
-              ctx.emit("changeData", false);
-              //重新获取任务列表
-              // apiTask.getTask({ projectId: 28 });
-              // router.push("/taskadd");
-            })
-            .catch((err) => {
-              console.log(err);
-            });
+            };
+            RouterEditTask(objj)
+              .then((res) => {
+                console.log(res, 11111);
+              })
+              .catch((err) => {
+                console.log(err, 1111);
+              });
+          } else {
+            apiTask
+              .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);
diff --git a/src/components/drawers/AddRef.vue b/src/components/drawers/AddRef.vue
index f4c65af1..80e102a3 100644
--- a/src/components/drawers/AddRef.vue
+++ b/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
-            .addTask({
+          if (props.isStudy == 1) {
+            let objj = {
+              chapterId: 36,
               courseId: 0,
               duration: 0,
               flag: true,
               name: obj.linkName,
-              projectId: 28,
-              projectTaskId: 0,
-              stageId: 3,
+              routerId: 92,
+              routerTaskId: 0,
               type: 7,
-            })
-            .then((res) => {
-              console.log("调用项目添加接口后111", res.data);
-              ctx.emit("changeData", false);
-              //重新获取任务列表
-              // apiTask.getTask({ projectId: 28 });
-              // router.push("/taskadd");
-            })
-            .catch((err) => {
-              console.log(err);
-            });
+            };
+            RouterEditTask(objj)
+              .then((res) => {
+                console.log(res, 11111);
+              })
+              .catch((err) => {
+                console.log(err, 1111);
+              });
+          } else {
+            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);
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 716b8c68..1137c1d6 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -539,8 +539,12 @@
       </div>
     </a-modal>
     <!-- 添加直播抽屉 -->
-    <add-live v-model:addliveVisible="addlivevisible" />
-    <add-ref v-model:addrefVisible="addrefvisible" />
+    <add-live
+      v-model:addliveVisible="addlivevisible"
+      v-model:isStudy="isStudy"
+    />
+    <!-- 添加外链抽屉 -->
+    <add-ref v-model:addrefVisible="addrefvisible" v-model:isStudy="isStudy" />
     <!-- 是否确认删除任务弹窗 -->
     <!-- 确认删除阶段弹窗 -->
     <a-modal
@@ -808,6 +812,7 @@ export default {
       deleteModal: false, // 删除弹窗
       deleteID: "", // 要删除的任务的id
       editID: "", // 要编辑的任务id
+      isStudy: 1,
       cC: false,
       value1: "",
       value2: "",

From 704e98cd5c30db4f93fa2e0937f017c7ebe9ccba Mon Sep 17 00:00:00 2001
From: dongwug <guoys@dongwu-inc.com>
Date: Fri, 4 Nov 2022 15:40:09 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feta:=E5=88=9B=E5=BB=BA=E9=A2=98=E5=B9=B2?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddEval.vue |   1 -
 src/components/drawers/AddVote.vue |  13 ++-
 src/components/drawers/CreVote.vue | 122 ++++++++++-------------------
 3 files changed, 52 insertions(+), 84 deletions(-)

diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue
index cf9bba58..018fa898 100644
--- a/src/components/drawers/AddEval.vue
+++ b/src/components/drawers/AddEval.vue
@@ -276,7 +276,6 @@ export default {
             RouterEditTask(editObj1)
               .then((res) => {
                 console.log("调用学历路径添加接口后", res.data);
-                ctx.emit("changeData", false);
               })
               .catch((err) => {
                 console.log(err);
diff --git a/src/components/drawers/AddVote.vue b/src/components/drawers/AddVote.vue
index f0098423..196f6966 100644
--- a/src/components/drawers/AddVote.vue
+++ b/src/components/drawers/AddVote.vue
@@ -52,7 +52,8 @@
             </div>
             <!-- 创建投票侧弹窗 -->
             <div>
-              <cre-vote v-model:crevoteVisible="crevotevisible" />
+              <cre-vote v-model:crevoteVisible="crevotevisible" 
+              @setStemId="changeStemId"/>
             </div>
             <!-- 创建投票侧弹窗 -->
           </div>
@@ -132,6 +133,7 @@ const rowSelection = ref({
     console.log(selected, selectedRows, changeRows);
   },
 });
+
 export default {
   name: "AddVote",
   components: {
@@ -204,8 +206,9 @@ export default {
         .createVote(obj)
         .then((res) => {
             console.log("创建成功", res);
-            message.success("创建成功");
-            closeDrawer();
+          message.success("创建成功");
+          // changeStemId();
+          closeDrawer();
           apitaskadd
             .addTask({
               courseId: 0,
@@ -223,6 +226,9 @@ export default {
           // state.createLoading = false;
         });
     };
+    const changeStemId = (stemId) => {
+      console.log(stemId);
+    }
     return {
       ...toRefs(state),
       showDrawerCreVote,
@@ -231,6 +237,7 @@ export default {
       rowSelection,
       options1,
       createVoteText,
+      changeStemId,
     };
   },
 };
diff --git a/src/components/drawers/CreVote.vue b/src/components/drawers/CreVote.vue
index 4957fc70..38a7fb3e 100644
--- a/src/components/drawers/CreVote.vue
+++ b/src/components/drawers/CreVote.vue
@@ -72,41 +72,15 @@
       </div>
       <div class="main_btns">
         <button class="btn1">取消</button>
-        <button
-          class="btn2"
-          onclick="{()=> {
-          createVoteText()
-        }}"
-        >
-          确定
-        </button>
+        <button class="btn2" @click="createQueTit">确定</button>
       </div>
     </div>
   </a-drawer>
 </template>
   <script>
-import { reactive, toRefs, ref } from "vue";
-import { useRouter } from "vue-router";
+import { reactive, toRefs } from "vue";
 import * as api from "../../api/indexVote";
 import { message } from "ant-design-vue";
-import { toDate } from "../../api/method";
-const router = useRouter();
-const rowSelection = ref({
-  checkStrictly: false,
-  onChange: (selectedRowKeys, selectedRows) => {
-    console.log(
-      `selectedRowKeys: ${selectedRowKeys}`,
-      "selectedRows: ",
-      selectedRows
-    );
-  },
-  onSelect: (record, selected, selectedRows) => {
-    console.log(record, selected, selectedRows);
-  },
-  onSelectAll: (selected, selectedRows, changeRows) => {
-    console.log(selected, selectedRows, changeRows);
-  },
-});
 export default {
   name: "CreVote",
   // components: {
@@ -119,12 +93,6 @@ export default {
   },
   setup(props, ctx) {
     const state = reactive({
-      inputV1: "",
-      inputV2: "",
-      inputV3: "",
-      time: undefined,
-      endTimes: "",
-      startTimes: "",
       questions: [
         {
           inputV: "",
@@ -171,60 +139,54 @@ export default {
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
     };
-    //创建投票信息
-    const createVoteText = () => {
-      if (!state.inputV1) return message.info("请输入投票名称");
-      if (state.time != undefined) {
-        state.endTimes = toDate(
-          new Date(state.time[0].$d).getTime() / 1000,
-          "Y-M-D"
-        );
-        state.startTimes = toDate(
-          new Date(state.time[1].$d).getTime() / 1000,
-          "Y-M-D"
-        );
-      }
 
-      let obj = {
-        baseVote: "",
-        createTime: "",
-        createUser: 0,
-        stem: "",
-        stemId: 0,
-        updateTime: "",
-        updateUser: 0,
-        voteEndTime: state.endTimes,
-        voteExplain: "",
-        voteFlag: "",
-        voteId: 0,
-        voteName: state.inputV1,
-        voteStartTime: state.startTimes,
-        voteTag: "",
-      };
-      api
-        .createVote(obj)
-        .then((res) => {
-          setTimeout(() => {
-            console.log("创建成功", res);
-            message.success("创建成功");
-            // state.createLoading = false;
-            router.push("/leveladd");
-            // getLearnPath();
-          }, 1000);
-        })
-        .catch((err) => {
-          console.log("创建失败", err);
-          // state.createLoading = false;
-        });
+    const createQueTit = () => {
+      if (!state.questions[0].inputV) {
+        message.destroy();
+        return message.info("请输入题干");
+      }
+      // if (!state.questions.optins.opvalue) {
+      //   message.destroy();
+      //   return message.info("请输入选项");
+      // }
+      console.log(state.questions[0].inputV);
+    let obj = {
+      createTime: "",
+      createUser: 0,
+      optionDto: [
+        {
+          optionId: 0,
+          optionName: "",
+          optionPictureAddress: "",
+        },
+      ],
+      optionId: 0,
+      optionName: "",
+      optionPictureAddress: "",
+      stem: state.questions[0].inputV,
+      stemId: 0,
+      updateTime: "",
+      updateUser: 0,
+    };
+    api
+      .createOptionMessage(obj)
+      .then((res) => {
+        console.log("创建成功", res);
+        message.success("创建成功");
+        // ctx.emit("setStemId",obj.stem);
+        closeDrawer();
+      })
+      .catch((err) => {
+        console.log(err);
+      });
     };
     return {
       ...toRefs(state),
       afterVisibleChange,
       closeDrawer,
-      rowSelection,
-      createVoteText,
       addQue,
       addOpt,
+      createQueTit,
     };
   },
 };