diff --git a/src/api/indexProjStu.js b/src/api/indexProjStu.js new file mode 100644 index 00000000..0dc883a6 --- /dev/null +++ b/src/api/indexProjStu.js @@ -0,0 +1,7 @@ +import http from "./config"; + +//获取项目学员列表 +export const getProjStu = (obj) => http.post('/admin/project/studentList', obj) + +//删除学员 +export const deleteStu = (obj) => http.post('/admin/project/deleteStudent', obj) \ No newline at end of file diff --git a/src/components/drawers/AddRef.vue b/src/components/drawers/AddRef.vue index 28e78e79..4ce041f5 100644 --- a/src/components/drawers/AddRef.vue +++ b/src/components/drawers/AddRef.vue @@ -130,6 +130,14 @@ export default { type: Number, default: null, }, + isactive: { + type: Number, + default: null, + }, + routerId: { + type: Number, + default: null, + }, }, setup(props, ctx) { const state = reactive({ @@ -174,7 +182,7 @@ export default { }; const handleFinish = values => { console.log(values); - updateRef(props.workId) + updateRef(props.EditRefId) }; const handleFinishFailed = errors => { console.log(errors); @@ -287,12 +295,12 @@ export default { //学习路径的创建 if (props.isStudy == 1) { let objj = { - chapterId: 36, - courseId: 0, + chapterId: props.isactive, + courseId: res.data.data.linkId, duration: 0, flag: true, name: obj.linkName, - routerId: 92, + routerId: props.routerId, routerTaskId: 0, type: 7, }; diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index 7299f769..fcb825b0 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -208,15 +208,15 @@
@@ -232,14 +232,15 @@
+ v-model:routerTaskId="routerTaskId" + />
@@ -512,7 +513,13 @@ margin-right: 25px; cursor: pointer; " - @click="decideType(element.lei, element.courseId,element.id)" + @click=" + decideType( + element.lei, + element.courseId, + element.id + ) + " > 编辑 @@ -1069,10 +1076,10 @@ export default { deleteModal: false, // 删除弹窗 deleteID: "", // 要删除的任务的id editID: "", // 要编辑的任务id - EditWorkId:"", // 要编辑的 workid + EditWorkId: "", // 要编辑的 workid EditTestId: "", - routerTaskId:"", - stageId:"", + routerTaskId: "", + stageId: "", isStudy: 1, cC: false, value1: "", @@ -1158,7 +1165,7 @@ export default { state.EditWorkId = id; state.routerTaskId = eleId; }; - const showDrawerAddTest = (id,eleId) => { + const showDrawerAddTest = (id, eleId) => { state.addtestvisible = true; state.EditTestId = id; state.routerTaskId = eleId; @@ -1209,7 +1216,7 @@ export default { GetRouterDetail(state.routerId) .then((res) => { state.level = res.data.data.chapterList; - if (state.level.length > 0) { + if (state.level.length > 0) { dataAssignment(state.level[0].chapterId); state.isactive = state.level[0].chapterId; } @@ -1590,15 +1597,17 @@ export default { state.editID = ""; }; const deleteLevelTask = () => { - deleteStudyTask({ routerTaskIds: state.deleteID }).then((res) =>{ - state.deleteModal = false - message.success('删除成功') - getDetail(); - console.log("删除成功", res) - }).catch((err) =>{ - message.error('删除失败'); - console.log(err); - }) + deleteStudyTask({ routerTaskIds: state.deleteID }) + .then((res) => { + state.deleteModal = false; + message.success("删除成功"); + getDetail(); + console.log("删除成功", res); + }) + .catch((err) => { + message.error("删除失败"); + console.log(err); + }); }; const showDrawerAddLive = () => { @@ -1728,10 +1737,10 @@ export default { showEditRefDrawer(id); } else if (type == "直播") { showEditLiveDrawer(id); - }else if (type == "作业") { - showDrawerAddHomework(id,eleId); - }else if (type == "考试") { - showDrawerAddTest(id,eleId); + } else if (type == "作业") { + showDrawerAddHomework(id, eleId); + } else if (type == "考试") { + showDrawerAddTest(id, eleId); } }; return { diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index 9ecf5d78..eeb9619d 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -139,10 +139,10 @@
-
-
@@ -209,7 +209,7 @@
编辑 @@ -778,42 +784,42 @@ -
-
-
-
-
选择任务移动到阶段
+ style="padding: 0" + :closable="sh" + v-model:visible="visiblene" + :footer="null" + centered="true" + wrapClassName="changeModal" + > +
+
+
+
+
选择任务移动到阶段
+
+
+
+
+
已选中{{ selectRow.length }}个任务
+
+ +
+
+ +
-
-
-
已选中{{selectRow.length}}个任务
-
- -
-
- - -
-
-
-
+
+
@@ -911,8 +917,10 @@ export default { : null, chooseStageId: null, edit: false, + // isRefEdit: 1, //外链编辑 + // isLiveEdit: 1, //直播编辑 isRefEdit: false, //外链编辑 - isLiveEdit:false, //直播编辑 + isLiveEdit: false, //直播编辑 EditRefId: null, //要编辑的外链的id EditLiveId: null, //要编辑的直播的id editDiscussId:null,//要编辑的讨论的id @@ -1060,7 +1068,7 @@ export default { selectedRowKeys: [], valuesname: "", valuesnotice: "", - visiblene: false,//移动任务弹窗 + visiblene: false, //移动任务弹窗 confirmModal: false, //确认添加阶段弹窗 cC: false, cancelModal: false, //确认取消阶段弹窗 @@ -1072,7 +1080,7 @@ export default { deleteInvistID: 4, //评估 deleteDiscussID: null, //删除讨论id deleteActivityID: null, //删除活动id - voteId:"", //删除投票id + voteId: "", //删除投票id deleteID: "", selectRow: [], //选择行 curLevel: [], //阶段名称 @@ -1320,7 +1328,7 @@ export default { if (leng > 0) { //获取任务列表 let arr = res.data.data.stageList[0].taskList; - console.log('任务列表',arr) + console.log("任务列表", arr); getTableData(arr); } @@ -1329,10 +1337,10 @@ export default { //console.log(stagearr, 111111); if (stagearr.length > 0) { getStageData(stagearr); - stagearr.map(value => { + stagearr.map((value) => { console.log(value); arrlist.push(); - }) + }); } //给阶段id赋初始值 state.chooseStageId = leng > 0 ? stagearr[0].stageId : null; @@ -1356,7 +1364,7 @@ export default { const changeVData = (data) => { console.log("8989", data); state.voteId = data.voteId; - } + }; //数据变化 const updateTableData = (data) => { console.log("添加数据", data); @@ -1543,7 +1551,6 @@ export default { }); }; - //删除评估测试 const deleteInvistText = () => { let obj = { @@ -1602,7 +1609,7 @@ export default { api .deleteTask(obj) .then((res) => { - console.log(res,'gggggggggggggggg'); + console.log(res, "gggggggggggggggg"); // deleteVoteText(); }) .catch((err) => { @@ -1663,7 +1670,7 @@ export default { }; const showChangeModal = () => { state.visiblene = true; - } + }; const closeChangeModal = () => { state.visiblene = false; }; @@ -1760,21 +1767,21 @@ export default { const showDrawerAddCase = () => { state.addcasevisible = true; }; - const showDrawerAddHomework = (id,eleId) => { - state.EditWorkId = id + const showDrawerAddHomework = (id, eleId) => { + state.EditWorkId = id; state.projectTaskId = eleId; state.addhomeworkvisible = true; }; - const showDrawerAddTest = (id,eleId) => { - state.EditTestId = id + const showDrawerAddTest = (id, eleId) => { + state.EditTestId = id; state.projectTaskId = eleId; state.addtestvisible = true; }; const showDrawerAddLive = () => { state.addlivevisible = true; }; - const showDrawerAddRef = (id,eleId) => { - state.EditRefId = id + const showDrawerAddRef = (id, eleId) => { + state.EditRefId = id; state.projectTaskId = eleId; state.addrefvisible = true; }; @@ -1782,12 +1789,12 @@ export default { state.adddiscussvisible = true; }; //打开编辑讨论的弹窗 - const showEditAddDiscuss = (id,eleId)=>{ - state.editDiscussId = id + const showEditAddDiscuss = (id, eleId) => { + state.editDiscussId = id; state.projectTaskId = eleId; state.adddiscussvisible = true; - } - const showDrawerAddActive = (id,eleId) => { + }; + const showDrawerAddActive = (id, eleId) => { state.addactivevisible = true; state.editActivityId = id; state.projectTaskId = eleId; @@ -1886,10 +1893,11 @@ export default { console.log("任务id", id); }; //打开编辑外链的弹窗 - const showEditRefDrawer = (id) => { + const showEditRefDrawer = (id, eleId) => { state.addrefvisible = true; state.isRefEdit = true; state.EditRefId = id; + state.projectTaskId = eleId; }; //打开编辑直播的弹窗 const showEditLiveDrawer = (id) => { @@ -1898,38 +1906,37 @@ export default { state.EditLiveId = id; }; //打开测评的弹窗 - const showEditEvalDrawer = (id,eleId) => { - console.log('222222222222222222222',id); + const showEditEvalDrawer = (id, eleId) => { + console.log("222222222222222222222", id); state.addevalvisible = true; state.projectTaskId = eleId; state.EditRefId = id; console.log(state.EditRefId); }; //编辑的按钮 - const decideType = (type, id,eleId) => { + const decideType = (type, id, eleId) => { state.edit = true; console.log(type, id); if (type == "外链") { - showEditRefDrawer(id); - } - else if (type == "直播") { - showEditLiveDrawer(id,eleId); + showEditRefDrawer(id, eleId); + } else if (type == "直播") { + showEditLiveDrawer(id, eleId); } else if (type == "测评") { - showEditEvalDrawer(id,eleId) + showEditEvalDrawer(id, eleId); } else if (type == "评估") { - showDrawerAddInvist(id,eleId); + showDrawerAddInvist(id, eleId); } else if (type == "投票") { - showDrawerAddVote(id,eleId); + showDrawerAddVote(id, eleId); } else if (type == "讨论") { - showEditAddDiscuss(id,eleId); + showEditAddDiscuss(id, eleId); } else if (type == "活动") { - showDrawerAddActive(id,eleId); - }else if (type == "作业") { - showDrawerAddHomework(id,eleId); - }else if (type == "考试") { - showDrawerAddTest(id,eleId); + showDrawerAddActive(id, eleId); + } else if (type == "作业") { + showDrawerAddHomework(id, eleId); + } else if (type == "考试") { + showDrawerAddTest(id, eleId); } - } + }; return { ...toRefs(state), selectProjectName, diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 0be5c04e..4ca4884a 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -317,12 +317,11 @@
- 必修 选修 + 必修 + 选修
@@ -341,7 +340,9 @@ trailColor="rgba(253, 209, 98, 0.2)" /> {{ (item.finishStuCnt/item.totalStuCnt)*100 }}%{{ + (item.finishStuCnt / item.totalStuCnt) * 100 + }}%
@@ -479,7 +480,7 @@ >
小组名称:
@@ -495,6 +496,8 @@
-
+
搜索
-
+
重置
@@ -532,7 +536,7 @@ 导入学员
-
+
批量删除
@@ -542,14 +546,14 @@
已选择
- 2 + {{ choosed }}
列表选项总计: - 4 + {{ total }}
-
清空
+
清空
-
取消
+
取消
-
确定
+
确定
@@ -1645,10 +1649,41 @@
+ +
+ +
+
+
+
+
+ 提示 +
+
+ 您确定批量删除吗? +
+
+
+
取消
+
+
+
确定
+
+
+
+
+
+