From 56342f7e9fab9a383f509605b89c900aaba11ea9 Mon Sep 17 00:00:00 2001 From: wangxuemei <283912718@qq.com> Date: Sun, 10 Nov 2024 18:15:03 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8E=88=E8=AF=BE=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E4=BD=93=E7=B3=BBid=20=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/lecturer/ExternalTeaching.vue | 26 ++++++++++--------- src/views/lecturer/InsideLecturer.vue | 2 +- src/views/lecturer/InsideTeaching.vue | 33 ++++++++++++++----------- 3 files changed, 34 insertions(+), 27 deletions(-) diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue index cbd7ff6b..17b13dc1 100644 --- a/src/views/lecturer/ExternalTeaching.vue +++ b/src/views/lecturer/ExternalTeaching.vue @@ -21,7 +21,7 @@
-
创建时间：
+
课程日期：
查看 - 修改 + 修改 删除 @@ -175,7 +175,8 @@ + placeholder="0" allowClear showSearch suffix="分钟" + :maxLength="8" @blur="clearNonNumber"> {{ (formParam.teaching / 60 ).toFixed(2) }}小时 @@ -187,16 +188,17 @@ - - - + + @@ -239,8 +241,8 @@ ? '已开课' : '' }} {{ formParam.courseTypeName }} {{ formParam.teachingDate }} - {{ formParam.teaching }} - ({{ (formParam.teaching / 60 + {{ formParam.teaching }} 分钟 + ({{ (formParam.teaching / 60 ).toFixed(2) }}小时) {{ formParam.score }} @@ -381,7 +383,7 @@ export default { const AddressList = ref([ ]); const rules = { - name: [{ required: true, message: '', log: '讲师不能为空' }], + teacherName: [{ required: true, message: '', log: '讲师不能为空' }], courseTypeId: [{ required: true, message: '', log: '内容分类不能为空' }], courseName: [{ required: true, message: '', log: '课程名称不能为空' }], courseStatus: [{ required: true, message: '', log: '讲开课状态不能为空' }], @@ -402,10 +404,12 @@ export default { { value: 3, label: "面授开课" }, ]) const AuthenticationStatusList = ref([ + { value: '', label: "全部" }, { value: 0, label: "未开课" }, { value: 1, label: "已开课" }, ]) const entryTypeList = ref([ + { value: '', label: "全部" }, { value: 0, label: "系统生成" }, { value: 1, label: "手动录入" }, ]) @@ -643,7 +647,7 @@ export default { //修改讲师信息弹窗 const handleModify = (record) => { state.teacherdialog = true; - state.teacherdialogtitle = '修改授课记录' + state.teacherdialogtitle = '编辑授课记录' state.lookTeacherId = record.id state.formParam.recordType = '1' state.vf = false diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue index 5c08b166..77164a6f 100644 --- a/src/views/lecturer/InsideLecturer.vue +++ b/src/views/lecturer/InsideLecturer.vue @@ -175,7 +175,7 @@ - diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue index ce6d4868..d8b9224c 100644 --- a/src/views/lecturer/InsideTeaching.vue +++ b/src/views/lecturer/InsideTeaching.vue @@ -160,8 +160,8 @@ - + @@ -178,7 +178,7 @@ - + @@ -188,8 +188,8 @@ - - + @@ -230,7 +230,9 @@ + @@ -312,7 +314,7 @@ {{ formParam.userNo }} {{ formParam.orgName }} {{ formParam.tsystemName }} - {{ formParam.tlevelName + {{ formParam.levelName }} {{ formParam.createFrom == 0 ? '系统生成' : formParam.createFrom == 1 ? '手动录入' : '' }} @@ -325,7 +327,7 @@ {{ formParam.teachingDate }} {{ formParam.studys }} {{ formParam.score }} - {{ formParam.courseTypeName }} + {{ formParam.courseTypeName }} {{ formParam.remark }}
@@ -870,7 +872,7 @@ export default { //修改信息弹窗 const handleModify = (record) => { state.teacherdialog = true; - state.teacherdialogtitle = '修改授课记录' + state.teacherdialogtitle = '编辑授课记录' state.lookTeacherId = record.teacherId state.vf = false TeacherSystem1(record) @@ -891,6 +893,7 @@ export default { state.formParam.teacherName = state.formParam.name?.split('/')[0] state.formParam.userNo =state.formParam.name?.split('/')[1] state.formParam.tsystemName = state.tSystemNames.systemName + state.formParam.tsystemId = state.tSystemNames?.systemId state.formParam.teachingDate=state.teachingDate ? dayjs(state.teachingDate).format("YYYY-MM-DD").toString() : " " const formItemNames = Object.keys(rules); for(let i=0;i({ name: item })) state.teachingDate=dayjs(res.data.data.teachingDate, 'YYYY-MM-DD'), @@ -1137,7 +1140,7 @@ export default { const rules = { name: [{ required: true, message:'',log: '讲师不能为空' }], orgName: [{ required: true, message: '',log:'讲师组织不能为空' }], - tlevelId: [{ required: true, message: '',log:'讲师级别不能为空' }], + levelId: [{ required: true, message: '',log:'讲师级别不能为空' }], tsystemName: [{ required: true, message: '',log:'讲师体系不能为空' }], courseTypeId: [{ required: true, message: '',log:'内容分类不能为空' }], courseName: [{ required: true, message: '',log:'课程名称不能为空' }], @@ -1153,8 +1156,8 @@ export default { // // state.searchParam.trainorgName=orgName // } const handleformlevel = (val) => { - state.formParam.tlevelName = state.tSystemNames.levelVoList.find(item=>item.id===val)?.levelName - state.formParam.tlevelId = state.tSystemNames.levelVoList.find(item=>item.id===val)?.id + state.formParam.levelName = state.tSystemNames.levelVoList.find(item=>item.id===val)?.levelName + state.formParam.levelId = state.tSystemNames.levelVoList.find(item=>item.id===val)?.id } //导出功能 const handleExport = () => { From d4952e28a19554b14c081c87c93c53132a391417 Mon Sep 17 00:00:00 2001 From: wangxuemei <283912718@qq.com> Date: Sun, 10 Nov 2024 18:15:40 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/lecturer/ImportWork.vue | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/components/lecturer/ImportWork.vue b/src/components/lecturer/ImportWork.vue index aa8a946a..017c2916 100644 --- a/src/components/lecturer/ImportWork.vue +++ b/src/components/lecturer/ImportWork.vue @@ -192,10 +192,19 @@ import {getCookieForName} from "@/api/method"; state.fileList = []; state.uploadpercent = -1; message.destroy(); - message.error("请上传正确的文件格式"); + message.error("请按模板格式上传文件"); return; } } + let isLt1M = info.file.size < 512000000; + console.log(info.file.size, isLt1M) + if (!isLt1M) { + state.fileList = []; + state.uploadpercent = -1; + message.destroy(); + message.error("图片不能超过500KB! 请重新上传"); + return; + } state.addLoading = true; state.uploadpercent = parseInt(info.file.percent); From b91b8b4dd05e455c034d276516d56d282c1243f9 Mon Sep 17 00:00:00 2001 From: wangxuemei <283912718@qq.com> Date: Sun, 10 Nov 2024 18:44:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/project/ProjectManagerOutTeacher.vue | 2 +- src/views/lecturer/ExternalTeaching.vue | 6 +++--- src/views/lecturer/InsideTeaching.vue | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/project/ProjectManagerOutTeacher.vue b/src/components/project/ProjectManagerOutTeacher.vue index e7975b8a..afc9dc98 100644 --- a/src/components/project/ProjectManagerOutTeacher.vue +++ b/src/components/project/ProjectManagerOutTeacher.vue @@ -60,7 +60,7 @@ function debounce(func, wait) { timeout = setTimeout(() => func.apply(this, args), wait); }; } -const memberParam = ref({name: '', pageNo:1, pageSize: 999,teacherType:2}) +const memberParam = ref({name: '', pageNo:1, pageSize: 999,teacherType:2 ,status:1}) const userList = ref([]) const loading = ref(false) diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue index 17b13dc1..7520ab7c 100644 --- a/src/views/lecturer/ExternalTeaching.vue +++ b/src/views/lecturer/ExternalTeaching.vue @@ -168,7 +168,7 @@ - @@ -666,7 +666,7 @@ export default { } //保存 const createTeacherDialog = async () => { - state.formParam.teachingDate = state.teachingDate ? dayjs(state.teachingDate).format("YYYY-MM-DD").toString() : "" + state.formParam.teachingDate = state.teachingDate ? dayjs(state.teachingDate).format("YYYY-MM-DD HH:mm").toString() : "" console.log(state.formParam) const formItemNames = Object.keys(rules); for (let i = 0; i < formItemNames.length; i++) { @@ -778,7 +778,7 @@ export default { const TeacherSystem = () => { getTeacherCourseList({ id: state.lookTeacherId }).then((res) => { state.formParam = res.data.data - state.teachingDate = dayjs(res.data.data.teachingDate, 'YYYY-MM-DD'), + state.teachingDate = dayjs(res.data.data.teachingDate, 'YYYY-MM-DD HH:mm'), state.formParam.name=state.formParam.teacherName console.log(state.formParam); }) diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue index d8b9224c..80ae8bdd 100644 --- a/src/views/lecturer/InsideTeaching.vue +++ b/src/views/lecturer/InsideTeaching.vue @@ -229,7 +229,7 @@ - @@ -894,7 +894,7 @@ export default { state.formParam.userNo =state.formParam.name?.split('/')[1] state.formParam.tsystemName = state.tSystemNames.systemName state.formParam.tsystemId = state.tSystemNames?.systemId - state.formParam.teachingDate=state.teachingDate ? dayjs(state.teachingDate).format("YYYY-MM-DD").toString() : " " + state.formParam.teachingDate=state.teachingDate ? dayjs(state.teachingDate).format("YYYY-MM-DD HH:mm").toString() : " " const formItemNames = Object.keys(rules); for(let i=0;i({ name: item })) - state.teachingDate=dayjs(res.data.data.teachingDate, 'YYYY-MM-DD'), + state.teachingDate=dayjs(res.data.data.teachingDate, 'YYYY-MM-DD HH:mm' ), console.log( state.formParam); }) .catch((err) => {