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

src/views/projectcenter/TaskAdd.vue

@@ -512,7 +512,7 @@
               <div class="btnText" @click="delete_exit">取消</div>
             </div>
             <div class="del_btn btn2">
-              <div class="btnText" @click="showModal">确定</div>
+              <div class="btnText" @click="showModal1">确定</div>
             </div>
           </div>
         </div>
@@ -539,6 +539,7 @@ import AddVote from "../../components/drawers/AddVote.vue";
 import { message } from "ant-design-vue";
 import * as api from "../../api/indexTaskadd";
 import * as apilive from "../../api/indexLiveBroadcast";
+import * as apieval from "../../api/indexEval";
 const drawercolumns = [
   {
     title: "项目名称",
@@ -978,6 +979,7 @@ export default {
                     style="color:#4EA6FF;cursor:pointer"
                     onClick={() => {
                       showDelete();
+                      {/* deleteEvalText(); */}
                     }}
                   >
                     删除
@@ -1024,6 +1026,25 @@ export default {
           console.log(err);
         });
     };
+    
+    //删除评估测试
+    const deleteEvalText = () => {
+      let obj = {
+        evaluationId:state.deleteLiveID,
+      };
+      apieval
+        .deleteEvaluationById(obj)
+        .then((res) => {
+          console.log("删除成功", res);
+          message.success("删除成功");
+          state.deleteModal = false;
+          //重新获取列表
+          getTask();
+        })
+        .catch((err) => {
+          console.log("删除失败", err);
+        });
+    };
     const onSelectChange = (selectedRowKeys) => {
       console.log("selectedRowKeys changed: ", selectedRowKeys);
       state.selectedRowKeys = selectedRowKeys;
@@ -1042,6 +1063,10 @@ export default {
       //关闭确认框
       closeConfirm();
     };
+    const showModal1 = () => {
+      //关闭确认框
+      state.deleteModal = false;
+    };
     const closeModal = () => {
       state.stage = false;
     };
@@ -1140,12 +1165,14 @@ export default {
       showConfirm,
       closeConfirm,
       showCancel,
+      showModal1,
       closeCancel,
       showDelete,
       closeDelete,
       changebgc,
       getTask,
       deleteLiveBroadcast,
+      deleteEvalText,
     };
   },
 };