feat:合并

src/components/drawers/AddDiscuss.vue

@@ -173,14 +173,21 @@ export default {
       };
       if(props.edit){
         //console.log("编辑");
+        console.log("props.editDiscussId",props.editDiscussId)
+        
+        let obj = {
+         discussId: props.editDiscussId,
+        }
+        console.log(obj)
         api
-          .updateDiscuss(obj)
+          .getDiscussDetail(obj)
           .then((res) => {
-            console.log("编辑成功", res);
+            console.log("获取成功",res.data);
-            message.success("编辑成功");
-            closeDrawer();
           })
-          .catch((err) => console.log(err));
+          .catch((err) => {
+            console.log("获取失败",err.data);
+          })
+       
       }else{
         api
         .createDiscuss(obj)

src/components/drawers/AddEval.vue

@@ -147,6 +147,10 @@ export default {
       type: Number,
       default: null,
     },
+    EditEvalId: {
+      type: Number,
+      default: null,
+    },
   },
   setup(props, ctx) {
     const state = reactive({
@@ -245,7 +249,7 @@ export default {
         createUser: 0,
         evaluationEndTime: state.endTimes,
         evaluationFlag: "",
-        evaluationId: "",
+        evaluationId: 0,
         evaluationPictureAddress: "",
         evaluationStartTime: state.startTimes,
         evaluationTag: "",
@@ -259,7 +263,7 @@ export default {
         createUser: 0,
         evaluationEndTime: "",
         evaluationFlag: "",
-        evaluationId: 125,
+        evaluationId: props.EditEvalId == null ? 0 : props.EditEvalId,
         evaluationName: state.inputV1,
         evaluationPictureAddress: "",
         evaluationStartTime: "",
@@ -276,11 +280,11 @@ export default {
             console.log("创建成功", res);
             message.success("创建成功");
             closeDrawer();
-            //渲染到学历路径
+            //渲染到项目列表            
             if (props.learn == 0)
               apitaskadd
                 .addTask({
-                  courseId: 0,
+                  courseId: res.data.data.evaluationId,
                   duration: 0,
                   flag: true,
                   name: obj.evaluationName,
@@ -300,11 +304,11 @@ export default {
                 .catch((err) => {
                   console.log(err);
                 });
-            //渲染到项目列表
+            //渲染到学历路径
             else {
               let editObj1 = {
                 chapterId: props.isactive,
-                courseId: 0,
+                courseId:  res.data.data.evaluationId,
                 duration: 0,
                 flag: true,
                 name: obj.evaluationName,
@@ -322,11 +326,12 @@ export default {
       }
       else {
         api
-          .queryEvaluationDetailById(obj.evaluationId)
+          .queryEvaluationDetailById(objedit.evaluationId)
           .then((res) => {
               setTimeout(() => {
-                console.log("获取成功", res,obj.evaluationId);
+                console.log("获取成功", res,objedit.evaluationId);
                 message.success("获取成功");
+                
               }, 1000);
             })
             .catch((err) => {

src/components/drawers/AddInvist.vue

@@ -237,7 +237,7 @@ export default {
         .queryAssessmentDetailList(obj)
         .then((res) => {
           if (res.status === 200) {
-            console.log("获取全部评估信息", res.data.data);
+            // console.log("获取全部评估信息", res.data.data);
             let arr = res.data.data.rows;
             if (
               arr.length === 0 &&
@@ -250,9 +250,9 @@ export default {
             getTableDate(arr);
             state.tableDataTotal = Number(res.data.data.total);
           }
-          console.log("获取全部评估信息接口成功", res);
+          // console.log("获取全部评估信息接口成功", res);
-          message.success("获取全部评估信息接口成功");
+          // message.success("获取全部评估信息接口成功");
-          console.log(obj);
+          // console.log(obj);
         })
         .catch((err) => {
           console.log("获取全部评估信息接口失败", err);

src/views/projectcenter/TaskAdd.vue

@@ -852,6 +852,8 @@ export default {
       isLiveEdit: 1, //直播编辑
       EditRefId: null, //要编辑的外链的id
       EditLiveId: null, //要编辑的直播的id
+      editDiscussId:null,//要编辑的讨论的id
+      EditEvalId:null,
       projectNameList: [
         {
           id: 1,
@@ -1519,38 +1521,6 @@ export default {
         });
     };
 
-    //编辑测评信息
-    const editEvalPath = () => {
-      let obj = {
-        createTime: "",
-        createUser: 0,
-        evaluationEndTime: "",
-        evaluationFlag: "",
-        evaluationId: "",
-        evaluationName: "",
-        evaluationPictureAddress: "",
-        evaluationStartTime: "",
-        evaluationTag: "",
-        evaluationTypeId: 0,
-        evaluationTypeName: "",
-        updateTime: "",
-        updateUser: 0,
-      };
-      apieval
-        .updateEvaluation(obj)
-        .then((res) => {
-          setTimeout(() => {
-            console.log("修改成功", res);
-            message.success("修改成功");
-          }, 1000);
-        })
-        .catch((err) => {
-          console.log("修改失败", err);
-          // state.createLoading = false;
-          //重新获取列表
-          getTask();
-        });
-    };
 
     //删除评估测试
     const deleteInvistText = () => {
@@ -1776,6 +1746,11 @@ export default {
     const showDrawerAddDiscuss = () => {
       state.adddiscussvisible = true;
     };
+    //打开编辑讨论的弹窗
+    const showEditAddDiscuss = (id)=>{
+      state.editDiscussId = id
+      state.adddiscussvisible = true;
+    }
     const showDrawerAddActive = () => {
       state.addactivevisible = true;
     };
@@ -1884,13 +1859,20 @@ export default {
       state.isLiveEdit = 2;
       state.EditLiveId = id;
     };
+    //打开测评外链的弹窗
+    const showEditEvalDrawer = (id) => {
+      console.log('222222222222222222222',id);
+      state.addevalvisible = true;
+      state.EditRefId = id;
+    };
     //编辑的按钮
     const decideType = (type, id) => {
       state.edit = true;
       console.log(type, id);
       if (type == "外链") {
         showEditRefDrawer(id);
-      } else if (type == "直播") {
+      } 
+      else if (type == "直播") {
         showEditLiveDrawer(id);
       } else if (type == "测评") {
         showDrawerAddEval(id);
@@ -1899,9 +1881,11 @@ export default {
       } else if (type == "投票") {
         showDrawerAddVote(id);
       } else if (type == "讨论") {
-        showDrawerAddDiscuss(id);
+        showEditAddDiscuss(id);
+      } else if (type == "活动") {
+        showDrawerAddActive(id);
       }
-    };
+    }
     return {
       ...toRefs(state),
       selectProjectName,
@@ -1923,6 +1907,7 @@ export default {
       showDrawerAddDiscuss,
       showDrawerAddActive,
       showDrawerAddEval,
+      showEditEvalDrawer,
       showDrawerAddInvist,
       showDrawerAddVote,
       showConfirm,
@@ -1942,7 +1927,6 @@ export default {
       deleteActivity,
       deleteVoteText,
       editActivity,
-      editEvalPath,
       deleteInvistText,
       editInvistPath,
       editVotePath,