From 6a0e29c4c8227d3ed2efb4898c30922e174cebc1 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Mon, 29 Jul 2024 09:37:24 +0800 Subject: [PATCH 01/88] =?UTF-8?q?=E5=AD=A6=E5=91=98=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E4=BF=A1=E6=81=AF=EF=BC=8C=E6=9A=82=E4=B8=8D?= =?UTF-8?q?=E5=8F=AF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/student/OnlineClassModelStudent.vue | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/components/student/OnlineClassModelStudent.vue b/src/components/student/OnlineClassModelStudent.vue index fc4dd63f..20466bcd 100644 --- a/src/components/student/OnlineClassModelStudent.vue +++ b/src/components/student/OnlineClassModelStudent.vue @@ -91,6 +91,11 @@ 导出 + + + 导出详细学习记录 + +
Date: Tue, 30 Jul 2024 09:29:59 +0800 Subject: [PATCH 02/88] =?UTF-8?q?=E5=AD=A6=E9=99=A2=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/student/OnlineClassModelStudent.vue | 6 ++++-- src/utils/zipdownload.js | 11 ++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/components/student/OnlineClassModelStudent.vue b/src/components/student/OnlineClassModelStudent.vue index 20466bcd..e39bad29 100644 --- a/src/components/student/OnlineClassModelStudent.vue +++ b/src/components/student/OnlineClassModelStudent.vue @@ -126,7 +126,7 @@ import dialog from "@/utils/dialog"; import {ONLINE_COURSE_DEL} from "@/api/ThirdApi"; import {useStore} from "vuex"; import {useAsyncStu, useResetRef} from "@/utils/useCommon"; -import {downLoadZip} from "@/utils/zipdownload"; +import {downLoadZipOne} from "@/utils/zipdownload"; const props = defineProps({ permissions: { type: String, @@ -329,7 +329,9 @@ function exportStu() { window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportOnlineStudent?type=3&&thirdType=8&pid=${searchParams.value.pid}`); } function exportStudy() { - downLoadZip(`${process.env.VUE_APP_BASE_API}/admin/student/exportOnlineStudentDetail`,'暂不可用') + console.log(formData.value,'formData.value') + window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportOnlineStudentDetail?contentId=${formData.value.id}&courseName=${formData.value.name}`) + downLoadZipOne(`${process.env.VUE_APP_BASE_API}/admin/student/exportOnlineStudentDetail?contentId=${formData.value.id}&courseName=${formData.value.name}`,formData.value.name) } defineExpose({ searchStu, diff --git a/src/utils/zipdownload.js b/src/utils/zipdownload.js index af64a373..14025f5d 100644 --- a/src/utils/zipdownload.js +++ b/src/utils/zipdownload.js @@ -5,7 +5,16 @@ const mimeMap = { xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', zip: 'application/zip' } - +export function downLoadZipOne(str, filename) { + axios({ + method: 'get', + url: str, + responseType: 'blob', + headers: { 'Authorization': 'Bearer ' + getCookieForName("token") } + }).then(res => { + resolveBlob(res, mimeMap.zip,filename) + }) +} const baseUrl = process.env.VUE_APP_ACT_API export function downLoadZip(str, filename) { var url = baseUrl + str From d3ed50f7d39f7d88b58b24b627aae11c62835b1a Mon Sep 17 00:00:00 2001 From: zhangsir Date: Tue, 30 Jul 2024 09:42:22 +0800 Subject: [PATCH 03/88] =?UTF-8?q?=E5=AD=A6=E9=99=A2=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/student/OnlineClassModelStudent.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/student/OnlineClassModelStudent.vue b/src/components/student/OnlineClassModelStudent.vue index e39bad29..9880e784 100644 --- a/src/components/student/OnlineClassModelStudent.vue +++ b/src/components/student/OnlineClassModelStudent.vue @@ -329,9 +329,9 @@ function exportStu() { window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportOnlineStudent?type=3&&thirdType=8&pid=${searchParams.value.pid}`); } function exportStudy() { - console.log(formData.value,'formData.value') - window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportOnlineStudentDetail?contentId=${formData.value.id}&courseName=${formData.value.name}`) - downLoadZipOne(`${process.env.VUE_APP_BASE_API}/admin/student/exportOnlineStudentDetail?contentId=${formData.value.id}&courseName=${formData.value.name}`,formData.value.name) + console.log(formData.value,searchParams.value.pid,'formData.value') + window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportOnlineStudentDetail?type=3&&thirdType=8&pid=${searchParams.value.pid}`) + downLoadZipOne(`${process.env.VUE_APP_BASE_API}/admin/student/exportOnlineStudentDetail?type=3&&thirdType=8&pid=${searchParams.value.pid}`,formData.value.name) } defineExpose({ searchStu, From 4e4f120eb3eea2ebb4ccd70b3fecc57c8bb46bb7 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Tue, 30 Jul 2024 09:54:37 +0800 Subject: [PATCH 04/88] =?UTF-8?q?=E5=AD=A6=E9=99=A2=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E6=89=93=E5=8D=B0=EF=BC=8C?= =?UTF-8?q?=E8=81=94=E8=B0=83=E5=AE=8C=E6=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/student/OnlineClassModelStudent.vue | 6 ++---- src/utils/zipdownload.js | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/components/student/OnlineClassModelStudent.vue b/src/components/student/OnlineClassModelStudent.vue index 9880e784..dd48bd66 100644 --- a/src/components/student/OnlineClassModelStudent.vue +++ b/src/components/student/OnlineClassModelStudent.vue @@ -126,7 +126,7 @@ import dialog from "@/utils/dialog"; import {ONLINE_COURSE_DEL} from "@/api/ThirdApi"; import {useStore} from "vuex"; import {useAsyncStu, useResetRef} from "@/utils/useCommon"; -import {downLoadZipOne} from "@/utils/zipdownload"; +import {downLoadXlsx} from "@/utils/zipdownload"; const props = defineProps({ permissions: { type: String, @@ -329,9 +329,7 @@ function exportStu() { window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportOnlineStudent?type=3&&thirdType=8&pid=${searchParams.value.pid}`); } function exportStudy() { - console.log(formData.value,searchParams.value.pid,'formData.value') - window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportOnlineStudentDetail?type=3&&thirdType=8&pid=${searchParams.value.pid}`) - downLoadZipOne(`${process.env.VUE_APP_BASE_API}/admin/student/exportOnlineStudentDetail?type=3&&thirdType=8&pid=${searchParams.value.pid}`,formData.value.name) + downLoadXlsx(`${process.env.VUE_APP_BASE_API}/admin/student/exportOnlineStudentDetail?type=3&&thirdType=8&pid=${searchParams.value.pid}`,'在线课学员') } defineExpose({ searchStu, diff --git a/src/utils/zipdownload.js b/src/utils/zipdownload.js index 14025f5d..55d06244 100644 --- a/src/utils/zipdownload.js +++ b/src/utils/zipdownload.js @@ -5,14 +5,14 @@ const mimeMap = { xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', zip: 'application/zip' } -export function downLoadZipOne(str, filename) { +export function downLoadXlsx(str, filename) { axios({ method: 'get', url: str, responseType: 'blob', headers: { 'Authorization': 'Bearer ' + getCookieForName("token") } }).then(res => { - resolveBlob(res, mimeMap.zip,filename) + resolveBlob(res, mimeMap.xlsx,filename) }) } const baseUrl = process.env.VUE_APP_ACT_API From 247ff6b5dea7f399b69bc14f42b9273e3f93d10f Mon Sep 17 00:00:00 2001 From: zhangsir Date: Tue, 30 Jul 2024 10:15:20 +0800 Subject: [PATCH 05/88] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=AA=E6=95=B0?= =?UTF-8?q?=E4=B8=BA0=EF=BC=8Ctotal=E6=8F=90=E7=A4=BA=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E4=BA=88=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/student/OnlineClassModelStudent.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/student/OnlineClassModelStudent.vue b/src/components/student/OnlineClassModelStudent.vue index dd48bd66..ca3de1f4 100644 --- a/src/components/student/OnlineClassModelStudent.vue +++ b/src/components/student/OnlineClassModelStudent.vue @@ -127,6 +127,7 @@ import {ONLINE_COURSE_DEL} from "@/api/ThirdApi"; import {useStore} from "vuex"; import {useAsyncStu, useResetRef} from "@/utils/useCommon"; import {downLoadXlsx} from "@/utils/zipdownload"; +import {message} from "ant-design-vue"; const props = defineProps({ permissions: { type: String, @@ -329,6 +330,9 @@ function exportStu() { window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportOnlineStudent?type=3&&thirdType=8&pid=${searchParams.value.pid}`); } function exportStudy() { + if(studentList.value.length == 0){ + return message.warning('暂无可导出的学习记录') + } downLoadXlsx(`${process.env.VUE_APP_BASE_API}/admin/student/exportOnlineStudentDetail?type=3&&thirdType=8&pid=${searchParams.value.pid}`,'在线课学员') } defineExpose({ From 96afc3bfa712690e6bca9f73222b8204d59416b2 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Wed, 31 Jul 2024 13:46:38 +0800 Subject: [PATCH 06/88] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=AD=A6=E5=91=98=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/student/OnlineClassModelStudent.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/student/OnlineClassModelStudent.vue b/src/components/student/OnlineClassModelStudent.vue index ca3de1f4..71f4d081 100644 --- a/src/components/student/OnlineClassModelStudent.vue +++ b/src/components/student/OnlineClassModelStudent.vue @@ -333,7 +333,7 @@ function exportStudy() { if(studentList.value.length == 0){ return message.warning('暂无可导出的学习记录') } - downLoadXlsx(`${process.env.VUE_APP_BASE_API}/admin/student/exportOnlineStudentDetail?type=3&&thirdType=8&pid=${searchParams.value.pid}`,'在线课学员') + downLoadXlsx(`${process.env.VUE_APP_BASE_API}/admin/student/exportOnlineStudentDetail?type=4&&thirdType=8&pid=${searchParams.value.pid}`,'在线课学员') } defineExpose({ searchStu, From cc15701ff45a2e93ea9c79deefe9644c6c34eaca Mon Sep 17 00:00:00 2001 From: zhangsir Date: Fri, 2 Aug 2024 09:01:59 +0800 Subject: [PATCH 07/88] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=A6=E5=91=98?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=96=87=E4=BB=B6=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/student/OnlineClassModelStudent.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/student/OnlineClassModelStudent.vue b/src/components/student/OnlineClassModelStudent.vue index 71f4d081..c6ed39aa 100644 --- a/src/components/student/OnlineClassModelStudent.vue +++ b/src/components/student/OnlineClassModelStudent.vue @@ -333,7 +333,7 @@ function exportStudy() { if(studentList.value.length == 0){ return message.warning('暂无可导出的学习记录') } - downLoadXlsx(`${process.env.VUE_APP_BASE_API}/admin/student/exportOnlineStudentDetail?type=4&&thirdType=8&pid=${searchParams.value.pid}`,'在线课学员') + downLoadXlsx(`${process.env.VUE_APP_BASE_API}/admin/student/exportOnlineStudentDetail?type=4&&thirdType=8&pid=${searchParams.value.pid}`,'在线课学员学习记录') } defineExpose({ searchStu, From 9aa40d39771192c1327cb915fa614c37c8573b7d Mon Sep 17 00:00:00 2001 From: zhangsir Date: Fri, 2 Aug 2024 15:12:00 +0800 Subject: [PATCH 08/88] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=96=B0=E5=A2=9E=E7=B1=BB=E5=9E=8B=E6=90=9C?= =?UTF-8?q?=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Curriculum.vue | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/views/report/Curriculum.vue b/src/views/report/Curriculum.vue index 4e4ea0cb..f49db81e 100644 --- a/src/views/report/Curriculum.vue +++ b/src/views/report/Curriculum.vue @@ -39,6 +39,15 @@ >
+
+ +
{ state.pageNo=1 state.pageSize=10 @@ -235,6 +250,7 @@ export default { // publishTime: state.publishTime, startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0]+ " 00:00:00", endTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[1]+ " 23:59:59", + status: state.searchStatus, }; const res = await api.boeuCourseListPageV2(params); if (res) { @@ -449,6 +465,7 @@ export default { state.type = null; state.createName = ""; state.publishTime = []; + state.searchStatus = null; getTableData(); }; const exportList = () => { @@ -663,6 +680,7 @@ export default { exportDetailClick, getOption, searchData, + StateList, }; }, }; From 5538124e727e3a360d57c7861188e611fd15be84 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Thu, 8 Aug 2024 09:43:03 +0800 Subject: [PATCH 09/88] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Curriculum.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/report/Curriculum.vue b/src/views/report/Curriculum.vue index f49db81e..258c5292 100644 --- a/src/views/report/Curriculum.vue +++ b/src/views/report/Curriculum.vue @@ -183,9 +183,9 @@ export default { typeOption:[] }); const StateList = ref([ - {value:'0',label:'全部'}, + {value:'',label:'全部'}, {value:'1',label:'面授'}, - {value:'2',label:'在线'}, + {value:'0',label:'在线'}, ]) const searchData=async()=>{ state.pageNo=1 @@ -250,7 +250,7 @@ export default { // publishTime: state.publishTime, startTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[0]+ " 00:00:00", endTime: typeof state.publishTime[0] === 'undefined' ? null : state.publishTime[1]+ " 23:59:59", - status: state.searchStatus, + courseType: state.searchStatus, }; const res = await api.boeuCourseListPageV2(params); if (res) { From faf71187b66c090750d28ec3c80be3cb2c41062a Mon Sep 17 00:00:00 2001 From: joshen Date: Tue, 20 Aug 2024 13:52:06 +0800 Subject: [PATCH 10/88] Update .env.prod --- .env.prod | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.env.prod b/.env.prod index 7e8fe59a..ffb39e41 100644 --- a/.env.prod +++ b/.env.prod @@ -6,35 +6,35 @@ VUE_APP_PIC_FOLDERID=1148997110156759040 # 教师节上传zip文件夹id VUE_APP_TOOL_FOLDERID=1148996610925531136 -VUE_APP_PROXY_URL=//u.boe.com/ +VUE_APP_PROXY_URL=//u-pre.boe.com/ -VUE_APP_LOGIN_URL=//u.boe.com/web?returnUrl= +VUE_APP_LOGIN_URL=//u-pre.boe.com/web?returnUrl= -VUE_APP_BOE_API_URL=//u.boe.com +VUE_APP_BOE_API_URL=//u-pre.boe.com -VUE_APP_IFRAME_URL=//u.boe.com/pc/iframe -VUE_APP_IFRAME_STUDENT_URL=//u.boe.com/pc/loading -VUE_APP_IFRAME_TEACHER_URL=//u.boe.com/pc/need/waitaudit +VUE_APP_IFRAME_URL=//u-pre.boe.com/pc/iframe +VUE_APP_IFRAME_STUDENT_URL=//u-pre.boe.com/pc/loading +VUE_APP_IFRAME_TEACHER_URL=//u-pre.boe.com/pc/need/waitaudit -VUE_APP_COURSE_STUDY=//u.boe.com/pc/course/studyindex?id= +VUE_APP_COURSE_STUDY=//u-pre.boe.com/pc/course/studyindex?id= VUE_APP_UP_LOAD_STUDENT_TEMPLATE=file/导入学员模版-1678375429633.xlsx # 外部考试导入成绩模板 VUE_APP_UP_LOAD_STUDENT_SCORE_TEMPLATE=file/外部考试学员成绩导入模板-1678375450407.xlsx -VUE_APP_ONLINE_CLASS_URL=//u.boe.com/mobile/pages/study/courseStudy?id= -VITE_BOE_CASS_DETAIL_URL=//u.boe.com/pc/case/detail?id= -VUE_APP_EXAM_DETAIL_URL=//u.boe.com/mobile/pages/exam/exam?id= +VUE_APP_ONLINE_CLASS_URL=//u-pre.boe.com/mobile/pages/study/courseStudy?id= +VITE_BOE_CASS_DETAIL_URL=//u-pre.boe.com/pc/case/detail?id= +VUE_APP_EXAM_DETAIL_URL=//u-pre.boe.com/mobile/pages/exam/exam?id= #h5的基本url -VUE_APP_H5=//u.boe.com/student-h5 +VUE_APP_H5=//u-pre.boe.com/student-h5 #文件基础路径调试 只在生产做了变更 VUE_APP_FILE_PATH=/upload/boe/file/ #用户头像 VUE_APP_AVATAR_PATH=/upload/ # 旧版管理员界面 -VUE_APP_OLD_MANAGE=//u.boe.com/resource/index.html +VUE_APP_OLD_MANAGE=//u-pre.boe.com/resource/index.html # 测评管理界面 -VUE_APP_EVA_MANAGE=//u.boe.com/quiz/index.html +VUE_APP_EVA_MANAGE=//u-pre.boe.com/quiz/index.html # 批量面授报名模板 VUE_APP_FACE_STUDENT_TEMPLATE=/file/批量面授报名模版-1679595925822.xlsx \ No newline at end of file From c86ae82d197dc0d126762b21b36f88ea3a97fc51 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Tue, 27 Aug 2024 14:43:19 +0800 Subject: [PATCH 11/88] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE=E7=BC=96=E5=8F=B7=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/ProjectAdd.vue | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue index cf96826d..58bc803b 100644 --- a/src/views/projectcenter/ProjectAdd.vue +++ b/src/views/projectcenter/ProjectAdd.vue @@ -147,6 +147,12 @@ 否
+
+
项目编号：
+
+ +
+
@@ -772,6 +778,20 @@ export default { } } + .num{ + display: flex; + justify-content: center; + align-items: center; + .num_text{ + color: #6f6f6f; + font-size: 14px; + // margin-right: 7px; + } + .num_input{ + width: 184px; + } + } + .filebox { margin-left: 14px; flex: 1; From 207518d0ef0c3ab4458f06ae6d38b0a5d7557316 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Tue, 27 Aug 2024 16:46:22 +0800 Subject: [PATCH 12/88] =?UTF-8?q?=E6=98=AF=E5=90=A6BOEU=E5=AE=9E=E6=96=BD?= =?UTF-8?q?=E4=B8=BA=E5=90=A6=EF=BC=8C=E7=BD=AE=E7=A9=BA=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/ProjectAdd.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue index 58bc803b..c4c3c235 100644 --- a/src/views/projectcenter/ProjectAdd.vue +++ b/src/views/projectcenter/ProjectAdd.vue @@ -340,6 +340,11 @@ export default { state.projectInfo.parentName = routers.query.parentName; state.projectInfo.parentId = routers.query.parentId; }); + watch(()=>state.projectInfo.boeFlag,(val)=>{ + if(!val){ + state.projectInfo.numValue = '' + } + }) function getProjectInfo() { state.projectInfo.parentName = routers.query.parentName; From d89cc8ea116abe9224c675dc9767ebf34b419575 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Thu, 29 Aug 2024 16:40:01 +0800 Subject: [PATCH 13/88] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E4=B8=8B=E6=8B=89=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/project/ProjectNumber.vue | 47 ++++++++++++++++++++++++ src/main.js | 3 +- src/views/projectcenter/ProjectAdd.vue | 9 +++-- 3 files changed, 55 insertions(+), 4 deletions(-) create mode 100644 src/components/project/ProjectNumber.vue diff --git a/src/components/project/ProjectNumber.vue b/src/components/project/ProjectNumber.vue new file mode 100644 index 00000000..ec6d74ab --- /dev/null +++ b/src/components/project/ProjectNumber.vue @@ -0,0 +1,47 @@ + + + + + \ No newline at end of file diff --git a/src/main.js b/src/main.js index 6eda4d84..0ebeba8f 100644 --- a/src/main.js +++ b/src/main.js @@ -131,5 +131,6 @@ async function init() { initDict("course_pic"); //课程封面 initDict("job_type"); //岗位 initDict("band"); //band - initDict("examine_cover") + initDict("examine_cover") //讲师认证封面图 + initDict("project_number") //项目编号 } \ No newline at end of file diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue index c4c3c235..544a9919 100644 --- a/src/views/projectcenter/ProjectAdd.vue +++ b/src/views/projectcenter/ProjectAdd.vue @@ -150,7 +150,8 @@
项目编号：
- + +
@@ -275,7 +276,7 @@ import * as api2 from "../../api/indexAudit"; import {validateName} from "@/api/index1"; import dayjs from "dayjs"; import {scrollLoad} from "@/api/method"; - +import ProjectNumber from "@/components/project/ProjectNumber"; export default { name: "projectAdd", components: { @@ -285,6 +286,7 @@ export default { TrainClass, NameInput, OrgClass, + ProjectNumber }, setup() { const store = useStore(); @@ -342,7 +344,8 @@ export default { }); watch(()=>state.projectInfo.boeFlag,(val)=>{ if(!val){ - state.projectInfo.numValue = '' + state.projectInfo.numValue = null + state.projectInfo.numLabel = null } }) From 4227e83c28923d6a424b17b26c137f7386aaaa20 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Tue, 3 Sep 2024 16:52:13 +0800 Subject: [PATCH 14/88] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BC=96=E5=8F=B7=E5=AE=9E=E7=8E=B0=E6=98=BE?= =?UTF-8?q?=E7=A4=BAlabel=E7=BC=96=E5=8F=B7value?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/project/ProjectNumber.vue | 25 ++++++++++++------------ src/views/projectcenter/ProjectAdd.vue | 4 ++-- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/components/project/ProjectNumber.vue b/src/components/project/ProjectNumber.vue index ec6d74ab..86973067 100644 --- a/src/components/project/ProjectNumber.vue +++ b/src/components/project/ProjectNumber.vue @@ -11,7 +11,7 @@ :options="options" showSearch allowClear - @select="handleSelect" + @change="handleChange" > @@ -25,19 +25,20 @@ const props = defineProps({ }) const emit = defineEmits(['update:value','update:label']) const store = useStore(); -const numValue = ref(props.value) -const handleSelect = (value,option) => { - emit('update:value',value) - emit('update:label',option.id) -}; +const numValue = ref(props.value||null) +const handleChange = (value,option)=>{ + emit('update:value',value || '') + emit('update:label',option?.label || '') +} onMounted(() => { - // console.log(store.state.project_number,'xixixixii') + // console.log(store.state.project_number,'store.state.project_number') }); -const options = ref([ - {id:4,value:1,label:1}, - {id:5,value:2,label:2}, - {id:6,value:3,label:3}, -]) +const options = computed(()=>store.state.project_number.map(e => { + return{ + value: e.value, + label: e.name + } +})) \ No newline at end of file diff --git a/src/components/student/OnlineClassModelStudent.vue b/src/components/student/OnlineClassModelStudent.vue index c6ed39aa..fc4dd63f 100644 --- a/src/components/student/OnlineClassModelStudent.vue +++ b/src/components/student/OnlineClassModelStudent.vue @@ -91,11 +91,6 @@ 导出 - - - 导出详细学习记录 - -
{ - resolveBlob(res, mimeMap.xlsx,filename) - }) -} + const baseUrl = process.env.VUE_APP_ACT_API export function downLoadZip(str, filename) { var url = baseUrl + str diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 80223014..cac253e2 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -1993,17 +1993,16 @@ const columns6 = [ align: "center", ellipsis: true, customRender: ({ record }) => { - // const teachers = record.offteachers; - // return teachers.map((teacher, index) => { - // // 如果需要显示为列表形式 - // return ( - //
- // {teacher.teacherName} - // {index !== teachers.length - 1 && ', '} - //
- // ); - // }); - return record.offteachers.map(item=>item.teacherName).join(',') + const teachers = record.offteachers; + return teachers.map((teacher, index) => { + // 如果需要显示为列表形式 + return ( +
+ {teacher.teacherName} + {index !== teachers.length - 1 && ', '} +
+ ); + }); } }, diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue index 0273ce63..cf96826d 100644 --- a/src/views/projectcenter/ProjectAdd.vue +++ b/src/views/projectcenter/ProjectAdd.vue @@ -147,13 +147,6 @@ 否
-
-
项目编号：
-
- - -
-
@@ -276,7 +269,7 @@ import * as api2 from "../../api/indexAudit"; import {validateName} from "@/api/index1"; import dayjs from "dayjs"; import {scrollLoad} from "@/api/method"; -import ProjectNumber from "@/components/project/ProjectNumber"; + export default { name: "projectAdd", components: { @@ -286,7 +279,6 @@ export default { TrainClass, NameInput, OrgClass, - ProjectNumber }, setup() { const store = useStore(); @@ -342,12 +334,6 @@ export default { state.projectInfo.parentName = routers.query.parentName; state.projectInfo.parentId = routers.query.parentId; }); - watch(()=>state.projectInfo.boeFlag,(val)=>{ - if(!val){ - state.projectInfo.numValue = '' - state.projectInfo.numLabel = '' - } - }) function getProjectInfo() { state.projectInfo.parentName = routers.query.parentName; @@ -786,20 +772,6 @@ export default { } } - .num{ - display: flex; - justify-content: center; - align-items: center; - .num_text{ - color: #6f6f6f; - font-size: 14px; - // margin-right: 7px; - } - .num_input{ - width: 184px; - } - } - .filebox { margin-left: 14px; flex: 1; From 4401cef26bace6ed72808a7aac6645cab3a3812a Mon Sep 17 00:00:00 2001 From: nisen Date: Sun, 8 Sep 2024 14:01:02 +0800 Subject: [PATCH 16/88] u.boe --- .env.prod | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.env.prod b/.env.prod index ffb39e41..7e8fe59a 100644 --- a/.env.prod +++ b/.env.prod @@ -6,35 +6,35 @@ VUE_APP_PIC_FOLDERID=1148997110156759040 # 教师节上传zip文件夹id VUE_APP_TOOL_FOLDERID=1148996610925531136 -VUE_APP_PROXY_URL=//u-pre.boe.com/ +VUE_APP_PROXY_URL=//u.boe.com/ -VUE_APP_LOGIN_URL=//u-pre.boe.com/web?returnUrl= +VUE_APP_LOGIN_URL=//u.boe.com/web?returnUrl= -VUE_APP_BOE_API_URL=//u-pre.boe.com +VUE_APP_BOE_API_URL=//u.boe.com -VUE_APP_IFRAME_URL=//u-pre.boe.com/pc/iframe -VUE_APP_IFRAME_STUDENT_URL=//u-pre.boe.com/pc/loading -VUE_APP_IFRAME_TEACHER_URL=//u-pre.boe.com/pc/need/waitaudit +VUE_APP_IFRAME_URL=//u.boe.com/pc/iframe +VUE_APP_IFRAME_STUDENT_URL=//u.boe.com/pc/loading +VUE_APP_IFRAME_TEACHER_URL=//u.boe.com/pc/need/waitaudit -VUE_APP_COURSE_STUDY=//u-pre.boe.com/pc/course/studyindex?id= +VUE_APP_COURSE_STUDY=//u.boe.com/pc/course/studyindex?id= VUE_APP_UP_LOAD_STUDENT_TEMPLATE=file/导入学员模版-1678375429633.xlsx # 外部考试导入成绩模板 VUE_APP_UP_LOAD_STUDENT_SCORE_TEMPLATE=file/外部考试学员成绩导入模板-1678375450407.xlsx -VUE_APP_ONLINE_CLASS_URL=//u-pre.boe.com/mobile/pages/study/courseStudy?id= -VITE_BOE_CASS_DETAIL_URL=//u-pre.boe.com/pc/case/detail?id= -VUE_APP_EXAM_DETAIL_URL=//u-pre.boe.com/mobile/pages/exam/exam?id= +VUE_APP_ONLINE_CLASS_URL=//u.boe.com/mobile/pages/study/courseStudy?id= +VITE_BOE_CASS_DETAIL_URL=//u.boe.com/pc/case/detail?id= +VUE_APP_EXAM_DETAIL_URL=//u.boe.com/mobile/pages/exam/exam?id= #h5的基本url -VUE_APP_H5=//u-pre.boe.com/student-h5 +VUE_APP_H5=//u.boe.com/student-h5 #文件基础路径调试 只在生产做了变更 VUE_APP_FILE_PATH=/upload/boe/file/ #用户头像 VUE_APP_AVATAR_PATH=/upload/ # 旧版管理员界面 -VUE_APP_OLD_MANAGE=//u-pre.boe.com/resource/index.html +VUE_APP_OLD_MANAGE=//u.boe.com/resource/index.html # 测评管理界面 -VUE_APP_EVA_MANAGE=//u-pre.boe.com/quiz/index.html +VUE_APP_EVA_MANAGE=//u.boe.com/quiz/index.html # 批量面授报名模板 VUE_APP_FACE_STUDENT_TEMPLATE=/file/批量面授报名模版-1679595925822.xlsx \ No newline at end of file From 766ff177c12e60c19bfeef42af788d41bb5f99aa Mon Sep 17 00:00:00 2001 From: nisen Date: Sun, 8 Sep 2024 14:20:39 +0800 Subject: [PATCH 17/88] =?UTF-8?q?=E5=9B=9E=E9=80=80=E7=9A=84=E5=96=9D?= =?UTF-8?q?=E4=B8=8D=E8=BF=87=E6=9D=A5=EF=BC=8C=E6=89=8B=E5=8A=A8=E5=90=88?= =?UTF-8?q?=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/request.js | 4 +++- src/components/drawers/AddOpenCourse.vue | 21 ++++++++++---------- src/views/courselibrary/CoursewareManage.vue | 21 ++++++++++---------- 3 files changed, 25 insertions(+), 21 deletions(-) diff --git a/src/api/request.js b/src/api/request.js index 0a6584b0..48acb184 100644 --- a/src/api/request.js +++ b/src/api/request.js @@ -374,7 +374,9 @@ export function usePage(_url, params, init = true,listing = false) { state.totalPage = r.data.total/10 || 1; state.total = r.data.total; state.loading = false; - }); + }).catch(err => { + state.loading = false; + }) } init && fetch(); diff --git a/src/components/drawers/AddOpenCourse.vue b/src/components/drawers/AddOpenCourse.vue index 54941def..d15c5f38 100644 --- a/src/components/drawers/AddOpenCourse.vue +++ b/src/components/drawers/AddOpenCourse.vue @@ -488,16 +488,17 @@ const columns = ref([ width: "20%", align: "center", customRender: ({ record }) => { - const teachers = record.offteachers; - return teachers.map((teacher, index) => { - // 如果需要显示为列表形式 - return ( -
- {teacher.teacherName} - {index !== teachers.length - 1 && ', '} -
- ); - }); + // const teachers = record.offteachers; + // return teachers.map((teacher, index) => { + // // 如果需要显示为列表形式 + // return ( + //
+ // {teacher.teacherName} + // {index !== teachers.length - 1 && ', '} + //
+ // ); + // }); + return record.offteachers.map(item=>item.teacherName).join(',') }, }, diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index cac253e2..80223014 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -1993,16 +1993,17 @@ const columns6 = [ align: "center", ellipsis: true, customRender: ({ record }) => { - const teachers = record.offteachers; - return teachers.map((teacher, index) => { - // 如果需要显示为列表形式 - return ( -
- {teacher.teacherName} - {index !== teachers.length - 1 && ', '} -
- ); - }); + // const teachers = record.offteachers; + // return teachers.map((teacher, index) => { + // // 如果需要显示为列表形式 + // return ( + //
+ // {teacher.teacherName} + // {index !== teachers.length - 1 && ', '} + //
+ // ); + // }); + return record.offteachers.map(item=>item.teacherName).join(',') } }, From 23218791ed5e7841429cb6a9a72b92de6e408e1b Mon Sep 17 00:00:00 2001 From: zhangsir Date: Sun, 8 Sep 2024 18:57:17 +0800 Subject: [PATCH 18/88] =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E6=9C=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Operational.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/report/Operational.vue b/src/views/report/Operational.vue index 922be08a..30ab9171 100644 --- a/src/views/report/Operational.vue +++ b/src/views/report/Operational.vue @@ -1635,7 +1635,7 @@ export default { var day = dayjs(new Date()).date(); console.log("initTime year:",year,"month:",month,"day:",day); var year1 = year; - var month1 = parseInt(month) - 5; + var month1 = parseInt(month) - 1; if(month1<=0){ year1 = parseInt(year1) - 1; month1 = 12 - (Math.abs(month1)%12); From 9775d0c52e9c681bb9ab3b473e20aa4ce548d5e7 Mon Sep 17 00:00:00 2001 From: nisen Date: Sun, 8 Sep 2024 21:29:54 +0800 Subject: [PATCH 19/88] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E8=AF=BE=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/project/ProjectOnlineManage.vue | 9 ++++++--- src/components/drawers/router/RouterCommonManage.vue | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/components/drawers/project/ProjectOnlineManage.vue b/src/components/drawers/project/ProjectOnlineManage.vue index 88ba7427..e24bef5b 100644 --- a/src/components/drawers/project/ProjectOnlineManage.vue +++ b/src/components/drawers/project/ProjectOnlineManage.vue @@ -189,7 +189,7 @@ export default { pageSize: 10, currentPage: 1, tableDataTotal: 0, - projectName: undefined, + projectName: null, projectNameListNot: [ { id: 1, @@ -377,7 +377,7 @@ export default { ctx.emit("update:Tvisible", false); state.currentPage = 1; state.name = ""; - state.projectName = undefined; + state.projectName = null; state.tabledata = []; }; const afterVisibleChange = (bol) => { @@ -389,6 +389,9 @@ export default { }; const selectProjectName = (value) => { state.projectName = value; + if(value === undefined){ + state.projectName = null; + } }; //催促 const godie = () => { @@ -515,7 +518,7 @@ export default { state.tableDataTotalLoading = true; state.currentPage = 1; state.name = ""; - state.projectName = ""; + state.projectName = null; getData(); } diff --git a/src/components/drawers/router/RouterCommonManage.vue b/src/components/drawers/router/RouterCommonManage.vue index 4a4778c3..3cc3ec1c 100644 --- a/src/components/drawers/router/RouterCommonManage.vue +++ b/src/components/drawers/router/RouterCommonManage.vue @@ -192,7 +192,7 @@ export default { pageSize: 10, currentPage: 1, tableDataTotal: 0, - projectName: undefined, + projectName: null, projectNameListNot: [ { id: 1, @@ -384,7 +384,7 @@ export default { ctx.emit("update:CommonModelVisible", false); state.currentPage = 1; state.name = ""; - state.projectName = undefined; + state.projectName = null; state.tabledata = []; }; const afterVisibleChange = (bol) => { @@ -396,6 +396,9 @@ export default { }; const selectProjectName = (value) => { state.projectName = value; + if(value === undefined){ + state.projectName = null; + } }; //催促 const godie = () => { @@ -523,7 +526,7 @@ export default { state.tableDataTotalLoading = true; state.currentPage = 1; state.name = ""; - state.projectName = undefined; + state.projectName = null; getData(); } From dac3f8292f0f0250f7e72a4cdd8caf7e18c9c034 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Mon, 9 Sep 2024 15:39:36 +0800 Subject: [PATCH 20/88] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=EF=BC=8C=E5=8F=AA=E5=AD=98=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/project/ProjectNumber.vue | 6 ++---- src/views/projectcenter/ProjectAdd.vue | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/components/project/ProjectNumber.vue b/src/components/project/ProjectNumber.vue index 86973067..9d6ddd69 100644 --- a/src/components/project/ProjectNumber.vue +++ b/src/components/project/ProjectNumber.vue @@ -21,14 +21,12 @@ import {computed, defineEmits, defineProps, onMounted, ref, watch} from 'vue'; import { useStore } from "vuex"; const props = defineProps({ value: String, - label: String, }) -const emit = defineEmits(['update:value','update:label']) +const emit = defineEmits(['update:value']) const store = useStore(); -const numValue = ref(props.value||null) +const numValue = computed(()=>store.state.project_number.find(item=>item.value == props.value)?.name || null) const handleChange = (value,option)=>{ emit('update:value',value || '') - emit('update:label',option?.label || '') } onMounted(() => { // console.log(store.state.project_number,'store.state.project_number') diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue index 0273ce63..a4067635 100644 --- a/src/views/projectcenter/ProjectAdd.vue +++ b/src/views/projectcenter/ProjectAdd.vue @@ -151,7 +151,7 @@
项目编号：
- +
@@ -345,7 +345,6 @@ export default { watch(()=>state.projectInfo.boeFlag,(val)=>{ if(!val){ state.projectInfo.numValue = '' - state.projectInfo.numLabel = '' } }) From 15fbdcfde0805401b9cf13ef5db150b7e898b5c3 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Wed, 11 Sep 2024 16:53:40 +0800 Subject: [PATCH 21/88] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E4=BF=A1=E6=81=AF=E5=A2=9E=E5=8A=A0=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/student/TableStudent.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue index 305eb789..b76cd68a 100644 --- a/src/components/student/TableStudent.vue +++ b/src/components/student/TableStudent.vue @@ -618,7 +618,7 @@ function exportTaskStu() { window.open( `${ process.env.VUE_APP_BASE_API - }/admin/student/exportTaskStudent?type=${1}&pid=${props.id}` + }/admin/student/exportTaskStudent?type=${1}&pid=${props.id}&studentName=${tableParam.value.studentName}&studentDepartId=${tableParam.value.studentDepartId}&studentDepartName=${tableParam.value.studentDepartName}` ); } From 84f209f3606850680a538079a5dbb0973e0d5f0c Mon Sep 17 00:00:00 2001 From: zhangsir Date: Wed, 11 Sep 2024 17:28:56 +0800 Subject: [PATCH 22/88] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/student/TableStudent.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue index b76cd68a..24ab348d 100644 --- a/src/components/student/TableStudent.vue +++ b/src/components/student/TableStudent.vue @@ -618,7 +618,7 @@ function exportTaskStu() { window.open( `${ process.env.VUE_APP_BASE_API - }/admin/student/exportTaskStudent?type=${1}&pid=${props.id}&studentName=${tableParam.value.studentName}&studentDepartId=${tableParam.value.studentDepartId}&studentDepartName=${tableParam.value.studentDepartName}` + }/admin/student/exportTaskStudent?type=${1}&pid=${props.id}&studentName=${tableParam.value.studentName}&studentDepartName=${tableParam.value.studentDepartName}&topFlag=${tableParam.value.topFlag}` ); } From bcda1f06cf5f9d3dcb478f609a81088ca8836a91 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Wed, 11 Sep 2024 17:38:12 +0800 Subject: [PATCH 23/88] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E4=BF=A1=E6=81=AF=E5=8F=82=E6=95=B0=E4=B8=BA?= =?UTF-8?q?null=E6=94=B9=E4=B8=BA=E2=80=98=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/student/TableStudent.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue index 24ab348d..7dc767d9 100644 --- a/src/components/student/TableStudent.vue +++ b/src/components/student/TableStudent.vue @@ -618,7 +618,7 @@ function exportTaskStu() { window.open( `${ process.env.VUE_APP_BASE_API - }/admin/student/exportTaskStudent?type=${1}&pid=${props.id}&studentName=${tableParam.value.studentName}&studentDepartName=${tableParam.value.studentDepartName}&topFlag=${tableParam.value.topFlag}` + }/admin/student/exportTaskStudent?type=${1}&pid=${props.id}&studentName=${tableParam.value.studentName === null ?'':tableParam.value.studentName}&studentDepartName=${tableParam.value.studentDepartName===null?'':tableParam.value.studentDepartName}&topFlag=${tableParam.value.topFlag===null?'':tableParam.value.topFlag}` ); } From aefb8a66162f3838a601e2daaad336fa1218d6aa Mon Sep 17 00:00:00 2001 From: zhangsir Date: Fri, 13 Sep 2024 14:28:30 +0800 Subject: [PATCH 24/88] =?UTF-8?q?=E5=BC=80=E8=AF=BE=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E6=97=B6=E6=96=B0=E5=A2=9E=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 80223014..5a2bcea8 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -2253,6 +2253,7 @@ export default defineComponent({ const durationText = computed(() => state.xjkkinputV3?.length?dayjs(state.xjkkinputV3[1]).diff(dayjs(state.xjkkinputV3[0]),'minute'):'请输入持续时间'); const state = reactive({ + tableCoursePlanLoading: false, permissions:null, createId:null, workInfo: {}, @@ -3557,6 +3558,7 @@ function onFocusEnd(){ // 渲染开课操作 const getTableDate3 = async (type) => { state.tableLoading = true; + state.tableCoursePlanLoading = true // let datas = state.tableData6; let beginTime = ""; let endTime = ""; @@ -3611,6 +3613,7 @@ function onFocusEnd(){ itm.pageNo = pageNo; }); state.tableData6 = datas; + state.tableCoursePlanLoading = false console.log("state.tableData6", state.tableData6); }; From 366de3d5e183ee0f86d97df64ff02b9c9bce6efc Mon Sep 17 00:00:00 2001 From: zhangsir Date: Wed, 18 Sep 2024 16:04:30 +0800 Subject: [PATCH 25/88] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Curriculum.vue | 362 ++++++++++++++++++-------------- 1 file changed, 209 insertions(+), 153 deletions(-) diff --git a/src/views/report/Curriculum.vue b/src/views/report/Curriculum.vue index 258c5292..8f08d674 100644 --- a/src/views/report/Curriculum.vue +++ b/src/views/report/Curriculum.vue @@ -3,6 +3,37 @@
+
+ + +
+
+ + +
+
+ +
-
- - +
+
+
+
搜索
+
+
+
+
重置
+
-
- - +
+ {{isShowChange?'展开':'收起'}} + +
-
- -
-
+
-
+
-
-
-
-
搜索
-
-
-
-
重置
-
-
+
@@ -161,8 +169,16 @@ import Cookies from "vue-cookies"; import downLoad from "../../utils/downLoad"; import { message } from "ant-design-vue"; import {useStore} from 'vuex' +import { + DownOutlined, + UpOutlined, +} from '@ant-design/icons-vue'; export default { name: "CurriculuM", + components: { + DownOutlined, + UpOutlined, + }, setup() { const store = useStore(); const state = reactive({ @@ -180,7 +196,8 @@ export default { allowClear: false, option: [], selectedRowKeys: [], - typeOption:[] + typeOption:[], + isShowChange: true, }); const StateList = ref([ {value:'',label:'全部'}, @@ -282,6 +299,17 @@ export default { align: "center", width: 120, }, + { + title: "内容分类", + dataIndex: "oneType", + ellipsis: true, + key: "oneType", + align: "center", + width: 300, + customRender({record:{oneType,twoType,threeType}}){ + return `${oneType ? oneType : ''}${twoType ? ' / '+twoType : ''}${threeType ? ' / '+threeType : ''}`; + } + }, { title: "课程类型", dataIndex: "courseType", @@ -298,110 +326,102 @@ export default { align: "center", width: 120, }, - { - title: "归属项目", - dataIndex: "projectName", - ellipsis: true, - key: "projectName", - align: "center", - width: 120, - }, - { - title: "归属路径图", - dataIndex: "routerName", - ellipsis: true, - key: "routerName", - align: "center", - width: 120, - }, - { - title: "一级分类", - dataIndex: "oneType", - ellipsis: true, - key: "oneType", - align: "center", - width: 120, - }, - { - title: "二级分类", - dataIndex: "twoType", - ellipsis: true, - key: "twoType", - align: "center", - width: 120, - }, - { - title: "三级分类", - dataIndex: "threeType", - ellipsis: true, - key: "threeType", - align: "center", - width: 120, - }, - { - title: "授课教师", - dataIndex: "teacher", - ellipsis: true, - key: "teacher", - align: "center", - width: 120, - }, - { - title: "开课次数", - dataIndex: "classTotal", - ellipsis: true, - key: "classTotal", - align: "center", - width: 120, - }, - { - title: "学习人数", - dataIndex: "learnerNumber", - ellipsis: true, - key: "learnerNumber", - align: "center", - width: 120, - }, - { - title: "评论数", - dataIndex: "commentTotal", - ellipsis: true, - key: "commentTotal", - align: "center", - width: 120, - }, - { - title: "点赞数", - dataIndex: "likesTotal", - ellipsis: true, - key: "likesTotal", - align: "center", - width: 120, - }, - { - title: "收藏数", - dataIndex: "collectionsTotal", - ellipsis: true, - key: "collectionsTotal", - align: "center", - width: 120, - }, - { - title: "平均评分", - dataIndex: "score", - ellipsis: true, - key: "score", - align: "center", - width: 120, - }, - { - title: "发布时间", - dataIndex: "publishTime", - ellipsis: true, - key: "publishTime", - align: "center", - width: 140, - }, + // { + // title: "归属项目", + // dataIndex: "projectName", + // ellipsis: true, + // key: "projectName", + // align: "center", + // width: 120, + // }, + // { + // title: "归属路径图", + // dataIndex: "routerName", + // ellipsis: true, + // key: "routerName", + // align: "center", + // width: 120, + // }, + // { + // title: "一级分类", + // dataIndex: "oneType", + // ellipsis: true, + // key: "oneType", + // align: "center", + // width: 120, + // }, + // { + // title: "二级分类", + // dataIndex: "twoType", + // ellipsis: true, + // key: "twoType", + // align: "center", + // width: 120, + // }, + // { + // title: "三级分类", + // dataIndex: "threeType", + // ellipsis: true, + // key: "threeType", + // align: "center", + // width: 120, + // }, + // { + // title: "授课教师", + // dataIndex: "teacher", + // ellipsis: true, + // key: "teacher", + // align: "center", + // width: 120, + // }, + // { + // title: "开课次数", + // dataIndex: "classTotal", + // ellipsis: true, + // key: "classTotal", + // align: "center", + // width: 120, + // }, + // { + // title: "学习人数", + // dataIndex: "learnerNumber", + // ellipsis: true, + // key: "learnerNumber", + // align: "center", + // width: 120, + // }, + // { + // title: "评论数", + // dataIndex: "commentTotal", + // ellipsis: true, + // key: "commentTotal", + // align: "center", + // width: 120, + // }, + // { + // title: "点赞数", + // dataIndex: "likesTotal", + // ellipsis: true, + // key: "likesTotal", + // align: "center", + // width: 120, + // }, + // { + // title: "收藏数", + // dataIndex: "collectionsTotal", + // ellipsis: true, + // key: "collectionsTotal", + // align: "center", + // width: 120, + // }, + // { + // title: "平均评分", + // dataIndex: "score", + // ellipsis: true, + // key: "score", + // align: "center", + // width: 120, + // }, { title: "发布状态", dataIndex: "publishStatus", @@ -410,14 +430,6 @@ export default { align: "center", width: 120, }, - { - title: "启用状态", - dataIndex: "enabled", - ellipsis: true, - key: "enabled", - align: "center", - width: 120, - }, { title: "创建人", dataIndex: "createName", @@ -426,6 +438,38 @@ export default { align: "center", width: 120, }, + { + title: "发布时间", + dataIndex: "publishTime", + ellipsis: true, + key: "publishTime", + align: "center", + width: 140, + }, + // { + // title: "发布状态", + // dataIndex: "publishStatus", + // ellipsis: true, + // key: "publishStatus", + // align: "center", + // width: 120, + // }, + { + title: "启用状态", + dataIndex: "enabled", + ellipsis: true, + key: "enabled", + align: "center", + width: 120, + }, + // { + // title: "创建人", + // dataIndex: "createName", + // ellipsis: true, + // key: "createName", + // align: "center", + // width: 120, + // }, { title: "操作", dataIndex: "operation", @@ -697,10 +741,22 @@ export default { margin-top: 30px; display: flex; flex-wrap: wrap; + position: relative; .select { margin-right: 20px; margin-bottom: 20px; - width: calc((100% - 76px - 220px) / 3); + width: calc((100% - 76px - 220px) / 5); + } + .right_btn{ + position: absolute; + right: 20px; + height: 40px; + line-height: 40px; + cursor: pointer; + .text{ + margin-right: 14px; + color:#4ea6ff; + } } .btnz { From 87172644f26997ff02f82e44179cd6e54d94d464 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Wed, 18 Sep 2024 16:13:39 +0800 Subject: [PATCH 26/88] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E5=86=85=E5=AE=B9=E5=88=86=E7=B1=BB=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Curriculum.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/report/Curriculum.vue b/src/views/report/Curriculum.vue index 8f08d674..43b165a1 100644 --- a/src/views/report/Curriculum.vue +++ b/src/views/report/Curriculum.vue @@ -306,8 +306,8 @@ export default { key: "oneType", align: "center", width: 300, - customRender({record:{oneType,twoType,threeType}}){ - return `${oneType ? oneType : ''}${twoType ? ' / '+twoType : ''}${threeType ? ' / '+threeType : ''}`; + customRender({record:{oneType,twoType,threeType,allType}}){ + return allType; } }, { From 444c4758b07a262e5736b5333e5f056025285693 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Wed, 18 Sep 2024 17:04:02 +0800 Subject: [PATCH 27/88] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E5=86=85=E5=AE=B9=E5=88=86=E7=B1=BB=E5=86=8D?= =?UTF-8?q?=E6=AC=A1=E4=BF=AE=E6=94=B9=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Curriculum.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/report/Curriculum.vue b/src/views/report/Curriculum.vue index 43b165a1..b905cc0d 100644 --- a/src/views/report/Curriculum.vue +++ b/src/views/report/Curriculum.vue @@ -306,8 +306,8 @@ export default { key: "oneType", align: "center", width: 300, - customRender({record:{oneType,twoType,threeType,allType}}){ - return allType; + customRender({record:{oneType,twoType,threeType,type}}){ + return type.split('-').join(' / '); } }, { From 18dc3e96077776fd22b6b85d7a4f0f2acc4adc6b Mon Sep 17 00:00:00 2001 From: zhangsir Date: Wed, 18 Sep 2024 17:21:02 +0800 Subject: [PATCH 28/88] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E5=A2=9E=E5=8A=A0=E5=BC=82=E5=B8=B8=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/report/Curriculum.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/views/report/Curriculum.vue b/src/views/report/Curriculum.vue index b905cc0d..cdbae758 100644 --- a/src/views/report/Curriculum.vue +++ b/src/views/report/Curriculum.vue @@ -62,7 +62,7 @@
{{isShowChange?'展开':'收起'}} - +
@@ -271,8 +271,10 @@ export default { }; const res = await api.boeuCourseListPageV2(params); if (res) { - tableData.value = res.data.result.rows; - state.tableDataTotal = res.data.result.total; + if(res.data.status == 200){ + tableData.value = res.data.result.rows; + state.tableDataTotal = res.data.result.total; + } state.tableLoading = false; } }; From 76a54aaac1f55f53e9732b7477ae428a9a9c3717 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Thu, 19 Sep 2024 17:28:18 +0800 Subject: [PATCH 29/88] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/project/ProjectNumber.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/project/ProjectNumber.vue b/src/components/project/ProjectNumber.vue index 9d6ddd69..d312696f 100644 --- a/src/components/project/ProjectNumber.vue +++ b/src/components/project/ProjectNumber.vue @@ -34,7 +34,7 @@ onMounted(() => { const options = computed(()=>store.state.project_number.map(e => { return{ value: e.value, - label: e.name + label: ' 【 ' + e.value + ' 】 ' + e.name } })) From b9dec2abeeddbc4c356a0e42fedef8c5be8d544d Mon Sep 17 00:00:00 2001 From: zhangsir Date: Mon, 23 Sep 2024 17:02:16 +0800 Subject: [PATCH 30/88] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86=EF=BC=8C=E9=98=B2=E6=AD=A2?= =?UTF-8?q?=E7=A1=AE=E5=AE=9A=E6=8C=89=E9=92=AE=E4=B8=80=E7=9B=B4=E8=BD=AC?= =?UTF-8?q?=E5=9C=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/ProjectAdd.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue index a4067635..ee9ec40f 100644 --- a/src/views/projectcenter/ProjectAdd.vue +++ b/src/views/projectcenter/ProjectAdd.vue @@ -502,6 +502,7 @@ export default { id: state.projectInfo.id, }).then((res) => { return res.data.data == 1; + }).catch((err) => { }); if (offName) { message.destroy(); @@ -519,6 +520,10 @@ export default { path: "/taskpage", query: { projectId: res.data.data }, }); + }).catch((err) => { + state.loading = false; + message.destroy(); + message.error('创建项目失败，请重新创建'); }); }; From 1be2e48b8b54aa73a76f9f5f97a421b5a632c6a5 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Tue, 24 Sep 2024 16:34:35 +0800 Subject: [PATCH 31/88] =?UTF-8?q?=E5=88=A0=E9=99=A42023?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/BreadCrumb.vue | 2 +- src/components/NavLeft.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/BreadCrumb.vue b/src/components/BreadCrumb.vue index 89a8cff9..6eb02a31 100644 --- a/src/components/BreadCrumb.vue +++ b/src/components/BreadCrumb.vue @@ -491,7 +491,7 @@ { name: "感恩教师", }, { - name:'认证讲师库（2023）' + name:'认证讲师库' } ]; } diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue index d957ca22..7dd8f75c 100644 --- a/src/components/NavLeft.vue +++ b/src/components/NavLeft.vue @@ -394,7 +394,7 @@ circle: selectedKeys[0] === 'sub22-4' ? false : true, }" > - 认证讲师库（2023） + 认证讲师库 Date: Tue, 24 Sep 2024 17:49:00 +0800 Subject: [PATCH 32/88] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=9B=9E=E6=BB=9A=E4=BA=A7=E7=94=9F=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main.js b/src/main.js index 6eda4d84..0ebeba8f 100644 --- a/src/main.js +++ b/src/main.js @@ -131,5 +131,6 @@ async function init() { initDict("course_pic"); //课程封面 initDict("job_type"); //岗位 initDict("band"); //band - initDict("examine_cover") + initDict("examine_cover") //讲师认证封面图 + initDict("project_number") //项目编号 } \ No newline at end of file From 0ee26671ceaa9689b580a59bf48ecb63a26da563 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Fri, 27 Sep 2024 10:30:55 +0800 Subject: [PATCH 33/88] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 760 ++++++++++--------- 1 file changed, 391 insertions(+), 369 deletions(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index cac253e2..57a45c0a 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -10,6 +10,7 @@ v-model:value="createName" style="width: 200px; height: 40px; border-radius: 8px" placeholder="请输入创建人" + @pressEnter="handleSearch1" />
@@ -17,6 +18,7 @@ v-model:value="name" style="width: 200px; height: 40px; border-radius: 8px" placeholder="请输入名称" + @pressEnter="handleSearch1" />
@@ -24,6 +26,7 @@ v-model:value="projectName" style="width: 200px; height: 40px; border-radius: 8px" placeholder="请输入所属项目" + @pressEnter="handleSearch1" />
@@ -679,9 +682,8 @@ -
重置
+
+
@@ -769,6 +773,7 @@
+
@@ -788,12 +793,12 @@
-
+
+
+ 评估码 +
- 签到 + 签到码
- + { @@ -2048,16 +2056,33 @@ const columns6 = [ width: 100, align: "center", ellipsis: true, + customRender: ({ text }) => { + return( +
+ {text || '0'} +
xixi
+
+ ) + }, + }, + { + title: "评分", + dataIndex: "studentCnt", + key: "studentCnt", + width: 100, + align: "center", + ellipsis: true, customRender: ({ text }) => { return text ? text : "0"; }, }, { title: "操作", - width: 200, + width: 300, dataIndex: "operation", key: "operation", align: "center", + fixed: "right", slots: { customRender: "action" }, }, ]; @@ -3820,7 +3845,7 @@ function onFocusEnd(){ const stm_exit = () => { state.stm_hs = false; handleCancelStu(); - handleRestTable(); + // handleRestTable(); }; const createkk = () => { state.xjkkinputV1 = state.newCourseName @@ -5108,19 +5133,19 @@ function onFocusEnd(){ state.codevisible = true; let teacherNames = record.offteachers?.filter(teacher => teacher.teacherName !== null).map(teacher => teacher.teacherName); state.codeInfo = { - title: type == 1 ? "【课程】二维码" : "【签到】二维码", - name: record.name ? record.name+'签到' : "", + title: type == 1 ? "【课程】二维码" : type == 2 ? "【签到】二维码" : "【评估】二维码", + name: record.name ? record.name + type == 2 ?'签到' : '评估' : "", teacherName: teacherNames.length > 0 ? teacherNames.join(' ') : "", url: type == 1 ? process.env.VUE_APP_BASE_API + `/stu/project/redirectDetail?courseId=${record.id}` - : process.env.VUE_APP_BASE_API + + : type == 2 ? process.env.VUE_APP_BASE_API + `/admin/student/studentSign?taskId=${ record.id }&taskType=${2}&type=${3}&openCourseId=${ record.id - }`, + }` : `${location.protocol}//${location.host}/student-h5/investigatpage?id=${record.id}&type=3&infoId=${record.id}&courseId=${record.assessmentId}&chapterOrStageId=0&level=${record.name}` }; console.log("codeInfo", state.codeInfo, record); state.codeIndex = 0; @@ -5286,6 +5311,9 @@ function onFocusEnd(){ }); diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue index 1f3fb378..5f8fd451 100644 --- a/src/components/student/TableStudent.vue +++ b/src/components/student/TableStudent.vue @@ -196,7 +196,7 @@ :data-source="tableData.list" :pagination="stuPagination" :loading="tableData.loading" - :scroll="{ x: 1500 }" + :scroll="{ x: 'max-content' }" row-key="id" :row-selection="stuRowSelection" > @@ -467,7 +467,7 @@ const tablecolumns = ref([ title: "姓名", dataIndex: "studentName", key: "studentName", - width: "10%", + width: "160px", align: "left", className: "h", ellipsis: true, @@ -496,7 +496,7 @@ const tablecolumns = ref([ title: "工号", dataIndex: "studentUserNo", key: "studentUserNo", - width: "20%", + width: "120px", align: "center", className: "h", ellipsis: true, @@ -505,12 +505,12 @@ const tablecolumns = ref([ title: "部门", dataIndex: "studentDepartName", key: "studentDepartName", - width: "15%", + width: "200px", align: "center", className: "h", - ellipsis: true, + customCell :() => {return {style: {maxWidth: '200px',overflow: 'hidden',whiteSpace: 'nowrap',textOverflow:'ellipsis',cursor:'pointer'}}}, customRender: ({ record: { studentOrgName, studentDepartName } }) => - allDepartShow(studentOrgName), + {allDepartShow(studentOrgName)} }, { title: "所属小组", @@ -525,8 +525,9 @@ const tablecolumns = ref([ title: "加入方式", dataIndex: "source", key: "source", - width: "10%", + width: "120px", align: "center", + ellipsis: true, customRender: ({ record: { source } }) => // ({ 1: "快速添加", 2: "组织", 3: "受众", 4: "报名" }[source]), ({ @@ -544,7 +545,8 @@ const tablecolumns = ref([ title: "操作", dataIndex: "operation", key: "operation", - width: 260, + width: '260px', + fixed: "right", align: "center", slots: { customRender: "action" }, }, diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 1d878845..a56458f8 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -755,7 +755,7 @@ v-model:value="selectTime" type="date" style="width: 300px; margin-right: 14px" - :placeholder="[' 课程开始时间', ' 课程结束时间']" + :placeholder="[' 面授开始时间', ' 面授结束时间']" :show-time="{ defaultValue: [ moment('00:00', 'HH:mm'), @@ -819,7 +819,7 @@