From 106209e649f726d020b641ee920cc24375b68017 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Tue, 17 Jan 2023 18:46:29 +0800 Subject: [PATCH 01/10] --fix bug --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 4f5c0444..935cc35a 100644 --- a/.env +++ b/.env @@ -20,7 +20,7 @@ VUE_APP_IFRAME_STUDENT_URL=https://u-pre.boe.com/pc/loadingVUE_APP_BOE_API_URLVU # 课程二维码 VUE_APP_COURSE_STUDY=https://u-pre.boe.com/pc/course/studyindex?id= -# 导入学员模板 +# 导入学员模板 -发版前记得修改 VUE_APP_UP_LOAD_HOMEWORK_TEMPLATE=导入作业成绩模板-1673511599785.xlsx # 导入作业成绩学员模板 VUE_APP_UP_LOAD_STUDENT_TEMPLATE=导入学员模版-1673511636808.xlsx From 6023858f038eaf9bdfd4d726ceebcfb2df38eb90 Mon Sep 17 00:00:00 2001 From: wyx Date: Tue, 17 Jan 2023 20:23:33 +0800 Subject: [PATCH 02/10] =?UTF-8?q?fix:=E9=9D=A2=E6=8E=88=E8=AF=BE=E5=BC=80?= =?UTF-8?q?=E8=AF=BE=E7=AD=BE=E5=88=B0=E4=BA=8C=E7=BB=B4=E7=A0=81=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0taskType=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 4960463a..82a01549 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -5515,7 +5515,7 @@ export default defineComponent({ : process.env.VUE_APP_BASE_API + `/admin/student/studentSign?taskId=${ record.offcoursePlanId - }&type=${3}`, + }&taskType=${2}&type=${3}`, }; console.log("codeInfo", state.codeInfo); state.codeIndex = 0; From b4b462208f6e7415ed6709498c24124cd12c7d98 Mon Sep 17 00:00:00 2001 From: zhangyc Date: Tue, 17 Jan 2023 22:06:28 +0800 Subject: [PATCH 03/10] =?UTF-8?q?bug=E9=9D=A2=E6=8E=88=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=8E=BB=E6=8E=89=E5=85=B3=E5=8D=A1=E4=B8=80?= =?UTF-8?q?=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/router/RouterFaceTeachManage.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/drawers/router/RouterFaceTeachManage.vue b/src/components/drawers/router/RouterFaceTeachManage.vue index 7c0ae81a..267bf633 100644 --- a/src/components/drawers/router/RouterFaceTeachManage.vue +++ b/src/components/drawers/router/RouterFaceTeachManage.vue @@ -317,7 +317,7 @@ export default { ); }, }, - { + /** { title: "学员关卡", dataIndex: "chapterName", key: "chapterName", @@ -334,7 +334,7 @@ export default { ); }, - }, + },*/ { title: "作业成绩", dataIndex: "workScore", From a54c6fa421384c29de9664dbb888af5a096f999b Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Tue, 17 Jan 2023 22:09:53 +0800 Subject: [PATCH 04/10] --fix bug --- .env.prod | 4 +++- .env.release | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.env.prod b/.env.prod index 8291a432..77beb64f 100644 --- a/.env.prod +++ b/.env.prod @@ -13,4 +13,6 @@ VUE_APP_IFRAME_STUDENT_URL=https://u.boe.com/pc/loading VUE_APP_COURSE_STUDY=https://u.boe.com/pc/course/studyindex?id= -VUE_APP_TEMPLATE=https://u-pre.boe.com/upload/ \ No newline at end of file +VUE_APP_TEMPLATE=https://u-pre.boe.com/upload/ + +VUE_APP_UP_LOAD_HOMEWORK_TEMPLATE=导入学员模版-1673963663229.xlsx diff --git a/.env.release b/.env.release index 39b98c87..2479cd46 100644 --- a/.env.release +++ b/.env.release @@ -13,4 +13,6 @@ VUE_APP_IFRAME_STUDENT_URL=https://u.boe.com/pc-release/loading VUE_APP_COURSE_STUDY=https://u.boe.com/pc-release/course/studyindex?id= -VUE_APP_TEMPLATE=https://u-pre.boe.com/upload/ \ No newline at end of file +VUE_APP_TEMPLATE=https://u-pre.boe.com/upload/ + +VUE_APP_UP_LOAD_HOMEWORK_TEMPLATE=导入学员模版-1673963663229.xlsx \ No newline at end of file From 2bdee845e07f8ea070b218490634cb3675d880ba Mon Sep 17 00:00:00 2001 From: wyx Date: Tue, 17 Jan 2023 22:23:35 +0800 Subject: [PATCH 05/10] =?UTF-8?q?fix:=E9=A1=B9=E7=9B=AE=E8=80=83=E8=AF=95?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=87=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/project/ProjectExamManage.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/drawers/project/ProjectExamManage.vue b/src/components/drawers/project/ProjectExamManage.vue index b65fed0c..ecdf0412 100644 --- a/src/components/drawers/project/ProjectExamManage.vue +++ b/src/components/drawers/project/ProjectExamManage.vue @@ -414,7 +414,10 @@ export default { {/* 导出数据 */} function exportData() { - window.open(`${process.env.VUE_APP_BASE_API}/admin/exam/manage/exportExam?chapterId=${props.datasource.chapterId}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}&type=${1}`) + console.log(props.datasource) + console.log(`${process.env.VUE_APP_BASE_API}/admin/exam/manage/exportExam?chapterId=${props.datasource.stageId=="0"?"":props.datasource.stageId}&targetId=${props.datasource.projectId}&taskId=${props.datasource.courseId}&type=${2}`) + window.open(`${process.env.VUE_APP_BASE_API}/admin/exam/manage/exportExam?chapterId=${props.datasource.stageId=="0"?"":props.datasource.stageId}&targetId=${props.datasource.projectId}&taskId=${props.datasource.courseId}&type=${2}`) + {/* api.ExportExam({ "chapterId": props.datasource.chapterId, "targetId": props.datasource.routerId, From 90437c8175b59db712dfcfe8825f02c7165a3637 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 18 Jan 2023 01:14:27 +0800 Subject: [PATCH 06/10] --fix bug --- src/views/courselibrary/CoursewareManage.vue | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 82a01549..24b7af3d 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -2600,12 +2600,11 @@ const columns2 = [ key: "courseSource", width: "12%", align: "center", - customRender: (text) => { + customRender: ({record:{courseName,routerName}}) => { return (
- {" "} - {text.record.courseSource ? text.record.courseSource : "-"} + {courseName || routerName || "开课"}
); From 81fae7234b7b934e8fa93979c94ceb062ffc42f0 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 18 Jan 2023 01:35:09 +0800 Subject: [PATCH 07/10] --fix bug --- src/views/courselibrary/CoursewareManage.vue | 83 +++++--------------- 1 file changed, 18 insertions(+), 65 deletions(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 24b7af3d..345f035e 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -982,9 +982,9 @@
-
课程：{{ newCourseName }}
-
类型：
+
课程：{{ newCourseName }}
+
类型：
{{ faceType }}
内容分类：
{{ faceClassification }}
@@ -2536,110 +2536,63 @@ const columns2 = [ title: "姓名", dataIndex: "studentName", key: "studentName", - width: "12%", + width: "6%", align: "center", - customRender: (text) => { - return ( -
- - {" "} - {text.record.studentName ? text.record.studentName : "-"} - -
- ); - }, + customRender: ({record: {studentName}}) => (studentName || "-") }, { title: "工号", dataIndex: "studentUserNo", key: "studentUserNo", width: "12%", + ellipsis: true, align: "center", - customRender: (text) => { - return ( -
- - {" "} - {text.record.studentUserNo ? text.record.studentUserNo : "-"} - -
- ); - }, + customRender: ({record: {studentUserNo}}) => (studentUserNo || "-") }, { title: "开课名称", dataIndex: "name", key: "name", width: "12%", + ellipsis: true, align: "center", - customRender: (text) => { - return ( -
- {text.record.name ? text.record.name : "-"} -
- ); - }, + customRender: ({record: {name}}) => (name || "-") }, { title: "地点", dataIndex: "address", key: "address", width: "12%", + ellipsis: true, align: "center", - customRender: (text) => { - return ( -
- {text.record.address ? text.record.address : "-"} -
- ); - }, + customRender: ({record: {address}}) => (address || "-") }, { title: "数据来源", dataIndex: "courseSource", key: "courseSource", + ellipsis: true, width: "12%", align: "center", - customRender: ({record:{courseName,routerName}}) => { - return ( -
- - {courseName || routerName || "开课"} - -
- ); - }, + customRender: ({record:{courseName,routerName}}) => (courseName || routerName || "开课"), }, { title: "学习时间", dataIndex: "lastStudyTime", key: "lastStudyTime", - width: "12%", + width: "10%", align: "center", - customRender: (text) => { - return ( -
- - {" "} - {text.record.lastStudyTime ? text.record.lastStudyTime : "-"} - -
- ); - }, + ellipsis: true, + customRender: ({record:{lastStudyTime}}) => (lastStudyTime || "-") }, { title: "签到时间", dataIndex: "signTime", key: "signTime", - width: "12%", + width: "10%", align: "center", - customRender: (text) => { - return ( -
- {text.record.signTime ? text.record.signTime : "-"} -
- ); - }, + ellipsis: true, + customRender: ({record:{signTime}}) => (signTime || "-") }, { title: "状态", From f18dbcf24e39c0be335164258792989ade719f9f Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 18 Jan 2023 04:20:40 +0800 Subject: [PATCH 08/10] --fix bug --- src/components/drawers/CheckStu.vue | 25 +++++++++++++++++++++++-- src/components/drawers/SeeStu.vue | 9 +++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/src/components/drawers/CheckStu.vue b/src/components/drawers/CheckStu.vue index 72ef168f..56d52bae 100644 --- a/src/components/drawers/CheckStu.vue +++ b/src/components/drawers/CheckStu.vue @@ -28,8 +28,8 @@
进度排名
- {{pro.currentChapterCnt}} - /{{pro.totalChapterCnt}} + {{rank.current}} + /{{rank.total}}
{ ctx.emit("update:CheckStuvisible", false); }; + const getStuRank = () => { + studentRank({ + projectId: props.routerId, + studentId: props.studentId, + type:2 + }).then(res=>{ + state.rank = res.data.data + }) + } + const showProMess = () => { state.StuMessvisible = true; }; const afterVisibleChange = (bool) => { if(props.CheckStuvisible) { getStuProgress() + getStuRank() } console.log("state", bool); }; @@ -546,11 +559,17 @@ export default { font-size: 14px; font-weight: 500; margin-left: 25px; + word-break:keep-all; + white-space:nowrap; } .text2 { color: rgba(51, 51, 51, 0.8); font-size: 14px; margin-left: 65px; + word-break:keep-all; + white-space:nowrap; + overflow:hidden; + text-overflow:ellipsis; } } .alreadyclass { @@ -564,6 +583,8 @@ export default { color: rgba(56, 125, 247, 1); font-size: 14px; margin-left: 16px; + word-break:keep-all; + white-space:nowrap; } } } diff --git a/src/components/drawers/SeeStu.vue b/src/components/drawers/SeeStu.vue index 748f4191..3c073df3 100644 --- a/src/components/drawers/SeeStu.vue +++ b/src/components/drawers/SeeStu.vue @@ -249,6 +249,7 @@ export default { studentRank({ projectId: props.projectId, studentId: props.checkStuId, + type:1 }).then(res=>{ state.rank = res.data.data }) @@ -549,11 +550,17 @@ export default { font-size: 14px; font-weight: 500; margin-left: 25px; + word-break:keep-all; + white-space:nowrap; } .text2 { color: rgba(51, 51, 51, 0.8); font-size: 14px; margin-left: 65px; + word-break:keep-all; + white-space:nowrap; + overflow:hidden; + text-overflow:ellipsis; } } .alreadyclass { @@ -567,6 +574,8 @@ export default { color: rgba(56, 125, 247, 1); font-size: 14px; margin-left: 16px; + word-break:keep-all; + white-space:nowrap; } } } From fe47aef1080f6ed842e83d5281fb77c6892168d4 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 18 Jan 2023 04:41:21 +0800 Subject: [PATCH 09/10] --fix bug --- 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 c51f3d5b..05decb25 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -1643,7 +1643,7 @@ export default { className: "h", customRender: ({ record }) => (
- {record.finishTaskNum}/{record.totalTaskNum} + {record.finishTaskNum || 0}/{record.totalTaskNum || 0}
), }, diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index e0607b9e..17628322 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -1839,7 +1839,7 @@ export default { ellipsis: true, customRender: ({ record }) => (
- {record.finishTaskNum}/{record.totalTaskNum} + {record.finishTaskNum|| 0}/{record.totalTaskNum || 0}
), }, From e0f4c84ff0b8a2fe902e0ce346c8b560870b18ab Mon Sep 17 00:00:00 2001 From: wyx Date: Wed, 18 Jan 2023 08:52:55 +0800 Subject: [PATCH 10/10] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.vue b/src/App.vue index b22bbd4d..06c7c937 100644 --- a/src/App.vue +++ b/src/App.vue @@ -44,7 +44,7 @@ export default defineComponent({ const store = useStore(); const isLogin = ref(false); // console.log("router", router.getRoutes(), route); - console.log("版本2.1.3------------"); + console.log("版本2.1.4------------"); const routes = computed(() => { return router.getRoutes().filter((e) => e.meta?.isLink); });