From 85713a9c046fc6d41236910a57814c3aeb51747a Mon Sep 17 00:00:00 2001 From: caozc Date: Sat, 25 Feb 2023 17:06:54 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=82=AC=E4=BF=83?= =?UTF-8?q?=E8=80=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/index1.js | 2 ++ .../drawers/project/ProjectExamManage.vue | 22 ++++++++++++++++--- .../project/ProjectExternalExamManage.vue | 22 ++++++++++++++++--- .../RouterExaminationExternalManage.vue | 21 ++++++++++++++++-- .../router/RouterExaminationManage.vue | 22 ++++++++++++++++--- 5 files changed, 78 insertions(+), 11 deletions(-) diff --git a/src/api/index1.js b/src/api/index1.js index e72c8d52..db43fa13 100644 --- a/src/api/index1.js +++ b/src/api/index1.js @@ -222,6 +222,8 @@ export const updateStuCert = (obj) => http.post('/admin/certificate/updateStuCer //添加外部考试 export const createExamination = (obj) => http.post('/examination/createExamination', obj) +//催促考试 +export const batchSendMessage = (obj) => http.post('/admin/taskmanage/batchSendMessage', obj) // 外部考试导入成绩 export const ImportExternalExamScore = (obj) => http.post('/admin/external/exam/manage/importExternalExamScore', obj, { headers: { "Content-Type": "multipart/form-data" } }) //分组 diff --git a/src/components/drawers/project/ProjectExamManage.vue b/src/components/drawers/project/ProjectExamManage.vue index 2bb9e61b..4b1ff864 100644 --- a/src/components/drawers/project/ProjectExamManage.vue +++ b/src/components/drawers/project/ProjectExamManage.vue @@ -56,11 +56,11 @@
- +
导出数据
@@ -126,6 +126,7 @@ import { message } from "ant-design-vue"; import EScore from "../ExportScore.vue"; import CheckAnsware from '../CheckAnsware.vue' import * as api from '../../../api/indexTaskManage'; +import { batchSendMessage } from "@/api/index1"; // import * as api from "../../../api/index"; export default { @@ -364,7 +365,22 @@ export default { //催促学员学习 const godie = () => { - message.destroy(); + //项目催促请求报文 + var obj = { + 'courseId': props.datasource.courseId,//任务的Id + 'courseName': props.title,//任务的名称 + 'logo': '1',//项目或径的标识 1-项目 2-路径图 3面授课 + 'routerTaskId': props.datasource.routerId,//任务的routerTaskld或projectTaskld + 'targetId': props.datasource.routerId,//路径图的就是routerId,项目的是projectId;根据这张图来看的话 + 'taskType': props.datasource.type,//催促的任务的类型 + 'chapterId': props.datasource.chapterId,//阶段或关卡Id + }; + batchSendMessage(obj).then(res => { + console.log(res) + message.success("成功"); + }).catch(err => { + console.log(err) + }) message.success("催促" + props.title + "成功"); }; //导入成绩 diff --git a/src/components/drawers/project/ProjectExternalExamManage.vue b/src/components/drawers/project/ProjectExternalExamManage.vue index 151ec439..61f62857 100644 --- a/src/components/drawers/project/ProjectExternalExamManage.vue +++ b/src/components/drawers/project/ProjectExternalExamManage.vue @@ -57,11 +57,11 @@
- +
导出数据
@@ -130,6 +130,7 @@ import { message } from "ant-design-vue"; import ExportAchievement from "../ExportAchievement.vue"; import * as api from '../../../api/indexTaskManage'; + import { batchSendMessage } from "@/api/index1"; export default { name: "ProjectExternalExamManage", @@ -359,7 +360,22 @@ //催促学员学习 const godie = () => { - message.destroy(); + //项目催促请求报文 + var obj = { + 'courseId': props.datasource.courseId,//任务的Id + 'courseName': props.title,//任务的名称 + 'logo': '1',//项目或径的标识 1-项目 2-路径图 3面授课 + 'routerTaskId': props.datasource.routerId,//任务的routerTaskld或projectTaskld + 'targetId': props.datasource.routerId,//路径图的就是routerId,项目的是projectId;根据这张图来看的话 + 'taskType': props.datasource.type,//催促的任务的类型 + 'chapterId': props.datasource.chapterId,//阶段或关卡Id + }; + batchSendMessage(obj).then(res => { + console.log(res) + message.success("成功"); + }).catch(err => { + console.log(err) + }) message.success("催促" + props.title + "成功"); }; //导入成绩 diff --git a/src/components/drawers/router/RouterExaminationExternalManage.vue b/src/components/drawers/router/RouterExaminationExternalManage.vue index 41006a32..84cc0c66 100644 --- a/src/components/drawers/router/RouterExaminationExternalManage.vue +++ b/src/components/drawers/router/RouterExaminationExternalManage.vue @@ -57,10 +57,10 @@
- +
导出数据
@@ -129,6 +129,7 @@ import { message } from "ant-design-vue"; import ExportAchievement from "../ExportAchievement.vue"; import * as api from '../../../api/indexTaskManage'; + import { batchSendMessage } from "@/api/index1"; // import * as api from "../../../api/index"; export default { @@ -363,6 +364,22 @@ //催促学员学习 const godie = () => { message.destroy(); + //考试催促请求报文 + var obj = { + 'courseId': props.datasource.courseId,//任务的Id + 'courseName': props.title,//任务的名称 + 'logo': '2',//项目或径的标识 1-项目 2-路径图 3面授课 + 'routerTaskId': props.datasource.routerId,//任务的routerTaskld或projectTaskld + 'targetId': props.datasource.routerId,//路径图的就是routerId,项目的是projectId;根据这张图来看的话 + 'taskType': props.datasource.type,//催促的任务的类型 + 'chapterId': props.datasource.chapterId,//阶段或关卡Id + }; + batchSendMessage(obj).then(res => { + console.log(res) + message.success("成功"); + }).catch(err => { + console.log(err) + }) message.success("催促" + props.title + "成功"); }; //导入成绩 diff --git a/src/components/drawers/router/RouterExaminationManage.vue b/src/components/drawers/router/RouterExaminationManage.vue index b8792fc8..4b1b0212 100644 --- a/src/components/drawers/router/RouterExaminationManage.vue +++ b/src/components/drawers/router/RouterExaminationManage.vue @@ -33,10 +33,10 @@
- +
导出数据
@@ -88,6 +88,7 @@ import { message } from "ant-design-vue"; import EScore from "../ExportScore.vue"; import CheckAnsware from '../CheckAnsware.vue' import * as api from '../../../api/indexTaskManage'; +import { batchSendMessage } from "@/api/index1"; // import * as api from "../../../api/index"; export default { @@ -365,7 +366,22 @@ export default { //催促学员学习 const godie = () => { - message.destroy(); + //考试催促请求报文 + var obj = { + 'courseId': props.datasource.courseId,//任务的Id + 'courseName': props.title,//任务的名称 + 'logo': '2',//项目或径的标识 1-项目 2-路径图 3面授课 + 'routerTaskId': props.datasource.routerId,//任务的routerTaskld或projectTaskld + 'targetId': props.datasource.routerId,//路径图的就是routerId,项目的是projectId;根据这张图来看的话 + 'taskType': props.datasource.type,//催促的任务的类型 + 'chapterId': props.datasource.chapterId,//阶段或关卡Id + }; + batchSendMessage(obj).then(res => { + console.log(res) + message.success("成功"); + }).catch(err => { + console.log(err) + }) message.success("催促" + props.title + "成功"); }; //导入成绩 From ab2a37e485b26fa13b95e62ea28e395c09008fc4 Mon Sep 17 00:00:00 2001 From: lpq Date: Sat, 25 Feb 2023 17:16:23 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=B0=8F=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/TaskPage.vue | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 8d005e88..6932944a 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -3101,6 +3101,7 @@ export default { }; //点击确定创建小组 const createG = () => { + debugger if (!state.groupInfo.groupName) { return message.warning("请输入小组名称"); } @@ -3114,7 +3115,6 @@ export default { return message.warning("请输入组员数量"); } createGroup(); - closeModal2(); }; const showFaceIn = () => { state.TaskFaceImpStuvisible = true; @@ -3931,18 +3931,19 @@ export default { }; //创建小组 const createGroup = async () => { + debugger console.log("state.groupPageList" + state.groupPageList); - const d = state.groupPageList.filter( + const id = state.groupInfo.id; + const d = state.groupPageList.filter(item => item.id !== id).filter( (item) => item.leaderId === state.groupInfo.leaderId ); - const id = state.groupInfo.id; if (state.isEdit) { if (d.length > 0 && d[0].id !== id) { return message.warn(d[0].leaderName + "已是小组长，请重新选择"); } } else { if (d.length > 0) { - return message.warn(d[0].leaderName + "已是小组长，请重新选择"); + return message.warn(d[0].leaderName + "已是小组长，请重新选择"); } } // 过滤掉编辑时候，只修改了组员最大值时候 @@ -3953,6 +3954,7 @@ export default { getGroup(); console.log("state.groupPageList:"); getStu(); + closeModal2(); }; //搜索小组重置 const resetGroupName = () => { From fad70a8ad34c64d26bf7bc1727dde9e3028a7c4f Mon Sep 17 00:00:00 2001 From: wyx Date: Sat, 25 Feb 2023 17:21:59 +0800 Subject: [PATCH 03/10] =?UTF-8?q?fix:=E9=A1=B9=E7=9B=AE=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=88=86=E9=A1=B5=E5=88=A4=E6=96=AD=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/ProjectAudit.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/drawers/ProjectAudit.vue b/src/components/drawers/ProjectAudit.vue index 0f035ae4..6ceb745e 100644 --- a/src/components/drawers/ProjectAudit.vue +++ b/src/components/drawers/ProjectAudit.vue @@ -304,7 +304,7 @@ export default { faceclassScene: [], projectInfo: {}, - tableDataTotal: 20, + tableDataTotal: 2, pageSize: 10, currentPage: 1, tableData: [], From 8922047f51edd254e05c5c1e8b7f0e9442fa2dae Mon Sep 17 00:00:00 2001 From: wyx Date: Sat, 25 Feb 2023 17:26:46 +0800 Subject: [PATCH 04/10] =?UTF-8?q?style:=E9=82=80=E8=AF=B7=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/examine/CourseReviewedN.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/examine/CourseReviewedN.vue b/src/views/examine/CourseReviewedN.vue index 24994c86..826162fa 100644 --- a/src/views/examine/CourseReviewedN.vue +++ b/src/views/examine/CourseReviewedN.vue @@ -148,10 +148,10 @@ + centered="true" style="height:400px;">
-
+
请选择教师 From 4e47e2ce3941e8415aafaaa7cea5ff5a568e1610 Mon Sep 17 00:00:00 2001 From: lpq Date: Sat, 25 Feb 2023 17:31:03 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E4=BA=BA=E6=95=B0?= =?UTF-8?q?=E5=8F=AA=E8=83=BD=E7=94=B1=E5=B0=8F=E6=94=B9=E5=A4=A7=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E7=94=B1=E5=A4=A7=E6=94=B9=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/TaskPage.vue | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 6932944a..a2c28d0c 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -2456,6 +2456,7 @@ export default { valueaddm: "", //创建小组输入小组长 valueaddg: "", //创建小组输入名称 groupInfo: { leaderName: "", leaderId: "" }, //创建小组 + groupMemberCountContrast: null, groupPageList: [], //小组列表 groupNumber: 0, //组员人数 valuestun: "", //学员管理姓名 @@ -3083,7 +3084,6 @@ export default { }; //显示学员换组弹窗 const showChangeGroupModal = (record) => { - debugger; console.log("单个"); state.changegroupV = true; console.log("点击换组", record.id); @@ -3094,14 +3094,15 @@ export default { state.isEdit = isEdit; state.stugroup = true; state.groupInfo = item || {}; + state.groupMemberCountContrast = item.groupMemberCount; }; const closeModal2 = () => { state.stugroup = false; state.groupInfo = {}; + state.groupMemberCountContrast = null; }; //点击确定创建小组 const createG = () => { - debugger if (!state.groupInfo.groupName) { return message.warning("请输入小组名称"); } @@ -3165,7 +3166,6 @@ export default { } //考勤的抽屉 const showAA = (course, a, data) => { - debugger; state.AAvisible = true; state.liveData = data; state.showKaoqinText = "直播"; @@ -3931,7 +3931,6 @@ export default { }; //创建小组 const createGroup = async () => { - debugger console.log("state.groupPageList" + state.groupPageList); const id = state.groupInfo.id; const d = state.groupPageList.filter(item => item.id !== id).filter( @@ -3941,12 +3940,16 @@ export default { if (d.length > 0 && d[0].id !== id) { return message.warn(d[0].leaderName + "已是小组长，请重新选择"); } + // 小组人数只能由小改大，不能由大改小 + if (state.groupMemberCountContrast > state.groupInfo.groupMemberCount) { + return message.warn("当前不支持修改组员人数小于原组员数量。"); + } } else { if (d.length > 0) { return message.warn(d[0].leaderName + "已是小组长，请重新选择"); } } - // 过滤掉编辑时候，只修改了组员最大值时候 + state.isEdit = false; await editGroup({ ...state.groupInfo, projectId: state.projectId }); From b11fa0066a0b9ec36f216d6a98eed5c9d8ff5dd1 Mon Sep 17 00:00:00 2001 From: lpq Date: Sat, 25 Feb 2023 17:43:08 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E7=9B=B4=E6=92=AD=E8=80=83=E5=8B=A4?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/ActiveAttendance.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue index b40ab272..1fedd458 100644 --- a/src/components/drawers/ActiveAttendance.vue +++ b/src/components/drawers/ActiveAttendance.vue @@ -71,7 +71,7 @@
-
导出数据
+
导出数据1