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

src/api/indexMovetask.js

@@ -0,0 +1,8 @@
+import http from "./config";
+
+//移动任务到阶段
+export const moveTask = (obj) => http.post('/admin/project/moveTask',obj,{
+    headers: {
+        'token': '123'
+    }
+})

src/components/drawers/AddHomework.vue

@@ -106,7 +106,8 @@
 import { reactive, ref } from "vue";
 import {message} from"ant-design-vue";
 import { createWorkTask, queryWorkDetailById, updateWorkTaskUsing} from "@/api/indexWork";
-import { ProjectEditTask,RouterEditTask } from "@/api/indexTask"
+import { ProjectEditTask,RouterEditTask } from "@/api/indexTask";
+import { storage } from "../../api/storage";
 import dayjs from 'dayjs';
 
 const rowSelection = ref({
@@ -154,7 +155,9 @@ export default {
       choosedTime: '',
     });
     const formRef = ref();
-
+    const state = reactive({
+      routerId: storage.get("routerId") ? storage.get("routerId") : null,
+    })
 
     let checkWorkName = async (_rule, value) => {
       if (!value) {
@@ -307,8 +310,8 @@ export default {
           "duration": 0,
           "flag": true,
           "name": formState.workName,
-          "routerId": 92,
-          "routerTaskId": 0,
+          "routerId": Number(storage.get('routerId')),
+          "routerTaskId": '',
           "type": 4
         }
         // 新增编辑或新增关卡任务
@@ -341,6 +344,7 @@ export default {
       rules,
       queryWork,
       updateWork,
+      state,
     };
   },
 };

src/views/learningpath/LevelAddDetail.vue

@@ -955,9 +955,9 @@ export default {
     };
 
     // tableData数据赋值方法
-    const dataAssignment = () => {
+    const dataAssignment = (id) => {
       console.log(state.level);
-      state.level[0].taskList.forEach((element, index) => {
+      state.level[id].taskList.forEach((element, index) => {
         state.tableData[index] = {
           key: element.routerTaskId,
           lei: checkType(element.type),

src/views/projectcenter/TaskAdd.vue

@@ -284,8 +284,8 @@
         <div class="boomcen">
           <div class="onerow">
             <div class="taskmain">任务列表</div>
-            <button class="btn">移动任务到阶段</button>
-            <div class="edit">
+            <button class="btn" @click="moveTask">移动任务到阶段</button>
+            <div class="edit" @click="deleteTaskAll">
               <img
                 class="editimg"
                 src="../../assets/images/projectadd/delete.png"
@@ -756,6 +756,7 @@ import * as apieval from "../../api/indexEval";
 import * as apiinvist from "../../api/indexInvist";
 import * as apivote from "../../api/indexVote";
 import * as apistage from "../../api/indexStage";
+import * as apimove from "../../api/indexMovetask";
 import draggable from "vuedraggable";
 import { storage } from "../../api/storage";
 const drawercolumns = [
@@ -998,6 +999,9 @@ export default {
         .editStage(obj)
         .then((res) => {
           console.log("添加阶段成功", res);
+          state.valuesname = "",
+          state.valuesnotice = "",
+          state.stage = false;
           message.default();
           message.success("添加阶段成功");
         })
@@ -1598,7 +1602,46 @@ export default {
           getTask();
         });
     };
-
+    //移动任务到阶段
+    const moveTask = () => {
+      let arr = state.selectRow;
+      console.log("选择的行信息",arr);
+      arr.map( value => {
+        console.log("value:",value);
+        let obj = {
+          chapterId: state.chooseStageId,
+          routerTaskIdList: [],
+        }
+        apimove
+          .moveTask(obj)
+          .then((res) => {
+            console.log("移动成功",res);
+            message.default();
+            message.success("移动成功");
+          })
+          .catch((err) => {
+            console.log("移动失败",err);
+          })
+      })
+    };
+    //批量删除
+    const deleteTaskAll = () => {
+      let arr = state.selectRow;
+      console.log("选择的行信息",arr);
+      arr.map( value => {
+        let obj = {
+          projectTaskIds: value,
+        }
+        api
+        .deleteTask(obj)
+        .then((res) => {
+          console.log(res);
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+      })
+    }
     const onSelectChange = (selectedRowKeys) => {
       console.log("selectedRowKeys changed: ", selectedRowKeys);
       state.selectedRowKeys = selectedRowKeys;
@@ -1817,6 +1860,8 @@ export default {
       selectRowAll,
       changeCourseType,
       getStageData,
+      moveTask,
+      deleteTaskAll,
     };
   },
 };