直播外链活动讨论阶段里关卡里编辑

src/api/indexActivity.js

@@ -1,7 +1,7 @@
 import http from "./config";
 
 //获取活动信息接口
-export const getActivity = (obj) => http.get('/activity', { params: obj });
+export const getActivity = (activeId) => http.get(`/activity?activityId=${activeId}`);
 
 //创建活动接口
 export const createActivity = (obj) => http.post('/activity/createActivity', obj);

src/api/indexDiscuss.js

@@ -5,8 +5,12 @@ import http from "./config";
 export const createDiscuss = (obj) => http.post("/discuss/createDiscuss", obj);
 
 //获取讨论信息接口
-export const getDiscussDetail = (obj) => http.post('/discuss/getDiscussDetail', obj);
+export const getDiscussDetail = (obj) => http.post('/discuss/getDiscussDetail', obj,{
-
+  headers: {
+    'token': '123',
+    'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
+  }
+})
 //删除讨论接口
 export const deleteDiscuss = (obj) =>
   http.post("/discuss/deleteDiscuss", { params: obj });

src/api/indexExternalChain.js

@@ -15,7 +15,12 @@ export const deleteLink = (obj) => http.post('/link/deleteLink', { params: obj }
 })
 
 //获取外链详细信息接口
-export const getLink = (obj) => http.post('/link/getOne', obj)
+export const getLink = (obj) => http.post('/link/getOne', obj,{
+  headers: {
+    'token': '123',
+    'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
+  }
+})
 
 // 更新外链数据
 export const updateLinks = (obj) => http.post('/link/updateLinks', obj, {

src/components/drawers/AddActive.vue

@@ -9,8 +9,8 @@
   >
     <div class="drawerMain">
       <div class="header">
-        <div v-if="edit" class="headerTitle">编辑活动</div>
+        
-        <div v-else class="headerTitle">添加活动</div>
+        <div class="headerTitle">{{edit?'编辑':'添加'}}活动</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
@@ -217,7 +217,7 @@
         </div>
       <div class="main_btns">
           <button class="btn1" @click="closeDrawer">取消</button>
-          <button class="btn2" @click="createActivity">确定</button>
+          <button class="btn2" @click="updateActivityInfo">确定</button>
         </div>
     </div>
   </a-drawer>
@@ -228,7 +228,7 @@ 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";
+import dayjs from 'dayjs';
 const rowSelection = ref({
   checkStrictly: false,
   onChange: (selectedRowKeys, selectedRows) => {
@@ -254,16 +254,12 @@ export default {
       type: Boolean,
       default: false,
     },
-    isStudiscuss: {
+    EditActiveId: {
-      type: Boolean,
-      default: false,
-    },
-    isactive: {
       type: Number,
       default: null,
     },
-    routerId: {
+    edit: { //  是否为编辑
-      type: Number,
+      type: Boolean,
       default: null,
     },
     projectId: {
@@ -274,17 +270,29 @@ export default {
       type: Number,
       default: null,
     },
-    edit: {
+    routerTaskId: {
-      type: Boolean,
+      type: Number,
-      default: false,
+      default: 0,
     },
-    editActivityId: {
+    isLevel: { // 是否是关卡页面触发
       type: Boolean,
-      default: false,
+      default: null,
     },
-    projectTaskId: {
+    EditWorkId: { // 要编辑的workId 
-      type: Boolean,
+      type: Number,
-      default: false,
+      default: null,
+    },
+    projectTaskId: { // 要编辑的projectId 
+      type: Number,
+      default: null,
+    },
+    routerId: {
+      type: Number,
+      default: null,
+    },
+    isactive: {
+      type: Number,
+      default: null,
     }
   },
   setup(props, ctx) {
@@ -314,20 +322,12 @@ export default {
       state.textV1 = "";
       state.textV2 = "";
       state.time = "";
+      message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
+      ctx.emit("changeData", false);
     };
-    const afterVisibleChange = (bool) => {
+    const queryActive = () => {
-      console.log("state", bool);
+      console.log("props.EditActiveId======",props.EditActiveId,props.chooseStageId,props.routerTaskId);
-      console.log("活动ID",props.editActivityId);
+        api.getActivity(props.EditActiveId).then(res => {
-      console.log("项目中任务ID",props.projectTaskId);
-      if(bool){
-        if(props.isStudiscuss == false){
-          if(props.edit){
-            //编辑讨论
-              console.log("props.editActivityId",props.editActivityId)
-                let obj = {
-                  activityId: props.editActivityId,
-                }
-                api.getActivity(obj).then(res => {
           console.log('获取讨论信息成功',res.data.data)
           
           //更新讨论信息
@@ -339,24 +339,57 @@ export default {
           state.inputV5 = res.data.data.afterSignIn;
           state.inputV4 = res.data.data.beforeSignIn;
           state.radioV1 = res.data.data.standardSettings;
-                  state.time[0] = res.data.data.activityStartTime;
+          state.time = [dayjs(res.data.data.activityStartTime, "YYYY-MM-DD"), dayjs(res.data.data.activityEndTime, "YYYY-MM-DD")]
-                  state.time[1] = res.data.data.activityEndTime;
-                  console.log(state.time[0])
         }).catch(err=>{
           console.log('获取讨论信息失败',err)
         })
+    }
+    const afterVisibleChange = (bool) => {
+      if(bool && props.edit){
+        queryActive();
+      }
       
-          }
-        }
-      }
     };
     const cloradio1 = (value) => {
       if (value != "") {
         state.radioV1 = "";
       }
     };
+    const updateTask = (res) => {
+      if(props.isLevel){
+        RouterEditTask({
+            chapterId:props.isactive,
+            courseId: res.data.data.activityId,
+            duration: res.data.data.activityDuration,
+            name: res.data.data.activityName,
+            routerId: props.routerId,
+            routerTaskId: props.routerTaskId,
+            type: 9,
+          }).then(res => {
+            console.log("新增关卡任务成功",res);
+            
+          }).catch(err => {
+            console.log("新增关卡任务失败",err);
+          })
+      }else{
+        apiTask.addTask({
+            courseId: res.data.data.activityId,
+            duration: res.data.data.activityDuration,
+            name: res.data.data.activityName,
+            projectId: props.projectId,
+            projectTaskId: props.projectTaskId,
+            stageId:props.chooseStageId,
+            type: 9,
+          }).then((res)=> {
+            console.log("更新任务列表成功",res);
+          })
+          .catch((err)=> {
+            console.log("更新任务列表失败",err);
+          })
+      }
+    }
     //创建活动
-    const createActivity = () => {
+    const updateActivityInfo = () => {
       if(!state.inputV1){
         message.destroy();
         return message.warning("请输入活动名称");
@@ -377,17 +410,16 @@ export default {
         message.destroy();
         return message.warning("请输入活动地址");
       } 
-      let startTime = toDate(new Date(state.time[0].$d).getTime() / 1000, "Y-M-D");
+     
-      let endTime = toDate(new Date(state.time[1].$d).getTime() / 1000, "Y-M-D");
       let obj = {
           activityAddress: state.inputV3, //活动地址
           activityDuration: state.inputV2, //活动时长
           activityExplain: state.textV2, //活动说明
-          activityEndTime: endTime, //活动结束时间
+          activityEndTime: dayjs(state.time[1]).format("YYYY-MM-DD"), //活动结束时间
-          activityId: 0, //活动ID
+          activityId: props.edit?props.EditActiveId:0, //活动ID
           activityName: state.inputV1, //活动名称
           activityNotice: state.textV1, //活动公告
-          activityStartTime: startTime, //活动开始时间
+          activityStartTime:dayjs(state.time[0]).format("YYYY-MM-DD"),//活动开始时间
           activityTag: "", //活动逻辑删除标识
           afterSignIn: state.inputV5, //活动开始后多少分钟签到
           beforeSignIn: state.inputV4, //活动开始前多少分钟签到
@@ -397,67 +429,23 @@ export default {
       };
       if(props.edit){
         //更新编辑活动信息
-        updateActivity();
+        api
+        .updateActivity(obj)
+        .then((res) => {
+          closeDrawer();
+          updateTask(res);
+      })
+      .catch((err) => {
+        console.log("更新失败",err);
+      })
       }else{
         //新建活动信息
         api
         .createActivity(obj)
         .then((res) => {          
-            console.log("创建成功", res);
             message.success("创建成功");
-            state.radioV1 = "";
-            state.inputV1 = "";
-            state.inputV2 = "";
-            state.inputV3 = "";
-            state.inputV4 = "";
-            state.inputV5 = "";
-            state.inputV6 = "";
-            state.textV1 = "";
-            state.textV2 = "";
-            state.time = "";
-            ctx.emit("update:addactiveVisible", false);
-            console.log("学习路径",props.isStudiscuss);
-            if(props.isStudiscuss){
-              let editObj1 = {
-              chapterId:props.isactive,
-              courseId: 0,
-              duration: obj.activityDuration,
-              flag: true,
-              name: obj.activityName,
-              routerId: props.routerId,
-              routerTaskId: 0,
-              type: 9,
-            }
-              RouterEditTask(editObj1).then(res => {
-              console.log("新增关卡任务成功",res);
             closeDrawer();
-            }).catch(err => {
+            updateTask(res);
-              console.log("新增关卡任务失败",err);
-            })
-            }else{
-              apiTask
-              .addTask({
-                courseId: res.data.data.activityId,
-                duration: obj.activityDuration,
-                flag: true,
-                name: obj.activityName,
-                projectId: props.projectId,
-                projectTaskId: 0,
-                stageId: props.chooseStageId,
-                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);
@@ -465,40 +453,14 @@ export default {
       }
       
     };
-    //更新编辑活动信息
+  
-    const updateActivity = (obj) => {
-      console.log("编辑");
-      api.updateActivity(obj)
-      .then((res) => {
-        console.log("更新成功",res);
-        let taskObj = {
-          courseId: res.data.data.activityId,
-          duration: obj.activityDuration,
-          flag: true,
-          name: obj.activityName,
-          projectId: props.projectId,
-          projectTaskId: props.projectTaskId,
-          stageId: 0,
-          type: 9,
-        }
-        api.updateTask(taskObj).then((res)=> {
-          console.log("更新任务列表成功",res);
-        })
-        .catch((err)=> {
-          console.log("更新任务列表失败",err);
-        })
-      })
-      .catch((err) => {
-        console.log("更新失败",err);
-      })
-    };
     return {
       ...toRefs(state),
       afterVisibleChange,
       closeDrawer,
       rowSelection,
       cloradio1,
-      createActivity,
+      updateActivityInfo,
     };
   },
 };

src/components/drawers/AddDiscuss.vue

@@ -8,8 +8,7 @@
   >
     <div class="drawerMain">
       <div class="header">        
-        <div v-if="edit" class="headerTitle">编辑讨论</div>
+        <div  class="headerTitle">{{edit?'编辑':'添加'}}讨论</div>
-        <div v-else class="headerTitle">添加讨论</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
@@ -57,19 +56,17 @@
               <span style="margin-right: 3px">讨论设置：</span>
             </div>
             <div class="btnbox">
-              <a-checkbox v-model:checked="checkedC1">允许评论</a-checkbox>
+              <a-checkbox v-model:checked="checkedC1" @onclick = "checkedC1=!checkedC1">允许评论</a-checkbox>
             </div>
           </div>
         </div>
       </div>
       <div class="main_btns">
         <button class="btn1" @click="closeDrawer">取消</button>
-        <button class="btn2" @click="createDiscuss">确定</button>
+        <button class="btn2" @click="updateDiscussInfo">确定</button>
       </div>
     </div>
-     <div class="aeLoading" :style="{display:addLoading?'flex':'none'}">
+  
-    <a-spin :spinning="addLoading" tip="添加中..." />
-  </div>
   </a-drawer>
 </template>
 <script>
@@ -103,20 +100,12 @@ export default {
       type: Boolean,
       default: false,
     },
-    edit: {
+    EditDiscussId: {
-      type: Boolean,
-      default: false,
-    },
-    isStudiscuss: {
-      type: Boolean,
-      default: false,
-    },
-    isactive: {
       type: Number,
       default: null,
     },
-    routerId: {
+    edit: { //  是否为编辑
-      type: Number,
+      type: Boolean,
       default: null,
     },
     projectId: {
@@ -127,11 +116,27 @@ export default {
       type: Number,
       default: null,
     },
-    editDiscussId: {
+    routerTaskId: {
+      type: Number,
+      default: 0,
+    },
+    isLevel: { // 是否是关卡页面触发
+      type: Boolean,
+      default: null,
+    },
+    EditWorkId: { // 要编辑的workId 
       type: Number,
       default: null,
     },
-    projectTaskId: {
+    projectTaskId: { // 要编辑的projectId 
+      type: Number,
+      default: null,
+    },
+    routerId: {
+      type: Number,
+      default: null,
+    },
+    isactive: {
       type: Number,
       default: null,
     }
@@ -142,157 +147,113 @@ export default {
       inputV1: "",
       inputV2: "",
       textV1: "",
-      checkedC1: "",
+      checkedC1: false,
       addLoading:false,
     });
     const closeDrawer = () => {
       ctx.emit("update:adddiscussVisible", false);
       ctx.emit("update:edit", false);
-      console.log("编辑状态",props.edit);
       state.inputV1 = "";
       state.textV1 = "";
+      message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
+      ctx.emit("changeData", false);
     };
-    const afterVisibleChange = (bool) => {
+    const queryDiscuss = () =>{
-      console.log("state", bool);
-      console.log("项目任务ID",props.projectTaskId);
-      if(bool){
-        if(props.isStudiscuss == false){
       if(props.edit){
-            //编辑讨论
+            //编辑讨       
-              console.log("props.editDiscussId",props.editDiscussId)
+        api.getDiscussDetail({discussId:props.EditDiscussId}).then(res => {
-                let formData = new FormData();
-                formData.append('discussId',props.editDiscussId);
-                console.log("formData",formData);
-                api.getDiscussDetail(formData).then(res => {
           console.log('获取讨论信息成功',res.data.data)
           //更新讨论信息
           state.inputV1 = res.data.data.discussName;
           state.textV1 = res.data.data.discussExplain;
-                  state.checkedC1 = res.data.data.discussSettings;
+          state.checkedC1 = Boolean(res.data.data.discussSettings);
+          console.log("props.EditDiscussId",res.data.data.discussSettings,state.checkedC1==Boolean(res.data.data.discussSettings),Boolean(res.data.data.discussSettings),state.checkedC1)
         }).catch(err=>{
           console.log('获取讨论信息失败',err)
         })
     
      }
-        }
+    };
+    const afterVisibleChange = (bool) => {
+      if(bool){
+        queryDiscuss();
       }
     };
-    //console.log("编辑状态",props.edit);
+    const updateTask = (res) => {
-    //创建讨论（项目任务列表）
+    console.log("jinlaile ========",props.isLevel);
-    const createDiscuss = () => {
+        if(props.isLevel){
-      if (!state.inputV1) {
+          RouterEditTask({
-        message.destroy();
-        return message.warning("请输入讨论名称");
-      }
-      state.addLoading=true
-      let obj = {
-        discussName: state.inputV1, //讨论名称
-        discussExplain: state.textV1, //讨论说明
-        discussSettings: state.checkedC1, //讨论设置
-        createTime: "", //创建时间
-        createUser: 0, //创建人
-        discussFlag: "", //活动逻辑删除标识
-        discussId: props.editDiscussId == null ? 0 : props.editDiscussId, //讨论Id
-        discussTag: "", //是否必修的标识
-        updateTime: "", //更新时间
-        updateUser: 0, //更新人
-        projectId: props.projectId, //项目id
-      };
-      if(props.edit == false){
-        api
-        .createDiscuss(obj)
-        .then((res) => {
-          console.log("创建成功", res);
-          state.inputV1 = "";
-          state.textV1 = "";
-         
-          //console.log("discussName",obj.discussName);
-          console.log("学习路径",props.isStudiscuss);
-          if(props.isStudiscuss){
-            let editObj1 = {
             chapterId:props.isactive,
             courseId: res.data.data.discussId,
-              duration: 0,
+            name: res.data.data.discussName,
-              flag: true,
-              name: obj.discussName,
             routerId: props.routerId,
-              routerTaskId: 0,
+            routerTaskId: props.routerTaskId,
             type: 8,
-            }
+          }).then(res => {
-            RouterEditTask(editObj1).then(res => {
+              closeDrawer();
-              console.log("新增关卡任务成功",res);
+              console.log("新增关卡任务失败",res);
-              setTimeout(()=>{
+          }).catch(err => {console.log("新增关卡任务失败",err);})
-                 message.success("创建成功");
-                ctx.emit("update:adddiscussVisible", false);
-              state.addLoading=false
-              },1000)
-            }).catch(err => {
-              console.log("新增关卡任务失败",err);
-            })
         }else{
-            console.log("项目添加讨论");
         apiTask
-            .addTask({
+        .updateTask({
           courseId: res.data.data.discussId,
-              duration: 0,
+          name: res.data.data.discussName,
-              flag: true,
-              name: obj.discussName,
-              projectId: props.projectId,
-              projectTaskId: "",
-              stageId: props.chooseStageId,
-              type: 8,
-            })
-            .then((res) => {
-              console.log("调用项目添加接口后", res.data);
-              ctx.emit("changeData",false);
-              //重新获取任务列表
-              // apiTask.getTask({ projectId: 28 });
-              // router.push("/taskadd");
-              state.addLoading=false
-            })
-            .catch((err) => {
-              console.log(err);
-            });
-          }
-         })
-        .catch((err) => {
-          console.log("创建失败", err);
-        }); 
-      }else{
-        api
-          .updateDiscuss(obj)
-          .then((res)=> {
-            console.log("更新成功",res);
-            console.log("项目任务ID",props.projectTaskId)
-          let taskObj={
-            courseId: res.data.data.discussId,
-            name: obj.discussName,
           projectId: props.projectId,
           projectTaskId: props.projectTaskId,
           stageId: props.stageId,
           type: 8,       
-          
+        }).then(r=>{
-          }
+          closeDrawer();
-            api.updateTask(taskObj).then(taskRes=>{
+          console.log("新增关卡任务成功",r);
-            console.log('更新阶段任务成功',taskRes)
+        }).catch(r=>{
-            }).catch(taskErr=>{
+          console.log('更新阶段任务失败',r)
-              console.log('更新阶段任务失败',taskErr)
         })
+        }
+    }
+    const updateDiscussInfo = () => {
+      if (!state.inputV1) {
+        message.destroy();
+        return message.warning("请输入讨论名称");
+      }
+      let obj = {
+        discussName: state.inputV1, //讨论名称
+        discussExplain: state.textV1, //讨论说明
+        discussSettings: String(state.checkedC1), //讨论设置
+        discussId: props.edit?props.EditDiscussId:0,//讨论Id
+        projectId: 0, //项目id,接口多余字段，
+      };
+      console.log("dianwanle -======",String(state.checkedC1));
+      if(props.edit){
+        api
+          .updateDiscuss(obj)
+          .then((res)=> {
+            updateTask(res);
+            console.log("更新成功",res);
+            console.log("项目任务ID",props.projectTaskId)
           })
           .catch((err) => {
               console.log("更新失败",err)
           })
+       }else{
+        api
+        .createDiscuss(obj)
+        .then((res)=> {
+          updateTask(res);
+          console.log("创建成功",res);
+          console.log("项目任务ID",props.projectTaskId)
+        })
+        .catch((err) => {
+          console.log("创建失败",err)
+        })
       }
-         
-         
     };
-    
     return {
       ...toRefs(state),
       afterVisibleChange,
       closeDrawer,
       rowSelection,
-      createDiscuss,
+      updateDiscussInfo,
+      
     };
   },
 };

src/components/drawers/AddLive.vue

@@ -10,7 +10,7 @@
   >
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">添加直播</div>
+        <div class="headerTitle">{{edit?'编辑':'添加'}}直播</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
@@ -80,10 +80,14 @@
               <span style="margin-right: 3px">直播时长：</span>
             </div>
             <div class="btnbox">
-              <a-input
+              <a-input-number
+                    :min="0"
+                    :max="300"
+                    :precision="0"
+                    style=" width: 388px; height: 32px; border-radius: 8px;overflow: hidden; "
                     v-model:value="inputV2"
-                style="width: 388px; height: 32px"
+                  ></a-input-number>
-              />
+            
               <span style="margin-left: 5px">分钟</span>
             </div>
           </div>
@@ -110,6 +114,9 @@
               <span style="margin-right: 3px">直播封面：</span>
             </div>
             <div class="textarea" style="overflow: hidden">
+           
+            
+       
               <a-upload
                 v-model:file-list="fileList"
                 name="avatar"
@@ -120,7 +127,7 @@
                 :before-upload="beforeUpload"
                 @change="handleChange"
               >
-                <img v-if="imageUrl" :src="imageUrl" alt="avatar" />
+                <img v-if="imageUrl" :src="imageUrl" alt="avatar" style=“width：100px；height:100px;”/>
                 <div v-else>
                   <loading-outlined v-if="loading"></loading-outlined>
                   <plus-outlined v-else></plus-outlined>
@@ -170,7 +177,7 @@
               <span style="margin-right: 3px">评价：</span>
             </div>
             <div class="btnbox">
-              <a-checkbox v-model:checked="checkedC1">需要评估</a-checkbox>
+              <a-checkbox v-model:checked="checkedC1" @onclick = 'checkedC1=!checkedC1'>需要评估</a-checkbox>
             </div>
           </div>
           <div class="main_item" style="margin-top: -25px">
@@ -201,12 +208,7 @@
                     :min="0"
                     :max="30"
                     :precision="0"
-                    style="
+                    style="width: 88px; height: 32px; border-radius: 8px;overflow: hidden; "
-                      width: 88px;
-                      height: 32px;
-                      border-radius: 8px;
-                      overflow: hidden;
-                    "
                     v-model:value="inputV6"
                   ></a-input-number>
                   <span style="color: #999999; margin-left: 8px">分钟</span>
@@ -217,12 +219,7 @@
                     :min="0"
                     :max="30"
                     :precision="0"
-                    style="
+                    style="width: 88px;height: 32px;border-radius: 8px; overflow: hidden;"
-                      width: 88px;
-                      height: 32px;
-                      border-radius: 8px;
-                      overflow: hidden;
-                    "
                     v-model:value="inputV7"
                   ></a-input-number>
                   <span style="color: #999999; margin-left: 8px">分钟</span>
@@ -238,12 +235,7 @@
                     :min="0"
                     :max="30"
                     :precision="0"
-                    style="
+                    style=" width: 88px;height: 32px;border-radius: 8px; overflow: hidden; "
-                      width: 88px;
-                      height: 32px;
-                      border-radius: 8px;
-                      overflow: hidden;
-                    "
                     v-model:value="inputV8"
                   ></a-input-number>
                   <span style="color: #999999; margin-left: 8px"
@@ -271,7 +263,7 @@
               <span style="margin-right: 3px">其他设置：</span>
             </div>
             <div class="btnbox">
-              <a-checkbox v-model:checked="checkedC2"
+              <a-checkbox v-model:checked="checkedC2" @onclick = "checkedC2 = !checkedC2"
                 >学员请假后记为任务完成</a-checkbox
               >
             </div>
@@ -280,7 +272,7 @@
       </div>
       <div class="main_btns">
         <button class="btn1" @click="closeDrawer">取消</button>
-        <button class="btn2" @click="createLiveBroadcast">确定</button>
+        <button class="btn2" @click="updateLiveBroadcast">确定</button>
       </div>
     </div>
   </a-drawer>
@@ -292,6 +284,7 @@ import * as api from "../../api/indexLiveBroadcast";
 import * as apiTask from "../../api/indexTaskadd";
 import { toDate } from "@/api/method";
 import { RouterEditTask } from "@/api/indexTask";
+import dayjs from 'dayjs';
 // import { useRouter } from "vue-router";
 function getBase64(img, callback) {
   const reader = new FileReader();
@@ -330,10 +323,15 @@ export default {
       type: Boolean,
       default: false,
     },
-    isStudy: {
+  
+    EditLiveId: {
       type: Number,
       default: null,
     },
+    edit: { //  是否为编辑
+      type: Boolean,
+      default: null,
+    },
     projectId: {
       type: Number,
       default: null,
@@ -342,6 +340,31 @@ export default {
       type: Number,
       default: null,
     },
+    routerTaskId: {
+      type: Number,
+      default: 0,
+    },
+    isLevel: { // 是否是关卡页面触发
+      type: Boolean,
+      default: null,
+    },
+    EditWorkId: { // 要编辑的workId 
+      type: Number,
+      default: null,
+    },
+    projectTaskId: { // 要编辑的projectId 
+      type: Number,
+      default: null,
+    },
+    routerId: {
+      type: Number,
+      default: null,
+    },
+    isactive: {
+      type: Number,
+      default: null,
+    }
+  
   },
   setup(props, ctx) {
     // const router = useRouter();
@@ -447,13 +470,15 @@ export default {
       imageUrl: "", //上传图片地址
       loading: false,
       switchC1: "",
-      checkedC1: "",
+      checkedC1: false,
-      checkedC2: true,
+      checkedC2: false,
       playback: false,
+      assessmentId:"0",
       obj: {}, //要传的obj数据
     });
     const closeDrawer = () => {
       ctx.emit("update:addliveVisible", false); 
+      ctx.emit("update:edit", false);
       console.log(props, "props");
       state.radioV1 = "";
       state.playback = false;
@@ -471,7 +496,37 @@ export default {
       state.imageUrl = "";
     };
     const afterVisibleChange = (bool) => {
-      console.log("state", bool);
+      console.log("props.edit===================", props.edit,bool);
+      if(props.edit){
+        queryLive();
+
+      }
+    };
+    const queryLive = () => {
+      let d =props.EditLiveId;
+      console.log("直播查询=======",d);
+      api
+      .getLiveBroadcastInfor({liveId:d}).then((res) => {
+       // console.log(dayjs(res.data.data.submitStartTime).format("YYYY-MM-DD"));
+        state.inputV1 = res.data.data.liveName;
+        state.time = [dayjs(res.data.data.liveStartTime, "YYYY-MM-DD"), dayjs(res.data.data.liveEndTime, "YYYY-MM-DD")]
+        state.inputV2= res.data.data.liveDuration;
+        state.inputV3= res.data.data. liveTeacherId;
+        //state.fileList= res.data.data
+        state.inputV4= res.data.data.liveLink;
+        state.inputV5= res.data.data.livePlaybackLink;
+        state.inputV6= res.data.data.beforeSignIn;
+        state.inputV7= res.data.data.afterSignIn;
+        state.inputV8= res.data.data.signOutTime;
+        state.textV1= res.data.data.liveExplain;
+        state.radioV1= res.data.data.standardSettings
+        //state.= res.data.data
+       
+       
+        console.log("查询成功=====inputv1",state.inputV1);
+      }).catch(() => {
+        message.error(`查询失败`)
+      })
     };
     const PlayBack = () => {
       state.playback = !state.playback;
@@ -482,6 +537,7 @@ export default {
         state.radioV1 = "";
       }
     };
+ 
     const handleChange = (info) => {
       if (info.file.status === "uploading") {
         state.loading = true;
@@ -519,9 +575,50 @@ export default {
 
       return isJpgOrPng && isLt2M;
     };
+    const updateTask =(res)=>{
+      if(props.isLevel){
+            RouterEditTask({
+              chapterId: props.isactive,
+              courseId: res.data.data.liveId,
+              duration: res.data.data.duration,
+              name: res.data.data.liveName,
+              routerId: props.routerId,
+              routerTaskId: props.routerTaskId || 0,
+              type: 6,
+            })
+              .then((res) => {
+                console.log(res, 11111);
+                message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
+                ctx.emit("changeData", false);
+              })
+              .catch((err) => {
+                console.log(err, 1111);
+              });
+          }else{
+            apiTask
+              .addTask({
+                courseId: res.data.data.liveId,
+                duration: res.data.data.duration,
+                name: res.data.data.liveName,
+                projectId: props.projectId,
+                projectTaskId: props.projectTaskId || 0,
+                stageId: props.chooseStageId,
+                type: 6,
+              })
+              .then((res) => {
+                console.log("调用项目添加接口后", res.data);
+                message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
+                ctx.emit("changeData", false);
              
+              })
+              .catch((err) => {
+                console.log(err);
+              });
+         
+          }
+    }
     //创建直播
-    const createLiveBroadcast = () => {
+    const updateLiveBroadcast = () => {
       if (!state.inputV1) {
         message.destroy();
         return message.warning("请输入直播名称");
@@ -541,11 +638,8 @@ export default {
       }
 
       if (!state.inputV3) return message.warning("请输入授课老师");
-      let check = state.checkedC2 * 1;
+   
-      // let startTime = state.time[0].$d;
+      //let check = state.checkedC2 ;
-      // let endTime = state.time[1].$d;
-      // console.log(startTime); //时间需要处理
-      // console.log(endTime);
       let startTime = toDate(
         new Date(state.time[0].$d).getTime() / 1000,
         "Y-M-D"
@@ -555,89 +649,60 @@ export default {
         "Y-M-D"
       );
     
+    
       state.obj = {
         afterSignIn: state.inputV6,
         beforeSignIn: state.inputV7,
         assessmentId: 0,
-        createTime: "",
-        createUser: 0,
         // liveCover: state.fileList,//直播封面
         liveDuration: state.inputV2,
         liveEndTime: endTime,
         liveStartTime: startTime,
         liveExplain: state.textV1,
         liveFlag: "",
-        liveId: 0,
+        liveId: props.edit?props.EditLiveId:0,
         liveLink: state.inputV4,
         liveName: state.inputV1,
         livePlayback: "",
         livePlaybackLink: state.inputV5,
         liveTag: "",
-        liveTeacherId: 0,
+        liveTeacherId: state.inputV3,
-        otherSettings: check, //1或0
+        otherSettings:0, //1或0
         signOutTime: state.inputV8,
         standardSettings: state.radioV1, //1或2
-        updateTime: "",
+    
-        updateUser: 0,
       };
-      let name = state.inputV1;
+     console.log("zhibo-==========",props.EditLiveId);
+      if(props.edit){
+        api
+        .updateLiveBroadcastMessage(state.obj)
+        .then((res) => {
+          console.log("直播编辑成功", res.data.data);
+          message.success("提交成功");
+          updateTask(res);
+          closeDrawer();              
+        })
+        .catch((err) => {
+          console.log(err, 2222);
+        });
+      }else{
         api
         .createLiveBroadcast(state.obj)
         .then((res) => {
           console.log("调用添加直播接口后", res.data.data);
           // console.log(state, 2222);
           message.success("提交成功");
+          updateTask(res);
           closeDrawer();   
-
-          if (props.isStudy == 1) {
-            console.log("hhhhh", name);
-            let objj = {
-              chapterId: 36,
-              courseId: 0,
-              duration: state.obj.liveDuration,
-              flag: true,
-              name: name,
-              routerId: 92,
-              routerTaskId: 0,
-              type: 6,
-            };
-            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: props.projectId,
-                projectTaskId: 0,
-                stageId: props.chooseStageId,
-                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);
         });
+      }
+    
     };
 
+
     return {
       ...toRefs(state),
       afterVisibleChange,
@@ -647,9 +712,9 @@ export default {
       // columns1,
       rowSelection,
       cloradio1,
-      createLiveBroadcast,
       handleChange,
       beforeUpload,
+      updateLiveBroadcast,
     };
   },
 };

src/components/drawers/AddRef.vue

@@ -8,7 +8,7 @@
   >
     <div class="drawerMain">
       <div class="header">
-        <div class="headerTitle">{{ title }}外链</div>
+        <div class="headerTitle">{{edit ? '编辑' : '添加' }}外链</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
@@ -73,13 +73,13 @@
       </a-form>
       <div class="main_btns">
         <button class="btn1" @click="closeDrawer">取消</button>
-        <button class="btn2" @click="createExternalChain">确定</button>
+        <button class="btn2" @click="updateRef">确定</button>
       </div>
     </div>
   </a-drawer>
 </template>
 <script>
-import { reactive, toRefs, ref, onMounted } from "vue";
+import { reactive, toRefs, ref } from "vue";
 import * as api from "../../api/indexExternalChain";
 import * as apiTask from "../../api/indexTaskadd";
 import { message } from "ant-design-vue";
@@ -110,10 +110,14 @@ export default {
       type: Boolean,
       default: false,
     },
-    isStudy: {
+    EditRefId: {
       type: Number,
       default: null,
     },
+    edit: { //  是否为编辑
+      type: Boolean,
+      default: null,
+    },
     projectId: {
       type: Number,
       default: null,
@@ -122,15 +126,19 @@ export default {
       type: Number,
       default: null,
     },
-    isRefEdit: {
+    routerTaskId: {
+      type: Number,
+      default: 0,
+    },
+    isLevel: { // 是否是关卡页面触发
+      type: Boolean,
+      default: null,
+    },
+    EditWorkId: { // 要编辑的workId 
       type: Number,
       default: null,
     },
-    EditRefId: {
+    projectTaskId: { // 要编辑的projectId 
-      type: Number,
-      default: null,
-    },
-    isactive: {
       type: Number,
       default: null,
     },
@@ -138,6 +146,11 @@ export default {
       type: Number,
       default: null,
     },
+    isactive: {
+      type: Number,
+      default: null,
+    }
+  
   },
   setup(props, ctx) {
     const state = reactive({
@@ -149,286 +162,103 @@ export default {
     const closeDrawer = () => {
       console.log(props, 1111);
       ctx.emit("update:addrefVisible", false);
-      ctx.emit("update:isRefEdit", 1);
+      ctx.emit("update:edit", false);
       console.log("props", props.routerId);
       state.inputV2 = "";
       state.inputV1 = "";
       state.textV1 = "";
     };
-    const updateRef = () => {
-        // 如果是关卡页面进入 ---------------------------------
-      if (props.isLevel) {
-        if(props.isRefEdit){
-          createExternalRef();
 
-        }else{
-          updateExternalRef();
-        }
-        console.log('关卡创建任务***************');
-      } else { // 任务页面进入------------------------------
-        if (props.isRefEdit) { // 编辑任务
-          console.log('编辑任务***************');
-          updateExternalChain();
-        } else {  // 创建任务
-          console.log('创建任务***************');
-          createExternalChain();
-        }
-      }
-       
-     };
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
+  
+      if(props.edit){
         queryRef();
+      }
+      
     };
     const handleFinish = values => {
       console.log(values);
-      updateRef(props.EditRefId)
+      //updateRef(props.EditRefId)
     };
     const handleFinishFailed = errors => {
       console.log(errors);
       // message.error("handleFinishFailed");
     };
-    //创建外链
+    const updateTask =(res)=>{
-    const createExternalChain = () => {
+      console.log("jinlaile=================",res.data.data.linkId,props.isLevel,props.isactive,props.routerId,props.routerTaskId)
-      if (!state.inputV1) return message.warning("请输入外链名称");
+      if(props.isLevel){
-      if (!state.inputV2) return message.warning("请输入链接");
+        RouterEditTask({
-      let obj = {   
-        linkAddress: state.inputV2,
-        linkDescription: state.textV1,
-        linkId: props.EditRefId == null ? 0 : props.EditRefId,
-        linkName: state.inputV1, 
-      };
-      //编辑外链
- 
-      api
-        .createExternalChain(obj)
-        .then((res) => {
-          console.log(res.data.data, "外链添加成功了");
-          message.success("提交成功");
-          closeDrawer();
-    
-          //项目的创建
-          apiTask
-            .addTask({
-              courseId: res.data.data.linkId,
-              duration: 0,
-              flag: true,
-              name: obj.linkName,
-              projectId: props.projectId,
-              projectTaskId: 0,
-              stageId: props.chooseStageId,
-              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);
-        });
-      
-    };
-    const updateExternalChain = () => {
-      if (!state.inputV1) return message.warning("请输入外链名称");
-      if (!state.inputV2) return message.warning("请输入链接");
-      let obj = {
-    
-        linkAddress: state.inputV2,
-        linkDescription: state.textV1,
-        linkId: props.EditRefId == null ? 0 : props.EditRefId,
-        linkName: state.inputV1,
-      
-      };
-    
-      //编辑外链
-      api
-        .updateLinks(obj)
-        .then((res) => {
-          console.log("编辑成功", res);
-          message.success("编辑成功");
-          closeDrawer();
-        })
-        .catch((err) => console.log(err));
-      
-    };
-    const createExternalRef = () => {
-      if (!state.inputV1) return message.warning("请输入外链名称");
-      if (!state.inputV2) return message.warning("请输入链接");
-      let obj = {
-        createUser: 0,
-        createTime: "",
-        linkAddress: state.inputV2,
-        linkDescription: state.textV1,
-        linkFlag: "",
-        linkId: props.EditRefId == null ? 0 : props.EditRefId,
-        linkName: state.inputV1,
-        linkTag: "",
-        updateTime: "",
-        updateUser: 0,
-      };
-    
-      //编辑外链
-      if (props.isRefEdit) {
-        api
-          .updateLinks(obj)
-          .then((res) => {
-            console.log("编辑成功", res);
-            message.success("编辑成功");
-            closeDrawer();
-          })
-          .catch((err) => console.log(err));
-      } else {
-        api
-          .createExternalChain(obj)
-          .then((res) => {
-            console.log(res.data.data, "外链添加成功了");
-            message.success("提交成功");
-            closeDrawer();
-            //学习路径的创建
-            if (props.isStudy == 1) {
-              let objj = {
               chapterId: props.isactive,
               courseId: res.data.data.linkId,
-                duration: 0,
+              name: res.data.data.linkName,
-                flag: true,
-                name: obj.linkName,
               routerId: props.routerId,
-                routerTaskId: 0,
+              routerTaskId: props.routerTaskId || 0,
               type: 7,
-              };
+            })
-              RouterEditTask(objj)
               .then((res) => {
                 console.log(res, 11111);
+                message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
+                ctx.emit("changeData", false);
+                closeDrawer();
+                state.addLoading = false;               
               })
               .catch((err) => {
                 console.log(err, 1111);
               });
       }else{
-              //项目的创建
         apiTask
             .addTask({
               courseId:res.data.data.linkId,
-                  duration: 0,
+              name: res.data.data.linkName,
-                  flag: true,
-                  name: obj.linkName,
               projectId: props.projectId,
-                  projectTaskId: 0,
+              projectTaskId: props.projectTaskId || 0,
               stageId: props.chooseStageId,
               type: 7,
             })
             .then((res) => {
               console.log("调用项目添加接口后111", res.data, 11111);
               ctx.emit("changeData", false); 
-                  //重新获取任务列表
+              closeDrawer();    
-                  // apiTask.getTask({ projectId: 28 });
-                  // router.push("/taskadd");
             })
             .catch((err) => {
               console.log(err, 111111);
             });
       }
-          })
-          .catch((err) => {
-            console.log(err);
-          });
     }
-    };
+    //创建外链
-    const updateExternalRef = () => {
+    const updateRef = () => {
       if (!state.inputV1) return message.warning("请输入外链名称");
       if (!state.inputV2) return message.warning("请输入链接");
       let obj = {   
-        createUser: 0,
-        createTime: "",
         linkAddress: state.inputV2,
         linkDescription: state.textV1,
-        linkFlag: "",
+        linkId:props.edit?props.EditRefId:0,
-        linkId: props.EditRefId == null ? 0 : props.EditRefId,
         linkName: state.inputV1, 
-        linkTag: "",
-        updateTime: "",
-        updateUser: 0,
       };
-    
+      console.log("编辑的id========",props.EditRefId)
-      //编辑外链
+      if(props.edit){
-      if (props.isRefEdit) {
         api
         .updateLinks(obj)
         .then((res) => {
-            console.log("编辑成功", res);
           message.success("编辑成功");
-            closeDrawer();
+          updateTask(res);  
-          })
+        }).catch((err) => console.log(err));
-          .catch((err) => console.log(err));
       }else{
         api
         .createExternalChain(obj)
         .then((res) => {
-            console.log(res.data.data, "外链添加成功了");
           message.success("提交成功");
-            closeDrawer();
+          updateTask(res);                
-            //学习路径的创建
+        }).catch((err) => console.log(err));
-            if (props.isStudy == 1) {
-              let objj = {
-                chapterId: 36,
-                courseId: 0,
-                duration: 0,
-                flag: true,
-                name: obj.linkName,
-                routerId: 92,
-                routerTaskId: 0,
-                type: 7,
-              };
-              RouterEditTask(objj)
-                .then((res) => {
-                  console.log(res, 11111);
-                })
-                .catch((err) => {
-                  console.log(err, 1111);
-                });
-            } else {
-              //项目的创建
-              apiTask
-                .addTask({
-                  courseId: res.data.data.linkId,
-                  duration: 0,
-                  flag: true,
-                  name: obj.linkName,
-                  projectId: props.projectId,
-                  projectTaskId: 0,
-                  stageId: props.chooseStageId,
-                  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);
-          });
       }
+      
     };
         // 查询任务
     const queryRef = () => {
-      let p =new FormData;
+      let d =props.EditRefId ;
-      p.append('linkId',props.EditRefId);
       api
-      .getLink(p).then((res) => {
+      .getLink({linkId:d}).then((res) => {
        // console.log(dayjs(res.data.data.submitStartTime).format("YYYY-MM-DD"));
         state.inputV1 = res.data.data.linkName;
         state.inputV2 =res.data.data.linkAddress;
@@ -438,16 +268,11 @@ export default {
         message.error(`查询失败`)
       })
     };
-    //不生效
-    onMounted(() => {
-      state.title = props.isRefEdit == 2 ? "编辑" : "添加";
-    });
     return {
       ...toRefs(state),
       afterVisibleChange,
       closeDrawer,
       rowSelection,
-      createExternalChain,
       handleFinish,
       handleFinishFailed,
       updateRef,

src/views/learningpath/LevelAddDetail.vue

@@ -251,6 +251,20 @@
             </div>
             <div class="text">直播</div>
           </div>
+          <div>
+            <add-live
+              v-model:addliveVisible="addlivevisible"
+              :isLevel="true"
+              @changeData="updateTableData"
+              v-model:isactive="isactive"
+              v-model:routerId="routerId"
+              v-model:chooseStageId="chooseStageId"
+              v-model:routerTaskId="routerTaskId"
+              v-model:edit="edit"
+              v-model:EditLiveId="EditLiveId"
+             
+            />
+          </div>
           <div class="lin"></div>
         </div>
         <div class="item">
@@ -260,6 +274,20 @@
             </div>
             <div class="text">外链</div>
           </div>
+          <div>
+            <add-ref
+              v-model:addrefVisible="addrefvisible"
+              :isLevel="true"
+              @changeData="updateTableData"
+              v-model:isactive="isactive"
+              v-model:routerId="routerId"
+              v-model:chooseStageId="chooseStageId"
+              v-model:routerTaskId="routerTaskId"
+              v-model:edit="edit"
+              v-model:EditRefId="EditRefId"
+             
+            />
+          </div>
           <div class="lin"></div>
         </div>
         <div class="item" @click="showDrawerAddDiscuss">
@@ -269,6 +297,20 @@
             </div>
             <div class="text">讨论</div>
           </div>
+          <div>
+            <add-discuss
+              v-model:adddiscussVisible="adddiscussvisible"
+              @changeData="updateTableData"
+              :isLevel="true"
+              v-model:isactive="isactive"
+              v-model:edit="edit"
+              v-model:routerId="routerId"
+              v-model:chooseStageId="chooseStageId"
+              v-model:routerTaskId="routerTaskId"
+              v-model:EditDiscussId="EditDiscussId"
+             
+            />
+          </div>
           <div class="lin"></div>
         </div>
         <div class="item" @click="showDrawerAddActive">
@@ -278,6 +320,19 @@
             </div>
             <div class="text">活动</div>
           </div>
+          <div>
+            <add-active
+              v-model:addactiveVisible="addactivevisible"
+              :isLevel="true"
+              v-model:edit="edit"
+              v-model:isactive="isactive"
+              @changeData="updateTableData"
+              v-model:routerId="routerId"
+              v-model:chooseStageId="chooseStageId"
+              v-model:routerTaskId="routerTaskId"
+              v-model:EditActiveId="EditActiveId"
+            />
+          </div>
           <div class="lin"></div>
         </div>
         <div class="item" @click="showDrawerAddEval">
@@ -290,10 +345,13 @@
             <div>
               <add-eval
                 v-model:addevalVisible="addevalvisible"
-                v-model:edit="edit"
+                :isLevel="true"
-                v-model:learn="learn"
+                @changeData="updateTableData"
                 v-model:isactive="isactive"
+                v-model:edit="edit"
                 v-model:routerId="routerId"
+                v-model:EditEvalId="EditEvalId"
+                v-model:routerTaskId="routerTaskId"
               />
             </div>
             <!-- 添加测评侧弹窗 -->
@@ -310,8 +368,14 @@
             <div>
               <add-invist
                 v-model:addinvistVisible="addinvistvisible"
+                :isLevel="true"
+                @changeData="updateTableData"
+                v-model:isactive="isactive"
                 v-model:edit="edit"
-                v-model:learn="learn"
+                v-model:routerId="routerId"
+                v-model:chooseStageId="chooseStageId"
+                v-model:EditInvistId="EditInvistId"
+                v-model:routerTaskId="routerTaskId"
               />
             </div>
             <!-- 添加评估侧弹窗 -->
@@ -328,8 +392,14 @@
             <div>
               <add-vote
                 v-model:addvoteVisible="addvotevisible"
+                :isLevel="true"
+                @changeData="updateTableData"
+                v-model:isactive="isactive"
                 v-model:edit="edit"
-                v-model:learn="learn"
+                v-model:routerId="routerId"
+                v-model:chooseStageId="chooseStageId"
+                v-model:EditVoteId="EditVoteId"
+                v-model:routerTaskId="routerTaskId"
               />
             </div>
             <!-- 添加投票侧弹窗 -->
@@ -730,24 +800,8 @@
     <!-- 导入学员抽屉 -->
     <imp-stu v-model:AddImpStuvisible="AddImpStuvisible" />
     <!-- 添加讨论侧弹窗 -->
-    <div>
+ 
-      <add-discuss
+
-        v-model:adddiscussVisible="adddiscussvisible"
-        v-model:isStudiscuss="isStudiscuss"
-        v-model:isactive="isactive"
-        v-model:routerId="routerId"
-      />
-    </div>
-    <!-- 添加讨论侧弹窗 -->
-    <!-- 添加活动侧弹窗 -->
-    <div>
-      <add-active
-        v-model:addactiveVisible="addactivevisible"
-        v-model:isStudiscuss="isStudiscuss"
-        v-model:isactive="isactive"
-        v-model:routerId="routerId"
-      />
-    </div>
     <!-- 添加活动侧弹窗 -->
     <!-- 批量删除学员弹窗 -->
     <a-modal
@@ -779,20 +833,7 @@
         </div>
       </div>
     </a-modal>
-    <!-- 添加直播抽屉 -->
+   
-    <add-live
-      v-model:addliveVisible="addlivevisible"
-      v-model:isStudy="isStudy"
-      v-model:isactive="isactive"
-      v-model:routerId="routerId"
-    />
-    <!-- 添加外链抽屉 -->
-    <add-ref
-      v-model:addrefVisible="addrefvisible"
-      v-model:isStudy="isStudy"
-      v-model:isactive="isactive"
-      v-model:routerId="routerId"
-    />
     <!-- 是否确认删除任务弹窗 -->
     <!-- 确认删除阶段弹窗 -->
     <a-modal
@@ -874,10 +915,7 @@ export default {
           name: "默认关卡",
         },
       ],
-      isRefEdit: 1, //外链编辑
+  
-      isLiveEdit: 1, //直播编辑
-      EditRefId: null, //要编辑的外链的id
-      EditLiveId: null, //要编辑的直播的id
       tableData: [
         {
           key: 1,
@@ -1078,15 +1116,21 @@ export default {
       editID: "", // 要编辑的任务id
       EditWorkId: "", // 要编辑的 workid
       EditTestId: "",
+      EditRefId:"",
+      EditLiveId:"",
+      EditDiscussId:"",
+      EditActiveId:"",
+      EditEvalId:"",
+      EditInvistId:"",
+      EditVoteId:"",
       routerTaskId: "",
+      chapterId:"",
       stageId: "",
-      isStudy: 1,
       cC: false,
       value1: "",
       value2: "",
       selectedRowKeys: [],
       edit: false, //是否点击编辑
-      learn: 0,
       gqxy_hs: true,
       isactive: 0,
       projectChecked: null, //项目单选框
@@ -1103,14 +1147,7 @@ export default {
       selectRow: [], //选择行
       selectAll: 0, //0：未选择，1：全选，2：部分选择
     });
-    const showDrawerAddDiscuss = () => {
+  
-      state.adddiscussvisible = true;
-      state.isStudiscuss = true;
-    };
-    const showDrawerAddActive = () => {
-      state.addactivevisible = true;
-      state.isStudiscuss = true;
-    };
     //新建关卡
     const editChapter = () => {
       if (!state.value1) return message.warning("请输入关卡名称");
@@ -1161,6 +1198,7 @@ export default {
     };
     // 作业和考试的抽屉
     const showDrawerAddHomework = (id, eleId) => {
+      console.log("homework==============",id,state.isactive)
       state.addhomeworkvisible = true;
       state.EditWorkId = id;
       state.routerTaskId = eleId;
@@ -1171,18 +1209,43 @@ export default {
       state.routerTaskId = eleId;
     };
     //测试评估投票抽屉
-    const showDrawerAddEval = () => {
+    const showDrawerAddEval = (id, eleId) => {
-      state.addevalvisible = true;
+    
-      state.learn = 1;
+      state.addhomeworkvisible = true;
+      state.EditEvalId = id;
+      state.routerTaskId = eleId;
     };
-    const showDrawerAddInvist = () => {
+    const showDrawerAddInvist = (id, eleId) => {
-      state.addinvistvisible = true;
+      state.addhomeworkvisible = true;
-      state.learn = 1;
+      state.EditInvistId = id;
+      state.routerTaskId = eleId;
     };
-    const showDrawerAddVote = () => {
+    const showDrawerAddVote = (id, eleId) => {
-      state.addvotevisible = true;
+      state.addhomeworkvisible = true;
-      state.learn = 1;
+      state.EditVoteId = id;
+      state.routerTaskId = eleId;
     };
+    const showDrawerAddLive = (id, eleId) => {
+      state.addlivevisible = true;
+      state.EditLiveId = id;
+      state.routerTaskId = eleId;
+    };
+    const showDrawerAddRef = (id, eleId) => {
+      state.addrefvisible = true;
+      state.EditRefId = id;
+      state.routerTaskId = eleId;
+    };
+    
+    const showDrawerAddDiscuss = (id, eleId) => {
+      state.adddiscussvisible = true;
+      state.EditDiscussId = id;
+      state.routerTaskId = eleId;
+    };
+    const showDrawerAddActive = (id, eleId) => {
+      state.addactivevisible = true;
+      state.EditActiveId = id;
+      state.routerTaskId = eleId;
+    };s
 
     // tableData数据赋值方法
     const dataAssignment = (id) => {
@@ -1246,128 +1309,7 @@ export default {
     const showImpStu = () => {
       state.AddImpStuvisible = true;
     };
-    // const tableDataFunc = () => {
+   
-    //   const columns = [
-    //     {
-    //       title: "类型",
-    //       dataIndex: "state",
-    //       // width: "30%",
-    //       key: "state",
-    //       width: 60,
-    //       align: "left",
-    //       className: "classify",
-    //       scopedSlots: { customRender: "action" }, //引入的插槽
-    //       customRender: (text) => {
-    //         // console.log(text.record.checked1);
-    //         return (
-    //           <div class="racona">
-    //             <div
-    //               class="img"
-    //               style={{ cursor: "pointer" }}
-    //               onClick={() => {
-    //                 console.log("点击了");
-    //               }}
-    //             ></div>
-    //             <span> {text.record.lei}</span>
-    //           </div>
-    //         );
-    //       },
-    //     },
-    //     {
-    //       title: "任务名称",
-    //       dataIndex: "creater",
-    //       // width: "30%",
-    //       key: "creater",
-    //       width: 200,
-    //       align: "center",
-    //       className: "h",
-    //     },
-    //     {
-    //       title: "必修/选修",
-    //       dataIndex: "pubtime",
-    //       key: "pubtime",
-    //       // width: 100,
-    //       align: "center",
-    //       className: "h",
-    //       scopedSlots: { customRender: "action" }, //引入的插槽
-    //       customRender: (text) => {
-    //         // console.log(text.record.checked1);
-    //         return (
-    //           <div class="opat">
-    //             <div class="opacationt clearfix">
-    //               <a-switch
-    //                 style="margin-left:-50px;margin-top:3px"
-    //                 checked={text.record.checked1}
-    //                 size="small"
-    //                 active-color="red"
-    //                 onClick={() => {
-    //                   console.log("点击了");
-    //                   text.record.checked1 = !text.record.checked1;
-    //                 }}
-    //               />
-    //               <div class="showt clearfix">
-    //                 <div
-    //                   class="bi"
-    //                   style={
-    //                     text.record.checked1 ? "z-index:999" : "z-index:998"
-    //                   }
-    //                 >
-    //                   必修
-    //                 </div>
-    //                 <div class="xuan">选修</div>
-    //               </div>
-    //             </div>
-    //           </div>
-    //         );
-    //       },
-    //     },
-    //     {
-    //       title: "时长",
-    //       dataIndex: "cretime",
-    //       key: "cretime",
-    //       // width: 100,
-    //       align: "center",
-    //       className: "h",
-    //     },
-    //     {
-    //       title: "操作",
-    //       className: "h",
-    //       dataIndex: "opacation",
-    //       key: "opacation",
-    //       // width: 100,
-    //       align: "center",
-    //       scopedSlots: { customRender: "action" }, //引入的插槽
-    //       customRender: (e) => {
-    //         return (
-    //           <div class="opa">
-    //             <div class="opacation">
-    //               <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;
-    //                 }}
-    //               >
-    //                 编辑
-    //               </span>
-    //               <span
-    //                 style="color:#4EA6FF;cursor:pointer"
-    //                 onClick={() => {
-    //                   showDeleteModal(e.record.routerTaskId);
-    //                 }}
-    //               >
-    //                 删除
-    //               </span>
-    //             </div>
-    //           </div>
-    //         );
-    //       },
-    //     },
-    //   ];
-    //   return columns;
-    // };
     const checkType = (index) => {
       let typeRules = [
         "",
@@ -1610,12 +1552,6 @@ export default {
         });
     };
 
-    const showDrawerAddLive = () => {
-      state.addlivevisible = true;
-    };
-    const showDrawerAddRef = () => {
-      state.addrefvisible = true;
-    };
    
     const closeDeleteModel = () => {
       state.deleteModal = false;
@@ -1717,30 +1653,31 @@ export default {
           console.log("移动失败", err);
         });
     };
-    //打开编辑外链的弹窗
+
-    const showEditRefDrawer = (id) => {
+
-      state.addrefvisible = true;
-      state.isRefEdit = 2;
-      state.EditRefId = id;
-    };
-    //打开编辑直播的弹窗
-    const showEditLiveDrawer = (id) => {
-      state.addlivevisible = true;
-      state.isLiveEdit = 2;
-      state.EditLiveId = id;
-    };
     //编辑的按钮
     const decideType = (type, id, eleId) => {
       state.edit = true;
       console.log(type, id);
       if (type == "外链") {
-        showEditRefDrawer(id);
+        showDrawerAddRef(id, eleId);
       } else if (type == "直播") {
-        showEditLiveDrawer(id);
+        showDrawerAddLive(id, eleId);
       } else if (type == "作业") {
         showDrawerAddHomework(id, eleId);
       } else if (type == "考试") {
         showDrawerAddTest(id, eleId);
+      }else if (type == "讨论") {
+        showDrawerAddDiscuss(id, eleId);
+      }else if (type == "活动") {
+        showDrawerAddActive(id, eleId);
+      }else if (type == "测评") {
+        showDrawerAddInvist (id, eleId);
+      }else if (type == "评估") {
+        showDrawerAddEval (id, eleId);
+      }
+      else if (type == "投票") {
+        showDrawerAddVote(id, eleId);
       }
     };
     return {
@@ -1781,8 +1718,6 @@ export default {
       deletecTaskAll,
       moveTask,
       showDeleteModal,
-      showEditRefDrawer,
-      showEditLiveDrawer,
       decideType,
       updateTableData,
     };

src/views/projectcenter/TaskAdd.vue

@@ -190,7 +190,7 @@
               @changeData="updateTableData"
               v-model:projectId="projectId"
               v-model:chooseStageId="chooseStageId"
-              v-model:isLiveEdit="isLiveEdit"
+              v-model:edit="edit"
               v-model:EditLiveId="EditLiveId"
               v-model:projectTaskId="projectTaskId"
             />
@@ -213,7 +213,7 @@
               @changeData="updateTableData"
               v-model:projectId="projectId"
               v-model:chooseStageId="chooseStageId"
-              v-model:isRefEdit="isRefEdit"
+              v-model:edit="edit"
               v-model:EditRefId="EditRefId"
               v-model:projectTaskId="projectTaskId"
             />
@@ -1457,31 +1457,6 @@ export default {
           console.log("删除失败", err);
         });
     };
-    //编辑讨论
-    const editDiscuss = () => {
-      let obj = {
-        createTime: "",
-        createUser: 0,
-        discussExplain: "",
-        discussFlag: "",
-        discussId: 0,
-        discussName: "",
-        discussSettings: "",
-        discussTag: "",
-        projectId: 0,
-        updateTime: "",
-        updateUser: 0,
-      };
-      apidiscuss
-        .updateDiscuss(obj)
-        .then((res) => {
-          console.log("更新成功", res);
-          message.success("更新成功");
-        })
-        .catch((err) => {
-          console.log("更新失败", err);
-        });
-    };
     //删除活动
     const deleteActivity = () => {
       let obj = {
@@ -1500,38 +1475,7 @@ export default {
           console.log("删除失败", err);
         });
     };
-    //编辑活动
+   
-    const editActivity = () => {
-      let obj = {
-        activityAddress: "",
-        activityDuration: "",
-        activityEndTime: "",
-        activityExplain: "",
-        activityFlag: "",
-        activityId: 0,
-        activityName: "",
-        activityNotice: "",
-        activityStartTime: "",
-        activityTag: "",
-        afterSignIn: "",
-        beforeSignIn: "",
-        createTime: "",
-        createUser: 0,
-        signOutTime: "",
-        standardSettings: "",
-        updateTime: "",
-        updateUser: 0,
-      };
-      apiactivity
-        .updateActivity(obj)
-        .then((res) => {
-          console.log("更新成功", res);
-          message.success("更新成功");
-        })
-        .catch((err) => {
-          console.log("更新失败", err);
-        });
-    };
     //删除测评测试
     const deleteEvalText = () => {
       let obj = {
@@ -1570,39 +1514,6 @@ export default {
         });
     };
 
-    //编辑评估信息
-    const editInvistPath = () => {
-      let obj = {
-        appraiseEndTime: "",
-        appraiseExplain: "",
-        appraiseFlag: "",
-        appraiseId: 0,
-        appraiseName: "",
-        appraiseStartTime: "",
-        appraiseTag: "",
-        createTime: "",
-        createUser: 0,
-        researchId: 0,
-        researchName: "",
-        updateTime: "",
-        updateUser: 0,
-      };
-      apiinvist
-        .updateAppraiseMessage(obj)
-        .then((res) => {
-          setTimeout(() => {
-            console.log("修改成功", res);
-            message.success("修改成功");
-          }, 1000);
-        })
-        .catch((err) => {
-          console.log("修改失败", err);
-          // state.createLoading = false;
-          //重新获取列表
-          getTask();
-        });
-    };
-
     //删除任务
     const deleteTask = () => {
       let obj = { projectTaskIds: state.deleteID };
@@ -1635,39 +1546,7 @@ export default {
         });
     };
 
-    //编辑投票信息
+    
-    const editVotePath = () => {
-      let obj = {
-        baseVote: "",
-        createTime: "",
-        createUser: 0,
-        stem: "",
-        stemId: 0,
-        updateTime: "",
-        updateUser: 0,
-        voteEndTime: "",
-        voteExplain: "",
-        voteFlag: "",
-        voteId: 0,
-        voteName: "",
-        voteStartTime: "",
-        voteTag: "",
-      };
-      apivote
-        .editVote(obj)
-        .then((res) => {
-          setTimeout(() => {
-            console.log("修改成功", res);
-            message.success("修改成功");
-          }, 1000);
-        })
-        .catch((err) => {
-          console.log("修改失败", err);
-          // state.createLoading = false;
-          //重新获取列表
-          getTask();
-        });
-    };
     const showChangeModal = () => {
       state.visiblene = true;
     };
@@ -1777,23 +1656,22 @@ export default {
       state.projectTaskId = eleId;
       state.addtestvisible = true;
     };
-    const showDrawerAddLive = () => {
+    const showDrawerAddLive = (id, eleId) => {
       state.addlivevisible = true;
+      state.EditLiveId = id;
+      state.projectTaskId = eleId;
     };
     const showDrawerAddRef = (id, eleId) => {
       state.EditRefId = id;
       state.projectTaskId = eleId;
       state.addrefvisible = true;
     };
-    const showDrawerAddDiscuss = () => {
+    const showDrawerAddDiscuss = (id, eleId) => {
-      state.adddiscussvisible = true;
-    };
-    //打开编辑讨论的弹窗
-    const showEditAddDiscuss = (id, eleId) => {
       state.editDiscussId = id;
       state.projectTaskId = eleId;
       state.adddiscussvisible = true;
     };
+   
     const showDrawerAddActive = (id, eleId) => {
       state.addactivevisible = true;
       state.editActivityId = id;
@@ -1892,19 +1770,8 @@ export default {
     const changeCourseType = (id) => {
       console.log("任务id", id);
     };
-    //打开编辑外链的弹窗
+ 
-    const showEditRefDrawer = (id, eleId) => {
+ 
-      state.addrefvisible = true;
-      state.isRefEdit = true;
-      state.EditRefId = id;
-      state.projectTaskId = eleId;
-    };
-    //打开编辑直播的弹窗
-    const showEditLiveDrawer = (id) => {
-      state.addlivevisible = true;
-      state.isLiveEdit = 2;
-      state.EditLiveId = id;
-    };
     //打开测评的弹窗
     const showEditEvalDrawer = (id, eleId) => {
       console.log("222222222222222222222", id);
@@ -1918,9 +1785,9 @@ export default {
       state.edit = true;
       console.log(type, id);
       if (type == "外链") {
-        showEditRefDrawer(id, eleId);
+        showDrawerAddRef(id, eleId);
       } else if (type == "直播") {
-        showEditLiveDrawer(id, eleId);
+        showDrawerAddLive(id, eleId);
       } else if (type == "测评") {
         showEditEvalDrawer(id, eleId);
       } else if (type == "评估") {
@@ -1928,7 +1795,7 @@ export default {
       } else if (type == "投票") {
         showDrawerAddVote(id, eleId);
       } else if (type == "讨论") {
-        showEditAddDiscuss(id, eleId);
+        showDrawerAddDiscuss(id, eleId);
       } else if (type == "活动") {
         showDrawerAddActive(id, eleId);
       } else if (type == "作业") {
@@ -1974,15 +1841,12 @@ export default {
       getTask,
       deleteLiveBroadcast,
       deleteDiscuss,
-      editDiscuss,
+     
       deleteEvalText,
       deleteExternalChain,
       deleteActivity,
       deleteVoteText,
-      editActivity,
       deleteInvistText,
-      editInvistPath,
-      editVotePath,
       getTableData,
       deleteTask,
       editStage,
@@ -1997,8 +1861,8 @@ export default {
       deleteTest,
       deleteWork,
       decideType,
-      showEditRefDrawer,
+      
-      showEditLiveDrawer,
+      
     };
   },
 };