diff --git a/src/api/config.js b/src/api/config.js index 2cff0a05..26ebbc05 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 16:10:06 * @FilePath: /fe-manage/src/api/config.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -55,10 +55,10 @@ http.interceptors.response.use( if (code === 0 || code === 200) { return response; } else { - // if (code === 1000) { - // window.open("https://u-pre.boe.com/web/", "_self"); - // // window.open("http://111.231.196.214:12013/manage/login", '_self'); - // } + if (code === 1000) { + // 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); } return response; 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/AddOnline.vue b/src/components/drawers/AddOnline.vue index c8451a80..57473288 100644 --- a/src/components/drawers/AddOnline.vue +++ b/src/components/drawers/AddOnline.vue @@ -62,7 +62,10 @@
已选择 - {{ selectedRowKeys.length }} + {{ 1 }} + {{ + selectedRowKeys.length + }} 项
- - -
- +
+
+ 选择在线课 +
+
+
+ +
+ +
+
+
+
+ +
+ +
@@ -134,7 +171,11 @@ 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, IsExistence, IsExistenceProject } from "@/api/indexTask"; +import { + RouterEditTask, + IsExistence, + IsExistenceProject, +} from "@/api/indexTask"; import { addTempTask } from "../../api/indexTaskadd"; export default { name: "AddOnline", @@ -193,8 +234,8 @@ export default { }, { value: "录播课", - label: "录播课" - } + label: "录播课", + }, ], time: undefined, onlineClassesId: null, @@ -202,12 +243,17 @@ export default { selectV: "", selectedRowKeys: [], tableData: [], - addOnlineList:[], + addOnlineList: [], currentPage: 1, tableDataTotal: 0, pageSize: 10, + choicecourse: true, }); + const ChoiceCourse = () => { + state.choicecourse = false; + }; const closeDrawer = () => { + state.choicecourse = true; ctx.emit("update:addonlineVisible", false); ctx.emit("update:edit", false); state.inputV1 = ""; @@ -218,7 +264,7 @@ export default { localStorage.setItem("chapterId", props.isactive); }; const afterVisibleChange = (bol) => { - if(bol == true){ + if (bol == true) { getAllOnlineText(); } }; @@ -269,20 +315,21 @@ export default { ]; return columns; }; - 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){ - message.destroy() - message.error('选项相同，请重新选择') - state.selectedRowKeys = [] - state.addOnlineList = [] - } - }) - } + const onSelectChange = (selectedRowKeys, selectedRows) => { + state.selectedRowKeys = selectedRowKeys; + state.addOnlineList = selectedRows; + console.log(selectedRowKeys, selectedRows); + if (props.edit && selectedRows.length > 0) { + selectedRows.map((value) => { + console.log(props, value); + if (value.courseId == props.EditOnlineId) { + message.destroy(); + message.error("选项相同，请重新选择"); + state.selectedRowKeys = []; + state.addOnlineList = []; + } + }); + } }; //清空所选 const clearLine = () => { @@ -296,16 +343,16 @@ export default { const getTableDate = (tableData) => { let data = tableData; let array = []; - data.map((value,index) => { + data.map((value, index) => { { let obj = { key: index + 1, - num:value.onlineClassesId, - name:value.name, - contenttype:value.contentType == 10 ? "微课" : "录播课", - teacher:value.teacher, - sysCreateBy:value.sysCreateBy, - overtime:"", + num: value.onlineClassesId, + name: value.name, + contenttype: value.contentType == 10 ? "微课" : "录播课", + teacher: value.teacher, + sysCreateBy: value.sysCreateBy, + overtime: "", courseId: Number(value.onlineClassesId), }; array.push(obj); @@ -317,70 +364,74 @@ export default { const getAllOnlineText = () => { api .queryOnlinelList({ - "createUser": "", - "keyword": state.inputV1, - "orderAsc": true, - "orderField": "", - "pageIndex": state.currentPage, - "pageSize": state.pageSize, - "publish": true, - "status": 0, - "sysType1": "", - "sysType2": "", - "sysType3": "", + createUser: "", + keyword: state.inputV1, + orderAsc: true, + orderField: "", + pageIndex: state.currentPage, + pageSize: state.pageSize, + publish: true, + status: 0, + sysType1: "", + sysType2: "", + sysType3: "", }) .then((res) => { let arr = res.data.data.list; - state.tableDataTotal = res.data.data.count + state.tableDataTotal = res.data.data.count; if (res.status === 200) { - console.log('获取在线课列表数据', res) + console.log("获取在线课列表数据", res); getTableDate(arr); } }) .catch((err) => { - console.log(err,'请求失败在线');}); + console.log(err, "请求失败在线"); + }); }; - // 校验当前在线课是否已经添加进来了 const isExistence = (id) => { - console.log({ - "chapterId": Number(props.isactive), - "courseTaskId": Number(id), - "routerId": props.routerId, - "type": 1 - }) - + 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) + chapterId: Number(props.isactive), + courseTaskId: Number(id), + routerId: props.routerId, + type: 1, }) - } - + .then((res) => { + console.log("我是不是已经添加了", res); + }) + .catch((err) => { + console.log(err); + }); + }; // 判断项目中是否添加当前在线课 - const IsExistenceProjects = () => { + const IsExistenceProjects = (id) => { + console.log("参数传递", { + courseTaskId: id, + projectId: props.projectId, + stageId: props.chooseStageId || 0, + type: 1, + }); IsExistenceProject({ - "courseTaskId": props.projectTaskId || 0, - "projectId": props.projectId, - "stageId": props.chooseStageId || 0, - "type": 1 - }).then(res=>{ - console.log(res) - }).catch(err=>{ - console.log(err) + courseTaskId: id, + projectId: Number(props.projectId), + stageId: props.chooseStageId || 0, + type: 1, }) - } - + .then((res) => { + console.log("项目中是否包含此在线课了", res); + }) + .catch((err) => { + console.log(err); + }); + }; const updateTask = () => { - - - if(props.isLevel == 1){ + if (props.isLevel == 1) { // isExistence(23) // return // let routerarr = [] @@ -390,62 +441,130 @@ 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 == 3){ - console.log('我是要便利的数据3', state.addOnlineList) - - } - if (props.isLevel == 1) { - state.addOnlineList.map((value) => { - console.log(value) - RouterEditTask({ + console.log("我是要便利的数据2", state.addOnlineList); + let l_data = state.addOnlineList; + let l_data_id = []; + l_data.map((item) => { + l_data_id.push(item["courseId"]); + }); + console.log("需要查询的在线课ID", l_data_id); + IsExistence({ chapterId: Number(props.isactive), - courseId: value.num, - name: value.name, + courseTaskId: l_data_id, routerId: props.routerId, - routerTaskId: props.routerTaskId || 0, type: 1, }) - .then(() => { - message.destroy(); - message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); - ctx.emit("changeData", false); - closeDrawer(); - state.addLoading = false; + .then((res) => { + console.log("路径图中是否包含此在线课了", res); + if (res.data.data.length) { + let strdata = res.data.data; + let tipStr = ""; + for (let i = 0; i < strdata.length; i++) { + if (i == strdata.length - 1) { + tipStr += strdata[i].courseName; + } else { + tipStr += strdata[i].courseName + "/"; + } + } + message.destroy(); + message.info("在线课（" + tipStr + "）重复添加"); + return; + } else { + 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, + }) + .then(() => { + message.destroy(); + message.success( + `${props.edit ? "编辑" : "新增"}关卡任务成功` + ); + ctx.emit("changeData", false); + closeDrawer(); + state.addLoading = false; + }) + .catch(() => { + message.destroy(); + message.error( + `${props.edit ? "编辑" : "新增"}关卡任务失败` + ); + }); + }); + } }) - .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 < strdata.length; i++) { + if (i == strdata.length - 1) { + tipStr += strdata[i].courseName; + } else { + tipStr += strdata[i].courseName + "/"; + } + } + message.destroy(); + message.info("在线课（" + tipStr + "）重复添加"); + return; + } else { + 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 ? "编辑" : "新增"}阶段任务失败` + ); + }); + }); + } + }) + .catch((err) => { + console.log(err); + }); } else if (props.isLevel == 3) { addTempTask({ courseId: state.onlineClassesId, @@ -466,21 +585,18 @@ export default { message.error(`${props.edit ? "编辑" : "新增"}模板库任务失败`); }); } - - //if(state.addOnlineList.Target==undefined){ - // closeDrawer(); + // closeDrawer(); //} - }; //搜索在线列表 - const searchList = ()=> { - if(state.inputV1 !== '' || state.selectV !== ''){ - getAllOnlineText() - }else { - resetOnline() + const searchList = () => { + if (state.inputV1 !== "" || state.selectV !== "") { + getAllOnlineText(); + } else { + resetOnline(); } - } + }; //重置在线信息 const resetOnline = () => { state.inputV1 = ""; @@ -490,11 +606,11 @@ export default { state.currentPage = 1; getAllOnlineText(); }; - onMounted(()=>{ + onMounted(() => { // let cookie = // "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2Njk0MjgwNTAsImV4cCI6MTY2OTQzNTI1MCwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.9ea5ce6d4cd43c2c17f21a293e4dc0d362c2a404b9d50fae5c49fed5a238fb1a"; // setCookie("token", cookie, 10); - }) + }); return { ...toRefs(state), afterVisibleChange, @@ -509,7 +625,8 @@ export default { searchList, resetOnline, isExistence, - IsExistenceProjects + IsExistenceProjects, + ChoiceCourse, }; }, }; @@ -661,7 +778,6 @@ export default { th.h { background-color: #eff4fc !important; } - .ant-table-tbody > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) > td { @@ -677,7 +793,6 @@ export default { } } } - .main_btns { height: 72px; width: 100%; 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 @@