feat: 作业记录改为分页

.env

@@ -2,6 +2,6 @@ VITE_WS_URL = wss://ai.lingxixue.com/ws/device
 VITE_OSS_URL = https://lxx-web-1313840333.cos.ap-chengdu.myqcloud.com
 VITE_CDN_URL = https://dmgcdn-1313840333.cos.ap-guangzhou.myqcloud.com
 VITE_SERVER_URL = https://ai.lingxixue.com/api/main
-VITE_XXL_VERSION=2.13.7
+VITE_XXL_VERSION=2.13.8
 VITE_INIT_VCONSOLE = 0
 VITE_TEACHER_ADMIN_URL = https://edu.lingxixue.com

.env.test

@@ -4,6 +4,6 @@ VITE_OSS_URL = https://lxx-web-1313840333.cos.ap-chengdu.myqcloud.com
 VITE_CDN_URL = https://dmgcdn-1313840333.cos.ap-guangzhou.myqcloud.com
 VITE_SERVER_URL = http://127.0.0.1:9053/api/main
 # VITE_SERVER_URL = http://test.web.xuexiaole.com/api/main
-VITE_XXL_VERSION=2.13.7
+VITE_XXL_VERSION=2.13.8
 VITE_INIT_VCONSOLE = 0
 VITE_TEACHER_ADMIN_URL = https://test.edu.xuexiaole.com

src/api/subject/homework/index.ts

@@ -1,6 +1,12 @@
-import { get, post } from '../../request'
+import { get, post, type PageResponse } from '../../request'
 
-import { PaperRecord, HomeworkExam, SubjectPaperRecord } from './type'
+import {
+  PaperRecord,
+  HomeworkExam,
+  SubjectPaperRecord,
+  CompleteRecord,
+  ListCompleteRecordParams,
+} from './type'
 export * from './type'
 
 const getUnfinishedHomework = async () => {
@@ -42,7 +48,7 @@ const submitExam = async (data: any) => {
 export { submitExam }
 
 // 作业记录列表
-const getListCompleteRecord = async (data: any) => {
+const getListCompleteRecord = async (data: ListCompleteRecordParams) => {
-  return get<HomeworkExam>(`/school/paper/userRecord/listCompleteRecord`, data)
+  return get<PageResponse<CompleteRecord>>(`/school/paper/userRecord/listCompleteRecord`, data)
 }
 export { getListCompleteRecord }

src/api/subject/homework/type.ts

@@ -253,6 +253,46 @@ export interface SubjectTitleVo {
   answerSqs: string | null
 }
 
+/** 批改状态：0-未批改 1-已批改 */
+export type GradingStatus = 0 | 1
+
+/** 来源类型：0-作业 1-错题本 2-举一反三 */
+export type CompleteRecordResourceType = 0 | 1 | 2
+
+/** 已完成答题记录 */
+export interface CompleteRecord {
+  id: number
+  userId: number
+  userName: string
+  schoolId: number
+  courseId: number
+  subjectId: number
+  subjectName: string
+  textBookId: number
+  paperId: number
+  paperName: string
+  publisherId: number
+  publisherName: string
+  resourceType: CompleteRecordResourceType
+  type: string
+  status: number
+  gradingStatus: GradingStatus
+  score: number
+  totalScore: number
+  costTime: number
+  createTime: string
+  endTime: string
+  submitTime: string
+}
+
+export interface ListCompleteRecordParams {
+  current: number
+  size: number
+  gradingStatus?: GradingStatus
+  subjectId?: number
+  resourceType?: CompleteRecordResourceType
+}
+
 /**
  * 开始考试类型
  */

src/page/system/homeWork/history/index.vue

@@ -1,21 +1,24 @@
 <script setup lang="ts">
 import dayjs from 'dayjs'
 import { rateType, XMessage } from '@/hooks'
-import homeWorkApi from '@/api/system/homeWork'
 import { useRouter, useRoute } from 'vue-router'
 import { userStore } from '@/stores'
 import { storeToRefs } from 'pinia'
-import { getListCompleteRecord } from '@/api/subject/homework'
+import {
+  getListCompleteRecord,
+  type CompleteRecord,
+  type GradingStatus,
+} from '@/api/subject/homework'
 import { getSubjectsByGrade } from '@/api/subject/config'
 
 const router = useRouter()
 const route = useRoute()
 
-const resourceType = computed(() => (route.query.resourceType as string) || '0')
+const resourceType = computed(() => Number(route.query.resourceType ?? 0) as 0 | 1 | 2)
-const titleMap: Record<string, string> = {
+const titleMap: Record<number, string> = {
-  '0': '作业记录',
+  0: '作业记录',
-  '1': '错题重练记录',
+  1: '错题本记录',
-  '2': '举一反三记录',
+  2: '举一反三记录',
 }
 const pageTitle = computed(() => titleMap[resourceType.value] || '作业记录')
 
@@ -44,11 +47,15 @@ const rateConfig = computed(() => {
 })
 
 // 筛选状态
-const activeStatus = ref('')
+const activeStatus = ref<GradingStatus | ''>('')
 function handleChangeStatus() {
   refreshJobList()
 }
 
+function isGraded(item: CompleteRecord) {
+  return item.gradingStatus === 1
+}
+
 // 作业科目列表
 // const classList = ref<any[]>([])
 // async function getClassList() {
@@ -86,35 +93,37 @@ function handleSelectClass(_item: any) {
 }
 
 // 作业列表
-const jobList = ref<any[]>([])
+const jobList = ref<CompleteRecord[]>([])
 const page = reactive({
-  pageSize: 4,
+  size: 4,
-  pageNum: 1,
+  current: 1,
-  total: -1,
+  total: 0,
+  totalPage: 0,
 })
 const listLoading = ref(false)
 async function getJobList() {
   const res = await getListCompleteRecord({
-    gradingStatus: activeStatus.value || undefined,
+    current: page.current,
+    size: page.size,
+    gradingStatus: activeStatus.value === '' ? undefined : activeStatus.value,
     subjectId: activeClass.value || undefined,
     resourceType: resourceType.value,
   })
-  if (res) {
+  jobList.value = res.rows
-    jobList.value = res
   page.total = res.totalRows
-  }
+  page.totalPage = res.totalPage
 }
 
 const pageError = ref(false)
 async function changePage(type: 0 | 1) {
   pageError.value = false
-  const { total, pageNum, pageSize } = page
+  const { total, current, size } = page
   if (type) {
-    if (pageNum * pageSize >= total) return
+    if (current * size >= total) return
-    page.pageNum++
+    page.current++
   } else {
-    if (pageNum <= 1) return
+    if (current <= 1) return
-    page.pageNum--
+    page.current--
   }
   try {
     listLoading.value = true
@@ -130,7 +139,7 @@ async function refreshJobList() {
   pageError.value = false
   listLoading.value = true
   jobList.value = []
-  page.pageNum = 1
+  page.current = 1
   try {
     await getJobList()
   } catch {
@@ -144,7 +153,7 @@ onActivated(async () => {
   pageLoading.value = true
   listLoading.value = true
   jobList.value = []
-  page.pageNum = 1
+  page.current = 1
   try {
     await initSubject()
     if (subjectData.value.length) {
@@ -158,9 +167,9 @@ onActivated(async () => {
   pageLoading.value = false
 })
 
-function toReports(item: any) {
+function toReports(item: CompleteRecord) {
-  if (resourceType.value === '1' || resourceType.value === '2') {
+  if (resourceType.value === 1 || resourceType.value === 2) {
-    const doWorkResourceType = resourceType.value === '1' ? '10' : '11'
+    const doWorkResourceType = resourceType.value === 1 ? '10' : '11'
     router.push({
       path: `/subject/doWork/${item.id}`,
       query: {
@@ -170,15 +179,13 @@ function toReports(item: any) {
     })
     return
   }
-  if (item.gradingStatus !== 1) {
+  if (!isGraded(item)) {
     XMessage.error('作业未批改，请耐心等待老师批改')
     return
   }
   router.push(`/system/homeWork/reports/${item.id}`)
 }
 
-// 是否到截止时间
-const isDeadline = computed(() => (time: string) => dayjs().isAfter(time))
 const activeSubjectName = computed(() => {
   return subjectData.value.find(i => i.id === activeClass.value)?.name || ''
 })
@@ -191,8 +198,8 @@ const activeSubjectName = computed(() => {
         v-model="activeStatus"
         :selectList="[
           { label: '全部', value: '' },
-          { label: '已批改', value: '1' },
+          { label: '已批改', value: 1 },
-          { label: '未批改', value: '0' },
+          { label: '未批改', value: 0 },
         ]"
         @selectChange="handleChangeStatus"
       ></Select>
@@ -219,15 +226,14 @@ const activeSubjectName = computed(() => {
                       i.createTime && `发布时间：${dayjs(i.createTime).format('YYYY/MM/DD HH:mm')}`
                     }}
                     &nbsp;&nbsp;
-                    {{
+                    {{ i.endTime && `截止时间：${dayjs(i.endTime).format('YYYY/MM/DD HH:mm')}` }}
-                      i.submitEndTime &&
-                      `截止时间：${dayjs(i.submitEndTime).format('YYYY/MM/DD HH:mm')}`
-                    }}
                     &nbsp;&nbsp;
-                    {{ i.markTime && `批改时间：${dayjs(i.markTime).format('YYYY/MM/DD HH:mm')}` }}
+                    {{
+                      i.submitTime && `提交时间：${dayjs(i.submitTime).format('YYYY/MM/DD HH:mm')}`
+                    }}
                   </div>
                   <div
-                    v-if="i.gradingStatus === 1"
+                    v-if="isGraded(i)"
                     class="list-item-rate"
                     :style="{ color: rateConfig((i.score / i.totalScore) * 100).color }"
                   >
@@ -237,55 +243,28 @@ const activeSubjectName = computed(() => {
                       width="196"
                       v-bind="rateConfig(i.score / i.totalScore)"
                     ></ProgressBar>
-                    <div class="reward-list">
-                      <div v-if="i.addDiamond" class="reward-list-item">
-                        <ItemPopover
-                          :data="{
-                            iconName: 'reward_diamond',
-                            rewardName: '钻石',
-                            personalCount: userInfo.diamond,
-                          }"
-                        >
-                          <Icon name="diamond_nobg" width="48" @click.stop="false"></Icon>
-                        </ItemPopover>
-                        <span class="text">+{{ i.addDiamond }}</span>
-                      </div>
-                      <div v-if="i.addExp" class="reward-list-item">
-                        <ItemPopover
-                          :data="{
-                            iconName: 'reward_exp',
-                            rewardName: '经验值',
-                            personalCount: userInfo.experience,
-                          }"
-                        >
-                          <Icon name="exp_nobg" width="48" @click.stop="false"></Icon>
-                        </ItemPopover>
-                        <span class="text">+{{ i.addExp }}</span>
-                      </div>
-                    </div>
                   </div>
                 </div>
                 <div
-                  :class="{ 'list-item-status': true, active: i.gradingStatus === 1 }"
+                  :class="{ 'list-item-status': true, active: isGraded(i) }"
                   :style="{
-                    'background-image':
+                    'background-image': isGraded(i)
-                      i.gradingStatus === 1
                       ? `url(${OSS_URL}/urm/homeWork/corrected.svg)`
                       : `url(${OSS_URL}/urm/homeWork/uncorrected.svg)`,
                   }"
                 >
-                  {{ i.gradingStatus === 1 ? '已批改' : '未批改' }}
+                  {{ isGraded(i) ? '已批改' : '未批改' }}
                 </div>
               </div>
             </div>
           </div>
           <div class="page">
-            <Btn v-if="page.pageNum > 1" width="162" height="80" tilt @click="changePage(0)">
+            <Btn v-if="page.current > 1" width="162" height="80" tilt @click="changePage(0)">
               上一页
             </Btn>
-            <div>{{ page.pageNum }}/{{ Math.ceil(page.total / page.pageSize) }}</div>
+            <div>{{ page.current }}/{{ page.totalPage || Math.ceil(page.total / page.size) }}</div>
             <Btn
-              v-if="page.pageNum * page.pageSize < page.total"
+              v-if="page.current * page.size < page.total"
               type="success"
               width="162"
               height="80"