From 46adf4c0580a57abcaa568cc620bb745f9b6c1ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E4=BA=86=E4=B8=AA=E7=99=BD?= <543593352@qq.com> Date: Sat, 14 Sep 2024 17:00:14 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=89=B9=E6=94=B9=20load?= =?UTF-8?q?ing=20Bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/views/classTask/classTask.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/renderer/src/views/classTask/classTask.vue b/src/renderer/src/views/classTask/classTask.vue index f29b2f3..e4da49c 100644 --- a/src/renderer/src/views/classTask/classTask.vue +++ b/src/renderer/src/views/classTask/classTask.vue @@ -118,6 +118,7 @@ const getData = () => { getClassWorkList() // 3、班级学生作业 包含多个班级 getStudentClassWorkData() + loading.value = false } /** * 1、获取班级列表数据 From ddd53943b88f3f3896889e536927c584e938363c Mon Sep 17 00:00:00 2001 From: lyc Date: Wed, 18 Sep 2024 09:42:35 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=B8=83=E7=BD=AE=E4=BD=9C=E4=B8=9A-?= =?UTF-8?q?=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4=E9=BB=98=E8=AE=A4=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/set-homework/index.vue | 23 ++++--------------- 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/src/renderer/src/components/set-homework/index.vue b/src/renderer/src/components/set-homework/index.vue index 7518cf2..abfb4d1 100644 --- a/src/renderer/src/components/set-homework/index.vue +++ b/src/renderer/src/components/set-homework/index.vue @@ -10,13 +10,13 @@
- + - + {{ tag.name }} @@ -53,6 +53,7 @@ import { ElMessage } from 'element-plus' import { listClassmain, listClassgroup } from '@/api/classManage/index' import { saveByClassWorkArray } from '@/api/teaching/classwork' import useUserStore from '@/store/modules/user' +import { getCurrentTime } from '@/utils/date' import { uniqBy, groupBy } from 'lodash' const model = defineModel({ type: Boolean, default: false }) @@ -233,7 +234,7 @@ const onSubmit = (formEl) => { timelength: form.timelength, weights: 1, deaddate: form.deaddate, - workdate: getCurrentDate(), + workdate: getCurrentTime('YYYY-MM-DD'), uniquekey: props.row.uniquekey, entpcourseworklist: '[' + props.row.entpcourseworklist + ']', needMsgNotifine: 'false', @@ -275,24 +276,10 @@ const cloneDialog = (formEl) => { formEl.resetFields() model.value = false } -// 获取当前年月日 -const getCurrentDate = () => { - const now = new Date() - const year = now.getFullYear() - let month = now.getMonth() + 1 // 月份是从0开始的，所以需要+1 - let day = now.getDate() - if (month < 10) { - month = '0' + month - } - if (day < 10) { - day = '0' + day - } - return `${year}-${month}-${day}` -} onMounted(() => { // 默认当前 - form.deaddate = getCurrentDate() + ' ' + '10:00:00' + form.deaddate = getCurrentTime('YYYY-MM-DD HH:mm') }) From aee945f90f7b2d36a4802202da29fe4acf248da1 Mon Sep 17 00:00:00 2001 From: lyc Date: Wed, 18 Sep 2024 10:53:22 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E8=AF=BE=E7=A8=8B-?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=99=90=E5=88=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/prepare/container/reserv.vue | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/renderer/src/views/prepare/container/reserv.vue b/src/renderer/src/views/prepare/container/reserv.vue index c76c36f..69c3077 100644 --- a/src/renderer/src/views/prepare/container/reserv.vue +++ b/src/renderer/src/views/prepare/container/reserv.vue @@ -178,16 +178,23 @@ const disabledHours = ()=>{ } // 限制分-返回被禁选的 const disabledMinute = (hour,role) => { + if(form.time == null) return if(getCurrentTime('YYYY-MM-DD') == form.day){ const arrs = [] if(role == 'start'){ - for (let i = 0; i < 60; i++) { - if (new Date().getMinutes() <= i) continue; - arrs.push(i) + let nowHour = new Date().getHours().toString().padStart(2, '0'); + if(nowHour < hour){ + return [] + } + else{ + for (let i = 0; i < 60; i++) { + if (new Date().getMinutes() <= i) continue; + arrs.push(i) + } + return arrs; } - return arrs; } - else{ + if(role == 'end'){ if(form.time[0]) return [] } } From aaa2aef3ca7f6744774c6e78fd61cdc006bd593a Mon Sep 17 00:00:00 2001 From: lyc Date: Wed, 18 Sep 2024 11:13:32 +0800 Subject: [PATCH 4/6] move-file --- src/renderer/src/components/move-file/index.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/renderer/src/components/move-file/index.vue b/src/renderer/src/components/move-file/index.vue index dfa7911..f2fec19 100644 --- a/src/renderer/src/components/move-file/index.vue +++ b/src/renderer/src/components/move-file/index.vue @@ -115,7 +115,8 @@ const getSubjectContent = async () => { edustage, // entpcourseedituserid: userId, itemgroup: 'textbook', - pageSize: 500 + orderby: 'orderidx asc', + pageSize: 10000 } let data; const { rows } = await listEvaluation(params) @@ -142,7 +143,7 @@ const getSubject = async () => { subjectList.value = JSON.parse(localStorage.getItem('subjectList')) } else { - const { rows } = await listEvaluation({ itemkey: "version", edusubject, edustage, pageSize: 500 }) + const { rows } = await listEvaluation({ itemkey: "version", edusubject, edustage, pageSize: 10000, orderby: 'orderidx asc', }) subjectList.value = rows localStorage.setItem('subjectList', JSON.stringify(subjectList.value)) } From 3b9877e788d76d81b5aa78495dfec420e577c346 Mon Sep 17 00:00:00 2001 From: yangws <1607839436@qq.com> Date: Wed, 18 Sep 2024 13:55:30 +0800 Subject: [PATCH 5/6] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E5=BA=93=E6=8A=A5=E9=94=99=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/renderer/src/views/profile/userInfo.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/renderer/src/views/profile/userInfo.vue b/src/renderer/src/views/profile/userInfo.vue index d29380e..1d538e4 100644 --- a/src/renderer/src/views/profile/userInfo.vue +++ b/src/renderer/src/views/profile/userInfo.vue @@ -91,6 +91,8 @@ const subjectList = ref([]) // 获取基础的学科 const getSubject = () => { + //没有学科则不进行下面的步骤 + if(!userInfo.user.subject) return listEvaluation({ itemkey: 'subject', pageSize: 500 }).then((res) => { const arr = userStore.user.subject.split(',') subjectList.value = res.rows.filter(item => arr.includes(String(item.id))).map(items => items) From acd66c11fa20d4b68bbb05646f4e42f86771cb7e Mon Sep 17 00:00:00 2001 From: yangws <1607839436@qq.com> Date: Wed, 18 Sep 2024 14:04:58 +0800 Subject: [PATCH 6/6] =?UTF-8?q?fix:=20=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E4=BB=BB=E9=80=89=E5=AD=A6=E7=A7=91=E6=8A=A5=E9=94=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/views/profile/userInfo.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/src/views/profile/userInfo.vue b/src/renderer/src/views/profile/userInfo.vue index 1d538e4..158392d 100644 --- a/src/renderer/src/views/profile/userInfo.vue +++ b/src/renderer/src/views/profile/userInfo.vue @@ -92,7 +92,7 @@ const subjectList = ref([]) // 获取基础的学科 const getSubject = () => { //没有学科则不进行下面的步骤 - if(!userInfo.user.subject) return + if(!userStore.user.subject) return listEvaluation({ itemkey: 'subject', pageSize: 500 }).then((res) => { const arr = userStore.user.subject.split(',') subjectList.value = res.rows.filter(item => arr.includes(String(item.id))).map(items => items)