From af3013d3c4f4d21fd9c1854ffa85b0b9374a1a7e Mon Sep 17 00:00:00 2001 From: zhangsir Date: Wed, 21 Aug 2024 16:00:56 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=A8=E7=BA=BF?= =?UTF-8?q?=E8=AF=BE=E7=8A=B6=E6=80=81=E5=8F=82=E6=95=B0=E4=B8=BAnull?= 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 0408cb0c8a25e056fd1e0e0f28156507b93ff44f Mon Sep 17 00:00:00 2001 From: zhangsir Date: Thu, 22 Aug 2024 11:23:08 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=95=99=E5=B8=88?= =?UTF-8?q?=E6=97=A0=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86=EF=BC=8C=E8=80=83?= =?UTF-8?q?=E8=AF=95=E6=97=A0=E5=AD=A6=E5=91=98=E5=AF=BC=E5=87=BA=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=B7=BB=E5=8A=A0=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/request.js | 7 ++++++- src/components/drawers/router/RouterExaminationManage.vue | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/api/request.js b/src/api/request.js index 1d1e30f8..3934f065 100644 --- a/src/api/request.js +++ b/src/api/request.js @@ -370,7 +370,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(); @@ -494,6 +496,9 @@ export async function request(_url, params) { if (res.code === 0 || res.code === 200) { return res; } + if (res.code === 4 ){ + return Promise.reject(res); + } if (res.code === 1000 || res.code === 1002) { window.location.href = process.env.VUE_APP_LOGIN_URL + encodeURIComponent(window.location.protocol + process.env.VUE_APP_BOE_API_URL + process.env.VUE_APP_BASE + router.currentRoute.value.fullPath) localStorage.removeItem('refreshPage') diff --git a/src/components/drawers/router/RouterExaminationManage.vue b/src/components/drawers/router/RouterExaminationManage.vue index 8f3fc07d..24726938 100644 --- a/src/components/drawers/router/RouterExaminationManage.vue +++ b/src/components/drawers/router/RouterExaminationManage.vue @@ -442,6 +442,10 @@ export default { {/* 导出数据 */ } function exportData() { + if(state.tabledata.length==0){ + message.error("没有数据可以导出"); + return + } // 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}`) window.open(`${process.env.VUE_APP_BASE_API}/admin/exam/manage/exportExam?currentStageId=${props.datasource.chapterId}&type=${1}&pid=${props.datasource.routerId}&targetId=${props.datasource.routerId}&taskId=${props.datasource.courseId}&taskType=${props.datasource.type}`) From c0f3df567bb344408813e30e43442928c1ce9101 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Tue, 3 Sep 2024 10:57:25 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E5=BC=80=E8=AF=BE=E6=95=99=E5=B8=88=E5=90=8D=E7=A7=B0=E7=9A=84?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddOpenCourse.vue | 24 +++++++++++--------- src/views/courselibrary/CoursewareManage.vue | 21 +++++++++-------- 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/src/components/drawers/AddOpenCourse.vue b/src/components/drawers/AddOpenCourse.vue index 54941def..b5e80e40 100644 --- a/src/components/drawers/AddOpenCourse.vue +++ b/src/components/drawers/AddOpenCourse.vue @@ -487,18 +487,20 @@ const columns = ref([ key: "teacher", width: "20%", 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(',') + }, }, { 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 4/9] =?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 15fbdcfde0805401b9cf13ef5db150b7e898b5c3 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Wed, 11 Sep 2024 16:53:40 +0800 Subject: [PATCH 5/9] =?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 6/9] =?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 7/9] =?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 8/9] =?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 1be2e48b8b54aa73a76f9f5f97a421b5a632c6a5 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Tue, 24 Sep 2024 16:34:35 +0800 Subject: [PATCH 9/9] =?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） + 认证讲师库