Merge branch 'main' into zouyf_dev

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))
   }

src/renderer/src/components/set-homework/index.vue

@@ -10,13 +10,13 @@
     <div v-loading="setLoading">
       <el-form :model="form" label-width="80px" ref="ruleFormRef" :rules="rules">
         <el-form-item label="班级" prop="grade">
-          <el-scrollbar max-height="200px" style="width: 100%">
+          <el-scrollbar max-height="150px" style="width: 100%">
             <el-tree :props="defaultProps" :load="getLoad" node-key="id" highlight-current @check="handleCheckChange"
               lazy show-checkbox />
           </el-scrollbar>
         </el-form-item>
         <el-form-item label="选中学生" prop="student">
-          <el-scrollbar max-height="200px">
+          <el-scrollbar max-height="130px">
             <el-tag v-for="(tag, index) in studentList" :key="tag.studentid" closable type="primary"
               @close="delStudent(index)">
               {{ 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',
@@ -276,24 +277,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')
 })
 </script>
 

src/renderer/src/views/prepare/container/reserv.vue

@@ -172,16 +172,23 @@ const disabledHours = ()=>{
 }
 // 限制分-返回被禁选的
 const disabledMinute = (hour,role) => {
+  if(form.time == null) return
   if(getCurrentTime('YYYY-MM-DD') == form.day){
     const arrs = []
     if(role == 'start'){
+      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;
       }
-    else{
+    }
+    if(role == 'end'){
       if(form.time[0]) return []
     }
   }

src/renderer/src/views/profile/userInfo.vue

@@ -91,6 +91,8 @@ const subjectList = ref([])
 
 // 获取基础的学科
 const getSubject = () => {
+  //没有学科则不进行下面的步骤
+  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)