From 95363e23050ca32c0ac50e362751005f8da6f0a6 Mon Sep 17 00:00:00 2001 From: quhongwei <1632078442@qq.com> Date: Thu, 23 Feb 2023 21:55:08 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=AD=A6=E5=91=98=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index f998fe9d..d5c58ffc 100644 --- a/.env +++ b/.env @@ -22,7 +22,7 @@ VUE_APP_IFRAME_STUDENT_URL=//u-pre.boe.com/pc/loading VUE_APP_COURSE_STUDY=//u-pre.boe.com/pc/course/studyindex?id= # 导入学员模板 -VUE_APP_UP_LOAD_STUDENT_TEMPLATE=导入学员模版-1673963663229.xlsx +VUE_APP_UP_LOAD_STUDENT_TEMPLATE=/file/导入学员模版-1677158563339.xlsx # 外部考试导入成绩模板 VUE_APP_UP_LOAD_STUDENT_SCORE_TEMPLATE=外部考试学员成绩导入模板-1676551319283.xlsx From 9f8fc080e3dc45be56c861d1cf5490192beb5182 Mon Sep 17 00:00:00 2001 From: lpq Date: Thu, 23 Feb 2023 22:04:26 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=86=85=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E6=B7=BB=E5=8A=A0=E5=B0=8F=E7=BB=84=E9=95=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/student/CommonStudent.vue | 8 +++++++- src/views/learningpath/LevelAdd.vue | 1 - 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue index 2e8be039..70b30238 100644 --- a/src/components/student/CommonStudent.vue +++ b/src/components/student/CommonStudent.vue @@ -374,7 +374,6 @@ const projectRowSelection = computed(() => ({ preserveSelectedRowKeys: true, })); const getStu = () => { - debugger let obj = { studentName: proStudentName.value, pageNo: procurrentPage.value, @@ -394,6 +393,7 @@ const getStu = () => { id: value.id, realName: value.studentName, userNo: value.studentId, + isLeader: value.isLeader, orgName: value.studentOrgName ? value.studentOrgName : "-", departName: value.studentDepartName ? value.studentDepartName : "-", }; @@ -758,11 +758,17 @@ const submitAuth = () => { }; function handleStageOk() { + debugger // 判断添加人数是否已超过限制人数 限制 = 本次添加的人 + 原有的人 if (props.type === 1) { if (props.groupMemberCount < selectsData.value.studentList.length + props.groupMemberNumber) { return message.warning("添加小组学员超过最大值"); } + // 判断是否是组长，组长不能添加 + const leaderArray = selectsData.value.projectMemberList.filter(item => item.isLeader === '1'); + if (leaderArray.length > 0) { + return message.warning("当前选学员"+leaderArray[0].realName+"已在其他小组为小组长，请勿重复选择。"); + } // 对选中的人员进行判断是否已经分组了 let haveGroupNum = selectsData.value.projectMemberList.filter(item => item.groupId !== null); if (haveGroupNum.length > 0) { diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index 7b519ecf..0e1063be 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -2105,7 +2105,6 @@ export default { pid: state.routerId, type: 2, }; - debugger getStuPage(stuobj) .then((res) => { console.log("获取学员列表", res.data.data.total); From 535f51403d96bbe56223ff21f81249692946d31a Mon Sep 17 00:00:00 2001 From: wyx Date: Thu, 23 Feb 2023 23:06:08 +0800 Subject: [PATCH 03/11] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=A7=AF=E5=88=86-=E5=AD=A6=E5=91=98=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=88=97=E8=A1=A8-=E5=B7=B2=E8=8E=B7=E5=BE=97=E7=A7=AF?= =?UTF-8?q?=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/ProjectScore.vue | 2 +- vue.config.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/drawers/ProjectScore.vue b/src/components/drawers/ProjectScore.vue index 99f35d88..5122b99d 100644 --- a/src/components/drawers/ProjectScore.vue +++ b/src/components/drawers/ProjectScore.vue @@ -645,7 +645,7 @@ export default { bum: item.userInfoBo.deptName, gangw: item.userInfoBo.jobName, group: item.groupName, - diploma: "0", + diploma: item.allPointsCount, // operation: "查看", }; array.push(obj); diff --git a/vue.config.js b/vue.config.js index ace3aa2a..56f9b80f 100644 --- a/vue.config.js +++ b/vue.config.js @@ -15,8 +15,8 @@ module.exports = defineConfig({ port: 8070, proxy: { "/manageApi": { - // target: 'http:' + process.env.VUE_APP_PROXY_URL, - target: 'http://localhost:30001', + target: 'http:' + process.env.VUE_APP_PROXY_URL, + // target: 'http://localhost:30001', changeOrigin: true, //表示是否改变原域名 pathRewrite: { "^/manageApi": "", From 0cf6f858a8482ed9aa9a1f5a45c6a0e87b7669a9 Mon Sep 17 00:00:00 2001 From: lpq Date: Thu, 23 Feb 2023 23:31:09 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E6=8D=A2=E7=BB=84=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/student/ChangeGroupModal.vue | 1 + src/components/student/CommonStudent.vue | 3 +-- src/views/projectcenter/TaskPage.vue | 16 ++++++++++++---- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/components/student/ChangeGroupModal.vue b/src/components/student/ChangeGroupModal.vue index f33615a2..4d5f770d 100644 --- a/src/components/student/ChangeGroupModal.vue +++ b/src/components/student/ChangeGroupModal.vue @@ -59,6 +59,7 @@ const props = defineProps({ }); const option = computed(() => { + debugger console.log("props.groupList", props.groupList); return props.groupList.map((e) => ({ label: e.groupName, diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue index 70b30238..128b1483 100644 --- a/src/components/student/CommonStudent.vue +++ b/src/components/student/CommonStudent.vue @@ -758,10 +758,9 @@ const submitAuth = () => { }; function handleStageOk() { - debugger // 判断添加人数是否已超过限制人数 限制 = 本次添加的人 + 原有的人 if (props.type === 1) { - if (props.groupMemberCount < selectsData.value.studentList.length + props.groupMemberNumber) { + if (props.groupMemberCount < selectsData.value.projectMemberList.length + Number(props.groupMemberNumber)) { return message.warning("添加小组学员超过最大值"); } // 判断是否是组长，组长不能添加 diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index db12d920..0cff45b4 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -3212,6 +3212,7 @@ export default { state.total = res.data.data.total; let arr = res.data.data.rows; getTableDataList(arr); + // state.loading = false; }) .catch((err) => { @@ -3285,7 +3286,10 @@ export default { pageSize: 10, projectId: state.projectId, }; - getGroupList(objf).then((res) => { state.groupPageList = res.data.data.rows }) + getGroupList(objf).then((res) => { + state.groupPageList = res.data.data.rows; + setGroupList(res.data.data.rows) + }) }; //删除小组 const deleteGroupBtn = (projectGroupId) => { @@ -3298,13 +3302,17 @@ export default { const createGroup = async () => { console.log("state.groupPageList" + state.groupPageList) const d = state.groupPageList.filter(item => item.leaderId === state.groupInfo.leaderId); - if (d.length > 0) { - return message.warn(d[0].leaderName + "已是小组长，请重新选择"); + const id = state.groupInfo.id; + // 过滤掉编辑时候，只修改了组员最大值时候 + if(id !== d[0].id) { + if (d.length > 0 ) { + return message.warn(d[0].leaderName + "已是小组长，请重新选择"); + } } - const id = state.groupInfo.id await editGroup({ ...state.groupInfo, projectId: state.projectId }) message.success(id ? '小组编辑成功' : "小组创建成功"); getGroup(); + console.log("state.groupPageList:") getStu(); }; //搜索小组重置 From 4241f7646e41cd5f9c08fe079281c420c46c3076 Mon Sep 17 00:00:00 2001 From: wyx Date: Fri, 24 Feb 2023 00:11:22 +0800 Subject: [PATCH 05/11] =?UTF-8?q?fix:=E7=9B=B4=E6=92=AD=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddLive.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue index 39ff11d8..bc5bbb1b 100644 --- a/src/components/drawers/AddLive.vue +++ b/src/components/drawers/AddLive.vue @@ -386,6 +386,7 @@ function openDrawer(i, row) { console.log(i, row) row && (formData.value = { ...row.info }); row && (dateTime.value = [row.info.liveStartTime, row.info.liveEndTime]); + row && (imageUrl.value = row.info.liveCover); i >= 0 && (taskIndex.value = i); visible.value = true; } From d62f390669541ae3421cc11ece8f62d0d0398806 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=B8=9C=E8=BF=9B1?= <963286636@qq.com> Date: Fri, 24 Feb 2023 00:28:09 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/CheckStu.vue | 5 +++-- .../drawers/router/RouterProjectManage.vue | 2 +- src/views/projectcenter/TaskPage.vue | 17 +++++++++++++++++ 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/components/drawers/CheckStu.vue b/src/components/drawers/CheckStu.vue index ce801566..f0511332 100644 --- a/src/components/drawers/CheckStu.vue +++ b/src/components/drawers/CheckStu.vue @@ -266,9 +266,10 @@ export default { const getStuProgress = () => { state.loading = true let obj = { - routerId:props.routerId==null?props.studentId:props.routerId - // routerId:props.studentId + routerId:props.routerId, + id:props.studentId } + console.log("obj",obj); stuProgress(obj).then(res => { console.log("查询当前学员进度信息success",res) state.pro = res.data.data diff --git a/src/components/drawers/router/RouterProjectManage.vue b/src/components/drawers/router/RouterProjectManage.vue index 253846fa..4bc8a670 100644 --- a/src/components/drawers/router/RouterProjectManage.vue +++ b/src/components/drawers/router/RouterProjectManage.vue @@ -377,7 +377,7 @@ onClick={ () => { {/* 当前学员 用来查看学员详情 */} - state.routerId = value.record.routerId; + state.routerId = value.record.pid; state.studentId = value.record.studentId; state.CheckStuvisible = true; console.log(value); diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 0cff45b4..7d5ba1e0 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -217,6 +217,23 @@
项目概览
+ + +
+
+ 项目说明 +
+
+
From c7af808ac00603bb9c338f6eac864a9b82bb0c0c Mon Sep 17 00:00:00 2001 From: caozc Date: Fri, 24 Feb 2023 00:35:13 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E3=80=902.23=E7=AC=AC=E4=B8=80=E8=BD=AE?= =?UTF-8?q?=E6=B5=8B=E8=AF=95-=E9=9D=A2=E6=8E=88=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=BC=80=E8=AF=BE=E3=80=91=E5=88=9B=E5=BB=BA=E5=BC=80=E8=AF=BE?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E4=BF=9D=E5=AD=98=20=E4=B8=80=E7=9B=B4?= =?UTF-8?q?=E8=BD=AC=E5=9C=88=EF=BC=8C=E6=97=A0=E6=B3=95=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E6=88=90=E5=8A=9F=20=E3=80=90=E7=94=9F=E4=BA=A7=E7=8E=AF?= =?UTF-8?q?=E5=A2=83-=E8=AF=BE=E7=A8=8B=E5=BA=93-=E9=9D=A2=E6=8E=88?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=80=91=E7=82=B9=E5=87=BB=E2=80=9C=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E2=80=9D=E9=A2=84=E8=A7=88=EF=BC=8C=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E9=A2=84=E8=A7=88=E4=B8=AD=E7=9A=84"=E4=B8=8B=E8=BD=BD"?= =?UTF-8?q?=E4=BC=9A=E4=BB=8E=E5=BD=93=E5=89=8D=E7=AA=97=E5=8F=A3=E6=89=93?= =?UTF-8?q?=E5=BC=80=EF=BC=8C=E6=89=93=E5=BC=80=E5=90=8E=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=8C=89=E9=92=AE=EF=BC=8C=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=B8=8A=E4=B8=80=E7=BA=A7=EF=BC=8C=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E4=B8=8D=E6=96=B9=E4=BE=BF=EF=BC=8C=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E4=B8=80=E4=B8=8B=20=E3=80=902.23=E7=AC=AC=E4=B8=80=E8=BD=AE?= =?UTF-8?q?=E6=B5=8B=E8=AF=95-=E5=AD=A6=E4=B9=A0=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E5=9B=BE-=E4=BB=BB=E5=8A=A1=E3=80=91=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E5=A4=96=E9=83=A8=E8=80=83=E8=AF=95=EF=BC=8C=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=88=90=E5=8A=9F=EF=BC=8C=E4=BD=86=E6=98=AF?= =?UTF-8?q?=E5=88=B0=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8=E4=B8=AD=E7=9C=8B?= =?UTF-8?q?=E4=B8=8D=E5=88=B0=E6=AD=A4=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/index1.js | 2 + src/components/drawers/AddTest.vue | 220 +-- src/views/courselibrary/CoursewareManage.vue | 1526 +++++++----------- 3 files changed, 631 insertions(+), 1117 deletions(-) diff --git a/src/api/index1.js b/src/api/index1.js index bd6b2473..26d63f93 100644 --- a/src/api/index1.js +++ b/src/api/index1.js @@ -219,6 +219,8 @@ export const cancelOrAuth = (obj) => http.post('/admin/certificate/cancelOrAuth' export const allPoints = (obj) => http.get('/points/project/allPoints', { params: obj }) export const updateStuCert = (obj) => http.post('/admin/certificate/updateStuCert', obj) +//添加外部考试 +export const createExamination = (obj) => http.post('/examination/createExamination', 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/AddTest.vue b/src/components/drawers/AddTest.vue index 78cccd04..a537deff 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -2,71 +2,45 @@
- +
{{ taskIndex >= 0 ? "编辑" : "添加" }}考试
- +
- -
-
+
- +
考试名称：
- +
- +
选择试卷：
@@ -87,65 +61,40 @@
- +
考试时间：
- +
- +
考试时长：
- + 分钟
- +
及格线：
- + 分
@@ -155,15 +104,8 @@ 考试说明：
- +
@@ -174,21 +116,12 @@
允许重复考试： - - 次,-1表示无限制 + + 次,-1表示无限制
@@ -199,11 +132,7 @@ 显示答案：
- + 允许查看 不允许查看 @@ -214,11 +143,7 @@ 显示解析：
- + 允许查看 不允许查看 @@ -229,11 +154,7 @@ 评分模式：
- + 最高一次 最后一次 @@ -246,11 +167,8 @@ 试题排列：
- + 试题乱序 选项乱序 全部乱序 @@ -266,39 +184,25 @@
- +
考试名称：
- +
- +
数据来源：
- +
@@ -306,14 +210,8 @@ 考试说明：
- +
@@ -326,10 +224,11 @@