From 1e85b573196c9bdb96d7c6e552bd48e749c858f1 Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Mon, 5 Dec 2022 15:39:22 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE/?= =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E8=B7=AF=E5=BE=84=E5=9B=BE=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9C=A8=E7=BA=BF=E8=AF=BE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddOnline.vue | 168 +++++++++++++++++++-------- 1 file changed, 119 insertions(+), 49 deletions(-) diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue index c8451a80..54085551 100644 --- a/src/components/drawers/AddOnline.vue +++ b/src/components/drawers/AddOnline.vue @@ -364,14 +364,20 @@ export default { } // 判断项目中是否添加当前在线课 - const IsExistenceProjects = () => { - IsExistenceProject({ - "courseTaskId": props.projectTaskId || 0, + const IsExistenceProjects = (id) => { + console.log('参数传递',{ + "courseTaskId": id, "projectId": props.projectId, "stageId": props.chooseStageId || 0, "type": 1 + }) + IsExistenceProject({ + "courseTaskId": id, + "projectId": Number(props.projectId), + "stageId": props.chooseStageId || 0, + "type": 1 }).then(res=>{ - console.log(res) + console.log('项目中是否包含此在线课了',res) }).catch(err=>{ console.log(err) }) @@ -391,60 +397,124 @@ export default { // 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, - name: value.name, - routerId: props.routerId, - routerTaskId: props.routerTaskId || 0, - type: 1, + console.log('我是要便利的数据2', state.addOnlineList) + let l_data = state.addOnlineList; + let l_data_id = [] + l_data.map((item)=>{ + l_data_id.push(item["courseId"]) }) - .then(() => { - message.destroy(); - message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); - ctx.emit("changeData", false); - closeDrawer(); - state.addLoading = false; - }) - .catch(() => { - message.destroy(); - message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`); - }); + + console.log('需要查询的在线课ID',l_data_id) + + IsExistence({ + "chapterId": Number(props.isactive), + "courseTaskId": l_data_id, + "routerId": props.routerId, + "type": 1 + }).then(res=>{ + console.log('路径图中是否包含此在线课了',res) + if(res.data.data.length){ + let strdata = res.data.data + let tipStr = '' + for(let i=0;i { + console.log(value) + RouterEditTask({ + chapterId: Number(props.isactive), + courseId: value.num, + name: value.name, + routerId: props.routerId, + routerTaskId: props.routerTaskId || 0, + type: 1, + }) + .then(() => { + message.destroy(); + message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); + ctx.emit("changeData", false); + closeDrawer(); + state.addLoading = false; + }) + .catch(() => { + message.destroy(); + message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`); + }); + }) + } + }).catch(err=>{ + console.log(err) }) + } else if (props.isLevel === 2) { - state.addOnlineList.map((value) => { - apiTask - .addTask({ - courseId: value.num, - name: value.name, - projectId: props.projectId, - projectTaskId: props.projectTaskId || 0, - stageId: props.chooseStageId || 0, - type: 1, - }) - .then(() => { - message.destroy(); - message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); - ctx.emit("changeData", false); - closeDrawer(); - }) - .catch(() => { - message.destroy(); - message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); - }); + console.log('我是要便利的数据2', state.addOnlineList) + let p_data = state.addOnlineList; + let p_data_id = [] + p_data.map((item)=>{ + p_data_id.push(item["courseId"]) + }) + + console.log('需要查询的在线课ID',p_data_id) + + IsExistenceProject({ + "courseTaskId": p_data_id, + "projectId": Number(props.projectId), + "stageId": props.chooseStageId || 0, + "type": 1 + }).then(res=>{ + console.log('项目中是否包含此在线课了',res) + if(res.data.data.length){ + let strdata = res.data.data + let tipStr = '' + for(let i=0;i { + apiTask + .addTask({ + courseId: value.num, + name: value.name, + projectId: props.projectId, + projectTaskId: props.projectTaskId || 0, + stageId: props.chooseStageId || 0, + type: 1, + }) + .then(() => { + message.destroy(); + message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); + ctx.emit("changeData", false); + closeDrawer(); + }) + .catch(() => { + message.destroy(); + message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); + }); + }) + } + }).catch(err=>{ + console.log(err) }) } else if (props.isLevel == 3) { addTempTask({ From cf6d1cdfa7b6159a558f76098b43cdb203982a1a Mon Sep 17 00:00:00 2001 From: lixg Date: Mon, 5 Dec 2022 16:09:15 +0800 Subject: [PATCH 2/3] fix:bug --- src/api/config.js | 4 +- src/api/indexProjStu.js | 11 +- src/components/drawers/MemberList.vue | 132 ++++++++++++++++++++-- src/views/learningpath/LearningPath.vue | 23 ++-- src/views/learningpath/LevelAdd.vue | 2 +- src/views/learningpath/LevelAddDetail.vue | 41 ++++--- 6 files changed, 180 insertions(+), 33 deletions(-) diff --git a/src/api/config.js b/src/api/config.js index 965764b6..b08dfeb6 100644 --- a/src/api/config.js +++ b/src/api/config.js @@ -2,7 +2,7 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2022-11-21 14:32:52 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2022-12-05 00:00:40 + * @LastEditTime: 2022-12-05 10:24:53 * @FilePath: /fe-manage/src/api/config.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -56,7 +56,7 @@ http.interceptors.response.use( return response; } else { if (code === 1000) { - window.open("https://u-pre.boe.com/web/", '_self'); + // window.open("https://u-pre.boe.com/web/", '_self'); // window.open("http://111.231.196.214:12013/manage/login", '_self'); } console.log("api %o", msg); diff --git a/src/api/indexProjStu.js b/src/api/indexProjStu.js index 050d59ba..e620b460 100644 --- a/src/api/indexProjStu.js +++ b/src/api/indexProjStu.js @@ -1,3 +1,11 @@ +/* + * @Author: lixg lixg@dongwu-inc.com + * @Date: 2022-11-18 14:09:43 + * @LastEditors: lixg lixg@dongwu-inc.com + * @LastEditTime: 2022-12-05 15:27:36 + * @FilePath: /fe-manage/src/api/indexProjStu.js + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ import http from "./config"; //获取项目学员列表 @@ -14,7 +22,8 @@ export const deleteGroup = (obj) => http.delete('/admin/project/deleteGroup', { //新增或编辑小组 export const editGroup = (obj) => http.post('/admin/project/editGroup', obj) - +//移除小组成员 +export const removeGroupStudent = (obj) => http.post('/admin/project/removeGroupStudent', obj) //查看学员 export const studentProcess = (obj) => http.get('/admin/project/studentProcess', { params: obj }) diff --git a/src/components/drawers/MemberList.vue b/src/components/drawers/MemberList.vue index 5f163a64..5c85db90 100644 --- a/src/components/drawers/MemberList.vue +++ b/src/components/drawers/MemberList.vue @@ -140,7 +140,7 @@
-
请确认是否批量删除组员
+
请确认是否删除组员
@@ -160,7 +160,7 @@