Merge remote-tracking branch 'origin/develop' into develop

src/api/indexTask.js

@@ -11,4 +11,8 @@ export const RouterEditTask = (obj) => http.post('/admin/router/editTask',obj)
 // 删除关卡任务
 export const RouterDeleteTask = (obj) => http.post('/admin/router/deleteTask',obj);
 // 删除项目任务
-export const ProjectDeleteTask = (obj) => http.delete('/admin/project/deleteTask',obj);
+export const ProjectDeleteTask = (obj) => http.delete('/admin/project/deleteTask',obj);
+// 判断当前在线课是否已经添加到该路径图下
+export const IsExistence = (obj) => http.post('/admin/router/queryTaskDoesItExist',obj);
+// 判断当前在线课是否已经添加到该项目下
+export const IsExistenceProject = (obj) => http.post('/admin/project/queryTaskDoesItExistForProject',obj);

src/components/drawers/AddOnline.vue

@@ -134,7 +134,7 @@ import * as api from "../../api/indexOnline.js";
 import * as apiTask from "../../api/indexTaskadd";
 // import { setCookie } from "../../api/method"
 import { message } from "ant-design-vue";
-import { RouterEditTask } from "@/api/indexTask";
+import { RouterEditTask, IsExistence, IsExistenceProject } from "@/api/indexTask";
 import { addTempTask } from "../../api/indexTaskadd";
 export default {
   name: "AddOnline",
@@ -272,6 +272,7 @@ export default {
     const onSelectChange = (selectedRowKeys,selectedRows) => {
         state.selectedRowKeys = selectedRowKeys;
         state.addOnlineList = selectedRows;
+        console.log(selectedRowKeys,selectedRows)
         if( props.edit && selectedRows.length > 0 ){
           selectedRows.map((value)=>{
             if(value.courseId == props.EditOnlineId){
@@ -311,7 +312,6 @@ export default {
         }
       });
       state.tableData = array;
-      state.tableDataTotal = state.tableData.length
     };
     //获取全部在线信息接口
     const getAllOnlineText = () => {
@@ -330,17 +330,80 @@ export default {
           "sysType3": "",
         })
         .then((res) => {
-          let arr = res.data.data;
+          let arr = res.data.data.list;
+          state.tableDataTotal = res.data.data.count
           if (res.status === 200) {
+            console.log('获取在线课列表数据', res)
             getTableDate(arr);
           }
         })
         .catch((err) => {
             console.log(err,'请求失败在线');});
     };
+
+    // 校验当前在线课是否已经添加进来了
+    const isExistence = (id) => {
+
+      console.log({
+        "chapterId": Number(props.isactive),
+        "courseTaskId": Number(id),
+        "routerId": props.routerId,
+        "type": 1
+      })
+
+      IsExistence({
+        "chapterId": Number(props.isactive),
+        "courseTaskId": Number(id),
+        "routerId": props.routerId,
+        "type": 1
+      }).then(res=>{
+        console.log('我是不是已经添加了',res)
+      }).catch(err=>{
+        console.log(err)
+      })
+    }
+
+    // 判断项目中是否添加当前在线课
+    const IsExistenceProjects = () => {
+      IsExistenceProject({
+        "courseTaskId": props.projectTaskId || 0,
+        "projectId": props.projectId,
+        "stageId": props.chooseStageId || 0,
+        "type": 1
+      }).then(res=>{
+        console.log(res)
+      }).catch(err=>{
+        console.log(err)
+      })
+    }
+
     const updateTask = () => {
+
+      
+      if(props.isLevel == 1){
+        // isExistence(23)
+        // return
+        // let routerarr = []
+        // console.log('我是要便利的数据1', state.addOnlineList)
+        // state.addOnlineList.map((value) => {
+        //   routerarr.push(isExistence(value.courseId))
+        // })
+        // console.log('当前是否已经添加了',routerarr)
+      }
+
+      if(props.isLevel == 2){
+        console.log('我是要便利的数据2', state.addOnlineList)
+
+      }
+
+      if(props.isLevel == 3){
+        console.log('我是要便利的数据3', state.addOnlineList)
+
+      }
+
       if (props.isLevel == 1) {
         state.addOnlineList.map((value) => {
+          console.log(value)
           RouterEditTask({
           chapterId: Number(props.isactive),
           courseId: value.num,
@@ -445,6 +508,8 @@ export default {
       updateTask,
       searchList,
       resetOnline,
+      isExistence,
+      IsExistenceProjects
     };
   },
 };