From 7089fe521fa0ec066915efe290ee8e7893ec9e05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=93=B2=E9=93=9C?=
 <9490856+zhangzhetong@user.noreply.gitee.com>
Date: Sun, 12 Oct 2025 22:16:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=80=E4=BA=9B=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../student/AverageComparisonChart.vue        |   2 +-
 .../student/ScoreDistributionChart.vue        |   8 +-
 src/pages/index/score-list.vue                | 251 +++++++-----------
 src/pages/index/score.vue                     |   2 +-
 src/pages/student/detail.vue                  |  49 ++--
 src/service/types.ts                          |  11 +
 6 files changed, 141 insertions(+), 182 deletions(-)

diff --git a/src/components/student/AverageComparisonChart.vue b/src/components/student/AverageComparisonChart.vue
index 45df985..40d32b5 100644
--- a/src/components/student/AverageComparisonChart.vue
+++ b/src/components/student/AverageComparisonChart.vue
@@ -214,7 +214,7 @@ function cancelTopN() {
         <view class="mb-6 flex justify-center p-4">
           <wd-input-number v-model="tempTopN" :min="1" :max="200" :step="1" />
         </view>
-        <view class="flex gap-3">
+        <view class="flex justify-center gap-3">
           <wd-button block type="default" @click="cancelTopN">
             取消
           </wd-button>
diff --git a/src/components/student/ScoreDistributionChart.vue b/src/components/student/ScoreDistributionChart.vue
index d92ba0d..c77211b 100644
--- a/src/components/student/ScoreDistributionChart.vue
+++ b/src/components/student/ScoreDistributionChart.vue
@@ -134,7 +134,7 @@ const scoreRangeInfo = computed(() => {
 
   const allScore = props.data.all_score
   const item = props.data.data.find((d) => {
-    const [min, max] = (d.score_scope || '').split('~').map(Number)
+    const [min, max] = (d.score_scope || '').split('-').map(Number)
     return allScore >= min && allScore <= max
   })
 
@@ -142,7 +142,7 @@ const scoreRangeInfo = computed(() => {
     return null
 
   return {
-    range: item.score_scope,
+    range: item.score_scope.split('-').join('~'),
     gradeCount: item.student_num || 0,
     classCount: 0, // TODO: 接口暂无此数据
   }
@@ -170,13 +170,13 @@ const scoreRangeInfo = computed(() => {
       <view class="flex items-center gap-2">
         <view class="h-1 w-1 rounded-full bg-blue-500" />
         <text class="text-sm text-slate-700">
-          本人所在分数段：<text class="text-blue-600 font-semibold">{{ scoreRangeInfo.range }}</text>
+          本人所在分数段: <text class="text-blue-600 font-semibold">{{ scoreRangeInfo.range }}</text>
         </text>
       </view>
       <view class="mt-2 flex items-center gap-2">
         <view class="h-1 w-1 rounded-full bg-blue-500" />
         <text class="text-sm text-slate-700">
-          本分数段年级学生数：<text class="text-blue-600 font-semibold">{{ scoreRangeInfo.gradeCount }}</text>人，其中本班占<text class="text-blue-600 font-semibold">{{ scoreRangeInfo.classCount }}</text>人
+          本分数段年级学生数: <text class="text-blue-600 font-semibold">{{ scoreRangeInfo.gradeCount }}</text>人，其中本班占<text class="text-blue-600 font-semibold">{{ scoreRangeInfo.classCount }}</text>人
         </text>
       </view>
     </view>
diff --git a/src/pages/index/score-list.vue b/src/pages/index/score-list.vue
index b2f08c1..4d5409b 100644
--- a/src/pages/index/score-list.vue
+++ b/src/pages/index/score-list.vue
@@ -8,11 +8,8 @@
 </route>
 
 <script lang="ts" setup>
-import type {
-  GetScoreSheetResponse,
-  ScoreSheetInfo,
-} from '@/service/types'
-import { computed, onMounted, ref } from 'vue'
+import type { ScoreSheetInfo } from '@/service/types'
+import { computed, ref } from 'vue'
 import { teacherAnalysisScoreSheetUsingPost } from '@/service/laoshichengjifenxi'
 import { useHomeStore } from '@/store/home'
 
@@ -20,22 +17,14 @@ defineOptions({
   name: 'ScoreListPage',
 })
 
-// 成绩单数据扩展类型
-interface ScoreSheetItemExtended extends ScoreSheetInfo {
-  subjectScores: Record<number, number> // 各科成绩映射
-}
-
 // 使用store
 const homeStore = useHomeStore()
 
-// 页面参数
-const currentPage = ref(1)
-const pageSize = ref(20)
-const total = ref(0)
-const loading = ref(false)
+// z-paging 引用
+const pagingRef = ref<ZPagingRef>()
 
 // 成绩单数据
-const scoreList = ref<ScoreSheetItemExtended[]>([])
+const scoreList = ref<ScoreSheetInfo[]>([])
 
 // 班级选项
 const classOptions = computed(() => homeStore.classOptions)
@@ -55,182 +44,144 @@ function goBack() {
 function handleClassChange(event: { value: string | number, selectedItem: Record<string, any> }) {
   selectedClassId.value = Number(event.value)
   homeStore.selectedClassId = selectedClassId.value
-  // 重新获取数据
-  currentPage.value = 1
-  fetchScoreList()
+  // 重新加载数据
+  pagingRef.value?.reload()
 }
 
-// 分页变化处理
-function handlePageChange(page: number) {
-  currentPage.value = page
-  fetchScoreList()
-}
-
-// 获取成绩单数据
-async function fetchScoreList() {
-  if (!selectedClassId.value || !homeStore.selectedExamId || !homeStore.selectedGradeKey) {
+// 查询成绩单数据
+async function queryScoreList(pageNo: number, pageSize: number) {
+  if (!homeStore.selectedClassId || !homeStore.selectedExamId || !homeStore.selectedGradeKey) {
+    pagingRef.value?.complete([])
     return
   }
 
   try {
-    loading.value = true
     const response = await teacherAnalysisScoreSheetUsingPost({
       body: {
-        class_key: selectedClassId.value,
+        class_key: homeStore.selectedClassId,
         exam_id: homeStore.selectedExamId,
         grade_key: homeStore.selectedGradeKey,
-        page: currentPage.value,
-        page_size: pageSize.value,
+        page: pageNo,
+        page_size: pageSize,
       },
     })
 
-    if (response) {
-      const responseData = response as GetScoreSheetResponse
-      total.value = responseData.total || 0
-      // 处理成绩数据，添加各科成绩映射
-      scoreList.value = (responseData.list || []).map(item => ({
-        ...item,
-        subjectScores: {}, // TODO: 根据实际API返回的数据结构来填充各科成绩
-      }))
-    }
+    pagingRef.value?.complete(response?.list || [])
   }
   catch (error) {
     console.error('获取成绩单数据失败:', error)
-    uni.showToast({
-      title: '获取数据失败',
-      icon: 'none',
-    })
-  }
-  finally {
-    loading.value = false
+    pagingRef.value?.complete(false)
   }
 }
 
+// 获取学生的某科成绩
+function getSubjectScore(student: ScoreSheetInfo, subjectId: number) {
+  const subjectScore = student.single_subject_score_list?.find(
+    item => item.subject_id === subjectId,
+  )
+  return subjectScore?.subject_score ?? '--'
+}
+
 // 跳转到学生成绩报告
-function viewStudentReport(student: ScoreSheetItemExtended) {
+function viewStudentReport(student: ScoreSheetInfo) {
   uni.navigateTo({
     url: `/pages/student/detail?student_number=${student.student_exam_number}&student_name=${student.student_name}`,
   })
 }
 
 // 跳转到科目答题卡
-function viewSubjectAnswerSheet(student: ScoreSheetItemExtended, subjectId: number = 0) {
+function viewSubjectAnswerSheet(student: ScoreSheetInfo, subjectId: number) {
   uni.showToast({
     title: '功能开发中',
     icon: 'none',
   })
 }
-
-// 页面初始化
-onMounted(async () => {
-  try {
-    // 如果store中没有数据，先获取选项数据
-    if (homeStore.classOptions.length === 0) {
-      await homeStore.fetchOptions()
-    }
-
-    // 获取成绩单数据
-    if (homeStore.selectedClassId && homeStore.selectedExamId) {
-      selectedClassId.value = homeStore.selectedClassId
-      await fetchScoreList()
-    }
-  }
-  catch (error) {
-    console.error('初始化数据失败:', error)
-  }
-})
 </script>
 
 <template>
   <view class="score-list-page min-h-screen bg-slate-50">
-    <!-- 导航栏 -->
-    <wd-navbar placeholder fixed right-text="成绩单">
-      <template #left>
-        <div class="flex items-center" @tap="goBack">
-          <wd-icon name="arrow-left" size="20px" />
-        </div>
+    <!-- 主要内容区域 - z-paging 包裹 -->
+    <z-paging
+      ref="pagingRef"
+      v-model="scoreList"
+      :refresher-enabled="true"
+      :auto="true"
+      :default-page-size="20"
+      @query="queryScoreList"
+    >
+      <template #top>
+        <!-- 导航栏 -->
+        <wd-navbar placeholder fixed right-text="成绩单">
+          <template #left>
+            <div class="flex items-center" @tap="goBack">
+              <wd-icon name="arrow-left" size="20px" />
+            </div>
+          </template>
+          <template #title>
+            <wd-drop-menu>
+              <wd-drop-menu-item
+                v-model="selectedClassId"
+                :options="classOptions"
+                @change="handleClassChange"
+              />
+            </wd-drop-menu>
+          </template>
+        </wd-navbar>
       </template>
-      <template #title>
-        <wd-drop-menu>
-          <wd-drop-menu-item
-            v-model="selectedClassId"
-            :options="classOptions"
-            @change="handleClassChange"
-          />
-        </wd-drop-menu>
-      </template>
-    </wd-navbar>
 
-    <!-- 主要内容区域 -->
-    <view class="p-4">
       <!-- 成绩单表格 -->
-      <wd-table :data="scoreList" :height="600" :loading="loading">
-        <!-- 学生姓名列 -->
-        <wd-table-col prop="student_name" label="考生姓名" :width="`${20}%`" fixed>
-          <template #value="{ row }">
-            <text class="cursor-pointer text-blue-500" @tap="viewStudentReport(row)">
-              {{ row.student_name }}
-            </text>
-          </template>
-        </wd-table-col>
+      <view class="p-4">
+        <wd-table :data="scoreList" :height="600">
+          <!-- 学生姓名列 -->
+          <wd-table-col prop="student_name" label="考生姓名" :width="`${20}%`" fixed>
+            <template #value="{ row }">
+              <text class="cursor-pointer text-blue-500" @tap="viewStudentReport(row)">
+                {{ row.student_name }}
+              </text>
+            </template>
+          </wd-table-col>
 
-        <!-- 总分列 -->
-        <wd-table-col prop="all_score" label="总分" :width="`${20}%`">
-          <template #value="{ row }">
-            <text class="cursor-pointer text-blue-500" @tap="viewStudentReport(row)">
-              {{ row.all_score || '--' }}
-            </text>
-          </template>
-        </wd-table-col>
+          <!-- 总分列 -->
+          <wd-table-col prop="all_score" label="总分" :width="`${20}%`">
+            <template #value="{ row }">
+              <text class="cursor-pointer text-blue-500" @tap="viewStudentReport(row)">
+                {{ row.all_score || '--' }}
+              </text>
+            </template>
+          </wd-table-col>
 
-        <!-- 班次/校次列 -->
-        <wd-table-col prop="rank" label="班次/校次" :width="`${40}%`">
-          <template #value="{ row }">
-            <view class="flex gap-2 text-xs">
-              <view>{{ row.class_rank || '--' }}</view>
-              /
-              <view class="text-gray-500">
-                {{ row.grade_rank || '--' }}
+          <!-- 班次/校次列 -->
+          <wd-table-col prop="rank" label="班次/校次" :width="`${40}%`">
+            <template #value="{ row }">
+              <view class="flex gap-2 text-xs">
+                <view>{{ row.class_rank || '--' }}</view>
+                /
+                <view class="text-gray-500">
+                  {{ row.grade_rank || '--' }}
+                </view>
               </view>
-            </view>
-          </template>
-        </wd-table-col>
+            </template>
+          </wd-table-col>
 
-        <!-- 动态生成科目列 -->
-        <wd-table-col
-          v-for="subject in subjectOptions"
-          :key="subject.value"
-          :prop="`subject_${subject.value}`"
-          :label="subject.label"
-          :width="`${20}%`"
-        >
-          <template #value="{ row }">
-            <text
-              class="cursor-pointer text-blue-500"
-              @tap="viewSubjectAnswerSheet(row, subject.value)"
-            >
-              {{ row.subjectScores[subject.value] || '--' }}
-            </text>
-          </template>
-        </wd-table-col>
-      </wd-table>
-
-      <!-- 分页组件 -->
-      <view v-if="total > 0" class="mt-4 flex justify-center">
-        <wd-pagination
-          v-model="currentPage"
-          :total="total"
-          :page-size="pageSize"
-          show-icon
-          show-message
-          @change="handlePageChange"
-        />
+          <!-- 动态生成科目列 -->
+          <wd-table-col
+            v-for="subject in subjectOptions"
+            :key="subject.value"
+            :prop="`subject_${subject.value}`"
+            :label="subject.label"
+            :width="`${20}%`"
+          >
+            <template #value="{ row }">
+              <text
+                class="cursor-pointer text-blue-500"
+                @tap="viewSubjectAnswerSheet(row, subject.value)"
+              >
+                {{ getSubjectScore(row, subject.subjectId) }}
+              </text>
+            </template>
+          </wd-table-col>
+        </wd-table>
       </view>
-
-      <!-- 空状态 -->
-      <view v-if="!loading && scoreList.length === 0" class="py-8 text-center text-gray-500">
-        暂无成绩数据
-      </view>
-    </view>
+    </z-paging>
   </view>
 </template>
diff --git a/src/pages/index/score.vue b/src/pages/index/score.vue
index 60f7605..b076ef7 100644
--- a/src/pages/index/score.vue
+++ b/src/pages/index/score.vue
@@ -377,7 +377,7 @@ whenever(() => [selectedSubjectId.value, homeStore.selectedExamId, keyStudentTyp
     <z-paging
       ref="keyStudentsPaging"
       v-model="keyStudentsList"
-      :default-page-size="keyStudentCount"
+      :default-page-size="keyStudentCount || 5"
       :refresher-enabled="true"
       :auto="true"
       @query="fetchKeyStudentsPaging"
diff --git a/src/pages/student/detail.vue b/src/pages/student/detail.vue
index f08483c..900a291 100644
--- a/src/pages/student/detail.vue
+++ b/src/pages/student/detail.vue
@@ -144,6 +144,21 @@ onMounted(async () => {
       </template>
     </wd-navbar>
 
+    <!-- 科目选择标签栏 -->
+    <wd-tabs
+      v-model="activeTab"
+      sticky
+      class="bg-white shadow-sm"
+      @click="handleTabClick"
+    >
+      <wd-tab
+        v-for="tab in subjectTabs"
+        :key="tab.name"
+        :name="tab.name"
+        :title="tab.title"
+      />
+    </wd-tabs>
+
     <!-- 加载状态 -->
     <view v-if="isLoading" class="h-screen flex items-center justify-center">
       <wd-loading size="32" />
@@ -151,36 +166,18 @@ onMounted(async () => {
 
     <!-- 内容区域 -->
     <view v-else-if="studentInfo" class="pb-4">
-      <!-- 科目选择标签栏 -->
-      <wd-tabs
-        v-model="activeTab"
-        sticky
-        class="bg-white shadow-sm"
-        @click="handleTabClick"
-      >
-        <wd-tab
-          v-for="tab in subjectTabs"
-          :key="tab.name"
-          :name="tab.name"
-          :title="tab.title"
-        />
-      </wd-tabs>
-
       <!-- 主要内容区域 -->
       <view class="p-4 space-y-4">
         <!-- 个人成绩卡片 -->
-        <view class="rounded-2xl from-blue-500 to-blue-600 bg-gradient-to-br p-5 shadow-lg">
+        <view class="relative rounded-2xl from-blue-500 to-blue-600 bg-gradient-to-br p-5 shadow-lg">
+          <view class="absolute left-0 top-4 rounded-r-full bg-white/40 px-4 backdrop-blur">
+            <text class="text-lg text-white">{{ studentName }}</text>
+          </view>
           <!-- 总分展示 -->
-          <view class="mb-4 flex items-end justify-between">
-            <view>
-              <text class="text-sm text-blue-100">总分</text>
-              <view class="mt-1 flex items-baseline gap-1">
-                <text class="text-4xl text-white font-bold">{{ studentInfo.totalScore }}</text>
-                <text class="text-lg text-blue-100">/{{ studentInfo.fullScore }}</text>
-              </view>
-            </view>
-            <view class="rounded-full bg-white/20 px-4 py-2 backdrop-blur">
-              <text class="text-sm text-white">学号: {{ studentNumber }}</text>
+          <view class="mb-4 flex items-center justify-end gap-4">
+            <view class="mt-1 flex items-baseline gap-1">
+              <text class="text-4xl text-white font-bold">{{ studentInfo.totalScore }}</text>
+              <text class="text-lg text-blue-100">/{{ studentInfo.fullScore }}</text>
             </view>
           </view>
 
diff --git a/src/service/types.ts b/src/service/types.ts
index 5d871b0..dd5c7bb 100644
--- a/src/service/types.ts
+++ b/src/service/types.ts
@@ -2610,6 +2610,8 @@ export type ScoreSheetInfo = {
   student_name?: string;
   /** 学生学号 */
   student_number?: string;
+  /** 单科成绩 */
+  single_subject_score_list?: SingleSubjectScore[];
 };
 
 export type ScoreTrendItem = {
@@ -2655,6 +2657,15 @@ export type SetProblemRecordResponse = {
   record_id?: number;
 };
 
+export type SingleSubjectScore = {
+  /** 科目ID */
+  subject_id?: number;
+  /** 科目名称 */
+  subject_name?: string;
+  /** 单科成绩 */
+  subject_score?: number;
+};
+
 export enum Statistics_modeEnum {
   'segmented' = 'segmented',
   'cumulative' = 'cumulative',