From f5adb9f4919f4cbe6c718a5bfce1b46766a0bccb Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Wed, 22 Mar 2023 11:56:19 +0800 Subject: [PATCH 01/10] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E9=9D=A2=E6=8E=88?= =?UTF-8?q?=E8=AF=BE=E7=AE=A1=E7=90=86-=E6=9F=A5=E7=9C=8B=E7=AD=94?= =?UTF-8?q?=E5=8D=B7-=E6=9F=A5=E7=9C=8B=E4=BD=9C=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawers/project/ProjectFaceTaskManage.vue | 69 ++++++++++++++++++- 1 file changed, 66 insertions(+), 3 deletions(-) diff --git a/src/components/drawers/project/ProjectFaceTaskManage.vue b/src/components/drawers/project/ProjectFaceTaskManage.vue index 2ada1820..c9c504fb 100644 --- a/src/components/drawers/project/ProjectFaceTaskManage.vue +++ b/src/components/drawers/project/ProjectFaceTaskManage.vue @@ -120,6 +120,12 @@ + + data.value[coursePlanIndex.value]?.id || const homeWorkId = computed(() => data.value[coursePlanIndex.value]?.homeWorkId || ""); const infoId = computed(() => props.type === 1 ? props.datasource.projectId : props.datasource.routerId); const scoreTemplateUrl = ref(`${process.env.VUE_APP_BASE_API}/admin/student/exportHomeWorkTemplate?taskId=0&type=3&pid=${offcoursePlanId.value}&thirdType=3`); +const stuId = ref(""); const columns = ref([ { title: "工号", @@ -284,9 +293,53 @@ const columns = ref([ className: "h", dataIndex: "opacation", key: "opacation", - width: 50, + width: 100, align: "center", - customRender: (text) =>
showExamAnswer(text)}>{data.value[coursePlanIndex.value]?.answerId ? "查看答卷" : ""}
+ customRender: (text) => { + return ( +
+ { + showExamAnswer(text) + }}> + { text.record.answerId?"查看答卷":""} + + { + text.record.answerId? + { + showExamAnswer(text) + }}> + 查看答卷 + + :
+ 查看答卷 +
+ } + { + text.record.workScore==1? + { + showCWvisible(text.record.studentId) + }}> + 查看作业 + + :
+ 查看作业 +
+ } + +
) + } }, ]); watch(() => data.value.length, () => { @@ -328,6 +381,11 @@ const showExamAnswer = () => { CAvisible.value = true; }; +const showCWvisible = (id) => { + stuId.value = id; + CWvisible.value = true; +} + const searchTaskList = () => tableRef.value.fetch(); const exportTaskData = () => window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?type=3&pid=${offcoursePlanId.value}&thirdType=2`); @@ -375,7 +433,12 @@ function resetStudentPage() { padding: 0px; } } - +.RouterFaceStu { + .ant-drawer-content-wrapper{ + min-width: 1200px !important; + width: 1200px !important; + } +} .CopyModal { .ant-modal { width: 424px !important; From 535fb1e4cac5a902051dafd392b3f69db2ede039 Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Wed, 22 Mar 2023 12:31:01 +0800 Subject: [PATCH 02/10] =?UTF-8?q?fix:=E9=9D=A2=E6=8E=88=E8=AF=BE=E5=B7=B2?= =?UTF-8?q?=E7=BB=8F=E5=8F=91=E5=B8=83=E7=9A=84=E4=B8=8D=E5=85=81=E8=AE=B8?= =?UTF-8?q?=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/learningpath/LevelAddDetail.vue | 2 +- src/views/projectcenter/TaskAdd.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index 199544b8..a3b65f29 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -288,8 +288,8 @@ 开课 编辑 diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index a31e86fb..97b3cf2c 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -258,8 +258,8 @@ 开课 编辑 From 7c1a53ca7116d01a708ccb4207e7d647bde49b5c Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 22 Mar 2023 13:02:40 +0800 Subject: [PATCH 03/10] --fix bug --- src/api/indexProjStu.js | 1 + src/views/courselibrary/CoursewareManage.vue | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/api/indexProjStu.js b/src/api/indexProjStu.js index 0b964005..eb698a50 100644 --- a/src/api/indexProjStu.js +++ b/src/api/indexProjStu.js @@ -34,6 +34,7 @@ export const routerStudentRank = (obj) => http.get('/admin/router/studentRank', //是否优秀学员 export const topStudent = (obj) => http.post('/admin/project/topStudent', obj) export const updateStudent = (obj) => http.post('/admin/student/updateStudent', obj) +export const auditStudentStatus = (obj) => http.post('/admin/student/auditStudent', obj) //项目概览 export const overview = (obj) => http.get('/admin/project/overview', { params: obj }) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index df6454b5..b82bd848 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -1742,7 +1742,7 @@ import AddHomework from "../../components/drawers/CommonHomework.vue"; import AddTest from "../../components/drawers/CommonTest.vue"; import TableStudent from "@/components/student/TableStudent"; import FJUpload from "@/components/common/FJUpload"; -import { updateStudent } from "@/api/indexProjStu"; +import {auditStudentStatus} from "@/api/indexProjStu"; import { useStore } from "vuex"; import DropDown from "@/components/common/DropDown"; import { checkPer, checkOwner } from "@/utils/utils"; @@ -4879,7 +4879,7 @@ export default defineComponent({ }; function auditStudent(record) { - updateStudent(record); + auditStudentStatus(record); } //二维码 From e7a36e55a719e1498fb222c7b342d6ee75f0cc99 Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Wed, 22 Mar 2023 14:06:50 +0800 Subject: [PATCH 04/10] =?UTF-8?q?fix:=E6=96=B0=E5=BB=BA=E9=9D=A2=E6=8E=88?= =?UTF-8?q?=E8=AF=BE=E6=97=B6=E9=97=B4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/learningpath/LevelAdd.vue | 2 +- src/views/projectcenter/TaskPage.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index 64c1b1e7..f558ee50 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -458,7 +458,7 @@
开始时间
- {{ item.startTime !== null ? item.startTime : "-" }} + {{ item.type==2 ? item.createTime !== null ? item.createTime : "-" : item.startTime !== null ? item.startTime : "-" }}
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index e53b7b87..cbb014f2 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -587,7 +587,7 @@
开始时间
- {{ item.startTime !== null ? item.startTime : "-" }} + {{ item.type==2 ? item.createTime !== null ? item.createTime : "-" : item.startTime !== null ? item.startTime : "-" }}
From 581faa5b145abfda660f6eb699556ff99a6ffec2 Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Wed, 22 Mar 2023 14:26:53 +0800 Subject: [PATCH 05/10] =?UTF-8?q?fix:=E9=9D=A2=E6=8E=88=E8=AF=BE-=E5=AD=A6?= =?UTF-8?q?=E5=91=98-=E7=AD=BE=E5=88=B0=E4=BA=8C=E7=BB=B4=E7=A0=81taskId?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=BC=A0=E9=80=92=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/router/RouterFaceStu.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/drawers/router/RouterFaceStu.vue b/src/components/drawers/router/RouterFaceStu.vue index 38f34d11..e3e977fb 100644 --- a/src/components/drawers/router/RouterFaceStu.vue +++ b/src/components/drawers/router/RouterFaceStu.vue @@ -371,7 +371,7 @@ const qrcodeVisible = () => { qrCode({ title: "【签到】二维码", name: props.datasource?.name, - url: `${location.protocol}//${location.host}${process.env.VUE_APP_BASE_API}/admin/student/studentSign?taskId=${props.datasource.routerTaskId}&taskType=${props.datasource.type}&type=${props.type}`, + url: `${location.protocol}//${location.host}${process.env.VUE_APP_BASE_API}/admin/student/studentSign?taskId=${props.datasource.id}&taskType=${props.datasource.type}&type=${props.type}`, }); }; From 98d97f0c27071182f6ea3eb944492eef46d2779e Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 22 Mar 2023 14:55:37 +0800 Subject: [PATCH 06/10] --fix bug --- src/components/drawers/router/RouterFaceStu.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/drawers/router/RouterFaceStu.vue b/src/components/drawers/router/RouterFaceStu.vue index 38f34d11..9054b6de 100644 --- a/src/components/drawers/router/RouterFaceStu.vue +++ b/src/components/drawers/router/RouterFaceStu.vue @@ -132,7 +132,7 @@