Merge branch 'master' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage

src/views/projectcenter/TaskAdd.vue

@@ -542,6 +542,7 @@ import * as apilive from "../../api/indexLiveBroadcast";
 import * as apidiscuss from "../../api/indexDiscuss";
 import * as apiactivity from "../../api/indexActivity";
 import * as apieval from "../../api/indexEval";
+import * as apiinvist from "../../api/indexInvist";
 const drawercolumns = [
   {
     title: "项目名称",
@@ -857,6 +858,8 @@ export default {
       isactive: -1,
       isActive: false,
       deleteLiveID: null, //删除直播id
+      deleteEvalID: null, //测评
+      deleteInvistID: null, //评估
       deleteDiscussID: null, //删除讨论id
       deleteActivityID: null, //删除活动id
     });
@@ -983,7 +986,8 @@ export default {
                     style="color:#4EA6FF;cursor:pointer"
                     onClick={() => {
                       showDelete();
-                      {/* deleteEvalText(); */}
+                      deleteEvalText();
+                      deleteInvistText();
                     }}
                   >
                     删除
@@ -1066,17 +1070,16 @@ export default {
           console.log("删除失败", err);
         });
     };
-    //删除评估测试
+    //删除测评测试
     const deleteEvalText = () => {
       let obj = {
-        evaluationId:state.deleteLiveID,
+        evaluationId:state.deleteEvalID,
       };
       apieval
         .deleteEvaluationById(obj)
         .then((res) => {
           console.log("删除成功", res);
           message.success("删除成功");
-          state.deleteModal = false;
           //重新获取列表
           getTask();
         })
@@ -1084,6 +1087,25 @@ export default {
           console.log("删除失败", err);
         });
     };
+
+    //删除评估测试
+    const deleteInvistText = () => {
+      let obj = {
+        evaluationId:state.deleteInvistID,
+      };
+      apiinvist
+        .deleteAppraise(obj)
+        .then((res) => {
+          console.log("删除成功", res);
+          message.success("删除成功");
+          //重新获取列表
+          getTask();
+        })
+        .catch((err) => {
+          console.log("删除失败", err);
+        });
+    };
+    
     const onSelectChange = (selectedRowKeys) => {
       console.log("selectedRowKeys changed: ", selectedRowKeys);
       state.selectedRowKeys = selectedRowKeys;
@@ -1214,6 +1236,7 @@ export default {
       deleteDiscuss,
       deleteEvalText,
       deleteActivity,
+      deleteInvistText,
     };
   },
 };