feat:合并

src/views/learningpath/LevelAddDetail.vue

@@ -534,7 +534,10 @@
     <!-- 添加讨论侧弹窗 -->
     <!-- 添加活动侧弹窗 -->
     <div>
-      <add-active v-model:addactiveVisible="addactivevisible" />
+      <add-active
+        v-model:addactiveVisible="addactivevisible"
+        v-model:isStudiscuss="isStudiscuss"
+      />
     </div>
     <!-- 添加活动侧弹窗 -->
     <!-- 批量删除学员弹窗 -->
@@ -568,11 +571,12 @@
       </div>
     </a-modal>
     <!-- 添加直播抽屉 -->
-    <add-live v-model:addliveVisible="addlivevisible" />
-    <add-ref
-      v-model:addrefVisible="addrefvisible"
-      v-model:routerId="routerId"
+    <add-live
+      v-model:addliveVisible="addlivevisible"
+      v-model:isStudy="isStudy"
     />
+    <!-- 添加外链抽屉 -->
+    <add-ref v-model:addrefVisible="addrefvisible" v-model:isStudy="isStudy" />
     <!-- 是否确认删除任务弹窗 -->
     <!-- 确认删除阶段弹窗 -->
     <a-modal
@@ -641,7 +645,7 @@ export default {
   },
   setup() {
     const state = reactive({
-      routerId: storage.get("routerId")?storage.get("routerId"):null,
+      routerId: storage.get("routerId") ? storage.get("routerId") : null,
       level: [
         {
           chapterId: "1",
@@ -847,6 +851,7 @@ export default {
       deleteModal: false, // 删除弹窗
       deleteID: "", // 要删除的任务的id
       editID: "", // 要编辑的任务id
+      isStudy: 1,
       cC: false,
       value1: "",
       value2: "",
@@ -874,6 +879,7 @@ export default {
     };
     const showDrawerAddActive = () => {
       state.addactivevisible = true;
+      state.isStudiscuss = true;
     };
     //新建关卡
     const editChapter = () => {
@@ -1097,8 +1103,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;
                     }}
                   >
                     编辑
@@ -1130,6 +1138,7 @@ export default {
         "直播",
         "外链",
         "讨论",
+        "活动",
         "测评",
         "评估",
         "投票",