Merge branch 'iteration-20240513-text' into jenkins

src/views/classList/index.module.less

@@ -768,7 +768,7 @@
     display: flex;
     flex-direction: row;
     // align-items: center;
-    justify-content: space-between;
+    justify-content: flex-start;
     flex-wrap: wrap;
     padding: 20px 32px 0;
     // min-height: 360px;

src/views/classList/modals/TrainingDetails.tsx

@@ -19,9 +19,6 @@ import { evaluateDifficult } from '/src/utils/contants';
 import dayjs from 'dayjs';
 import CommentWork from '../../studentList/modals/comment-work';
 import WorkItem from '../work-item';
-import request from '/src/utils/request';
-import CardPreview from '/src/components/card-preview';
-import { iframeDislableKeyboard } from '/src/utils';
 export default defineComponent({
   props: {
     activeRow: {
@@ -52,7 +49,6 @@ export default defineComponent({
     const showModalMask = ref(false);
     // const message = useMessage();
     // const foemsRef = ref();
-    const file_expire_time = ref<any>(null);
     const typeFormat = (trainingType: string, configJson: any) => {
       let tList: string[] = [];
 
@@ -107,24 +103,7 @@ export default defineComponent({
     };
     expose({ getTrainingDetail });
 
-    const getDefaultParamConfig = async () => {
-      try {
-        const { data } = await request.get(
-          '/edu-app/open/paramConfig/queryByParamName',
-          {
-            params: {
-              paramName: 'homework_file_expire_time'
-            }
-          }
-        );
-        file_expire_time.value = data.paramValue || 0;
-      } catch {
-        //
-      }
-    };
-
     onMounted(() => {
-      getDefaultParamConfig();
       getTrainingDetail(props.activeRow.studentLessonTrainingId);
     });
 
@@ -198,7 +177,7 @@ export default defineComponent({
             <div class={styles.expireDateTip}>
               <i class={styles.expireDateIcon}></i>
               <span>
-                作业截止{file_expire_time.value}
+                作业截止{studnetInfo.value.fileExpireDay || 0}
                 天后，学生上传的文件将过期，请及时查看
               </span>
             </div>

src/views/classList/work-item/index.tsx

@@ -28,7 +28,6 @@ export default defineComponent({
     });
     const reportSrc = ref('');
     const detailVisiable = ref(false);
-    console.log(props.item);
 
     const isDownload = computed(() => {
       if (

src/views/prepare-lessons/components/lesson-main/train/assign-homework.tsx

@@ -91,6 +91,7 @@ export default defineComponent({
     });
     const formsRef = ref();
     const maxDeadlineTime = ref(0);
+    const maxExpireTime = ref(0);
     const pickerEndTime = ref<any>(null);
     // 获取年级班级
     const getClassGroupList = async () => {
@@ -207,14 +208,22 @@ export default defineComponent({
     const getDefaultParamConfig = async () => {
       try {
         const { data } = await request.get(
-          '/edu-app/open/paramConfig/queryByParamName',
+          '/edu-app/open/paramConfig/queryByParamNameList',
           {
             params: {
-              paramName: 'homework_max_deadline_time'
+              paramNames: 'homework_max_deadline_time,homework_file_expire_time'
             }
           }
         );
-        maxDeadlineTime.value = data.paramValue || 0;
+        console.log(data, 'data');
+        const result = data || [];
+        result.forEach((item: any) => {
+          if (item.paramName === 'homework_file_expire_time') {
+            maxExpireTime.value = item.paramValue || 0;
+          } else if (item.paramName === 'homework_max_deadline_time') {
+            maxDeadlineTime.value = item.paramValue || 0;
+          }
+        });
 
         // 处理截止时间显示
         /**
@@ -454,12 +463,12 @@ export default defineComponent({
             />
           </NFormItem>
 
-          {maxDeadlineTime.value > 0 && (
+          {maxExpireTime.value > 0 && (
             <NFormItem label=" ">
               <div class={styles.expireDateTip}>
                 <i class={styles.expireDateIcon}></i>
                 <span>
-                  作业截止{maxDeadlineTime.value}
+                  作业截止{maxExpireTime.value}
                   天后，学生上传的文件将过期，请及时查看
                 </span>
               </div>

src/views/studentList/modals/studentTraomomhDetails.tsx

@@ -18,7 +18,7 @@ import dayjs from 'dayjs';
 import { getTrainingStudentDetail } from '../../classList/api';
 import CommentWork from './comment-work';
 import WorkItem from '../../classList/work-item';
-import request from '/src/utils/request';
+
 export default defineComponent({
   props: {
     activeRow: {
@@ -47,7 +47,6 @@ export default defineComponent({
       teacherAvatar: '',
       studentLessonTrainingDetails: [] as any
     } as any);
-    const file_expire_time = ref<any>(null);
     // const message = useMessage();
     // const foemsRef = ref();
     const typeFormat = (trainingType: string, configJson: any) => {
@@ -105,24 +104,7 @@ export default defineComponent({
       loading.value = false;
     };
     expose({ getTrainingDetail });
-    const getDefaultParamConfig = async () => {
-      try {
-        const { data } = await request.get(
-          '/edu-app/open/paramConfig/queryByParamName',
-          {
-            params: {
-              paramName: 'homework_file_expire_time'
-            }
-          }
-        );
-        file_expire_time.value = data.paramValue || 0;
-      } catch {
-        //
-      }
-    };
-
     onMounted(() => {
-      getDefaultParamConfig();
       getTrainingDetail(props.activeRow.id);
     });
 
@@ -207,7 +189,7 @@ export default defineComponent({
             <div class={styles.expireDateTip}>
               <i class={styles.expireDateIcon}></i>
               <span>
-                作业截止{file_expire_time.value}
+                作业截止{teacherInfo.value.fileExpireDay || 0}
                 天后，学生上传的文件将过期，请及时查看
               </span>
             </div>