From d73050a7556751d8c22cb15aaa4651a4bb587b82 Mon Sep 17 00:00:00 2001
From: ywyonui <ywyonui@163.com>
Date: Thu, 21 Aug 2025 09:27:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=88=90=E7=BB=A9=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/base/grades/detail.vue | 72 ++++++++++++++------------------
 1 file changed, 32 insertions(+), 40 deletions(-)

diff --git a/src/pages/base/grades/detail.vue b/src/pages/base/grades/detail.vue
index 8cae99a..d257b03 100644
--- a/src/pages/base/grades/detail.vue
+++ b/src/pages/base/grades/detail.vue
@@ -61,7 +61,7 @@
             >
               <view class="subject-header">
                 <text class="subject-name">{{ kscj.km.kmmc }}</text>
-                <text v-if="showFsFlag && kscj.dj">（分数{{ kscj.ksfs }}）</text>
+                <text v-if="kscc.sfXsFs && kscj.dj">（分数{{ kscj.ksfs }}）</text>
               </view>
               <view class="subject-body">
                 <text class="subject-grade">{{ kscj.dj }}</text>
@@ -72,20 +72,24 @@
         </view>
 
         <!-- 分数趋势视图 -->
-        <view class="trend-view" v-if="activeTab === 'trend'">
-          <!-- 选项卡 -->
-          <BasicTabs 
-            ref="tabsRef" :list="xqKmmcList" bar-width="60px" scroll-count="4"
-           :current="curKmIndex" @change="switchKm"
-          />
-          <view class="radar-placeholder" id="chart-container1">
-            <canvas
-              style="width: 100%; height: 100%"
-              canvas-id="trendCanvas"
-              id="trendCanvas"
-              class="charts"
+        <view class="trend-view flex-1 po-re" v-if="activeTab === 'trend'">
+          <view class="tab-placeholder">
+            <!-- 选项卡 -->
+            <BasicTabs 
+              ref="tabsRef" :list="xqKmmcList" bar-width="60px" scroll-count="4"
+            :current="curKmIndex" @change="switchKm"
             />
           </view>
+          <view style="flex: 1 0 1px; overflow: auto">
+            <view class="radar-placeholder" id="chart-container1">
+              <canvas
+                style="width: 100%; height: 100%"
+                canvas-id="trendCanvas"
+                id="trendCanvas"
+                class="charts"
+              />
+            </view>
+          </view>
         </view>
 
         <!-- 学科诊断视图 -->
@@ -101,7 +105,7 @@
             </view>
 
             <!-- 诊断评语 -->
-            <view class="diagnosis-comment">
+            <!-- <view class="diagnosis-comment">
               <text class="comment-title">尊敬的家长，您好</text>
               <text class="comment-text"
                 >向您祝贺，朱信权同学本次考试成绩位于较优秀之列！</text
@@ -109,7 +113,7 @@
               <text class="comment-text"
                 >这次考试中道德与法治学科表现最优秀，继续保持学科优势！相对来说英语学科表现最弱，不过也有27道题的答题表现超出同层次的平均。</text
               >
-            </view>
+            </view> -->
           </view>
         </view>
       </view>
@@ -158,7 +162,7 @@
 import { ref, onMounted, watch, nextTick } from "vue";
 import uCharts from "@/components/charts/u-charts.js";
 import dayjs from "dayjs";
-import { xsKscjApi, getJzdShowFs } from "@/api/base/server";
+import { xsKscjApi } from "@/api/base/server";
 import { useUserStore } from "@/store/modules/user";
 import { useDataStore } from "@/store/modules/data";
 const { getCurXs } = useUserStore();
@@ -180,8 +184,6 @@ const curKm = ref<any>({})
 const curKmIndex = ref<number>(0)
 const xqKmmcList = ref<string[]>([])
 
-const showFsFlag = ref(false);
-
 // 当前选中的选项卡
 const activeTab = ref("scores");
 
@@ -194,11 +196,11 @@ type ColorMapType = {
   [key: string]: string;
 };
 const colorMap: ColorMapType = {
-  "A": "#FF6B6B",
-  "B": "#4D96FF",
-  "C": "#6BCB77",
-  "D": "#FFD93D",
-  "E": "#B8B8B8",
+  "A": "#FFD700",  // 优秀 - 金黄色
+  "B": "#00FF00",  // 良好 - 亮绿色
+  "C": "#FF8C00",  // 中等 - 橙色
+  "D": "#666666",  // 及格 - 灰色
+  "E": "#FF0000",  // 不及格 - 红色
 };
 
 // 雷达图数据
@@ -340,7 +342,7 @@ const drawTrendChart = () => {
             animation: true,
             background: "#FFFFFF",
             padding: [15, 15, 0, 15],
-            dataLabel: showFsFlag.value, // 是否显示分数
+            dataLabel: kscc.value.sfXsFs, // 是否显示分数
             dataPointShape: true,
             enableScroll: false,
             legend: {
@@ -472,6 +474,7 @@ const rebuildData = () => {
     totalFs = totalFs / ksccKmList.value.length;
   }
   curKsdj.value = djList.value.find((item: any) => item.zdf <= totalFs && item.zgf >= totalFs) || {};
+  console.log("考试场次等级", curKsdj.value);
   // 构建趋势图所需的成绩列表信息
   buildXqKmKscjList();
 }
@@ -491,13 +494,10 @@ onMounted(async () => {
     djList.value = res.result.djList;
     ksccKscjList.value = res.result.ksccKscjList;
     xqKscjList.value = res.result.xqKscjList;
-    showFsFlag.value = res.result.showFs;
     // 初始化考试等级
     initKsdj();
     // 重构显示数据
     rebuildData();
-  } else {
-    showFsFlag.value = false;
   }
   // 默认绘制学科成绩视图
   // 延迟执行确保DOM已经渲染
@@ -759,20 +759,12 @@ function hideGradeInfo() {
   .trend-view {
     padding: 15px;
     height: 100%;
-
-    .chart-placeholder {
-      height: 300px;
-      background-color: #f8f8f8;
-      border-radius: 8px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-
-      .placeholder-text {
-        color: #909399;
-        font-size: 16px;
-      }
+    display: flex;
+    flex-direction: column;
+    .tab-placeholder {
+      
     }
+
     .km-info {
       margin-bottom: 10px;
       display: flex;