Merge branch 'iteration-20250313-light' into jenkins-test

src/views/classList/components/afterWork.tsx

@@ -27,6 +27,7 @@ import TheEmpty from '/src/components/TheEmpty';
 import { initCache, setCache } from '/src/hooks/use-async';
 import StudentTraomomhDetails from '../../studentList/modals/studentTraomomhDetails';
 import { modalClickMask } from '/src/state';
+import dayjs from 'dayjs';
 export default defineComponent({
   name: 'afterWork',
   props: {
@@ -132,7 +133,9 @@ export default defineComponent({
           title: '截止时间',
           key: 'expireDate',
           render(row: any) {
-            return <>{row.expireDate}</>;
+            return row.expireDate
+              ? dayjs(row.expireDate).format('YYYY-MM-DD')
+              : '--';
           }
         },
         {

src/views/classList/components/afterWorkDetail.tsx

@@ -152,7 +152,9 @@ export default defineComponent({
               if (trainingContent) {
                 const tempList = [
                   `${evaluateDifficult[trainingContent.evaluateDifficult]}`,
-                  `${trainingContent.practiceChapterBegin || 0}-${trainingContent.practiceChapterEnd || 0}小节`,
+                  `${trainingContent.practiceChapterBegin || 0}-${
+                    trainingContent.practiceChapterEnd || 0
+                  }小节`,
                   `速度${trainingContent.evaluateSpeed || 0}`,
                   `${trainingContent.trainingTimes}分达标`
                 ];
@@ -296,9 +298,7 @@ export default defineComponent({
                       <span>
                         截止时间：
                         {state.workInfo.expireDate &&
-                          dayjs(state.workInfo.expireDate).format(
-                            'YYYY-MM-DD HH:mm'
-                          )}
+                          dayjs(state.workInfo.expireDate).format('YYYY-MM-DD')}
                       </span>
                     </p>
                   )}

src/views/classList/components/testRecode.tsx

@@ -118,6 +118,8 @@ export default defineComponent({
           classGroupId: route.query.id,
           studentName: searchForm.keyword,
           vipFlag: searchForm.vipFlag,
+          orderBy: searchForm.orderBy,
+          sort: searchForm.sort,
           ...state.pagination,
           ...getTimes(timer.value, ['startTime', 'endTime'], 'YYYY-MM-DD')
         });
@@ -140,6 +142,8 @@ export default defineComponent({
           rows: 999,
           studentName: searchForm.keyword,
           vipFlag: searchForm.vipFlag,
+          orderBy: searchForm.orderBy,
+          sort: searchForm.sort,
           classGroupId: route.query.id,
           ...getTimes(timer.value, ['startTime', 'endTime'], 'YYYY-MM-DD')
         });

src/views/home/components/trainData.tsx

@@ -8,6 +8,7 @@ import { getTrainingStat } from '../../data-module/api';
 import { useRoute, useRouter } from 'vue-router';
 import { getTrainingList } from '../../classList/api';
 import TheEmpty from '/src/components/TheEmpty';
+import dayjs from 'dayjs';
 
 export default defineComponent({
   name: 'home-trainData',
@@ -65,14 +66,16 @@ export default defineComponent({
           title: '布置时间',
           key: 'createTime',
           render(row: any) {
-            return <>{row.createTime}</>;
+            return row.createTime;
           }
         },
         {
           title: '截止时间',
           key: 'expireDate',
           render(row: any) {
-            return <>{row.expireDate}</>;
+            return row.expireDate
+              ? dayjs(row.expireDate).format('YYYY-MM-DD')
+              : '--';
           }
         },
         {

src/views/studentList/components/studentAfterWork.tsx

@@ -148,7 +148,7 @@ export default defineComponent({
           key: 'expireDate',
           render(row: any) {
             return row.expireDate
-              ? dayjs(row.expireDate).format('YYYY-MM-DD HH:mm')
+              ? dayjs(row.expireDate).format('YYYY-MM-DD')
               : '--';
           }
         },

src/views/studentList/modals/studentTraomomhDetails.tsx

@@ -148,7 +148,7 @@ export default defineComponent({
                   | 结束时间：
                   {teacherInfo.value.expireDate
                     ? dayjs(new Date(teacherInfo.value.expireDate)).format(
-                        'YYYY-MM-DD HH:mm'
+                        'YYYY-MM-DD'
                       )
                     : '--'}
                 </p>