From 5f5501dd0dd13060e1e1d0840625a61528863442 Mon Sep 17 00:00:00 2001
From: zpc <zpc1131@gamil.com>
Date: Tue, 24 Mar 2026 02:05:42 +0800
Subject: [PATCH] 21

---
 .../Services/AssessmentService.cs              |  1 +
 .../MiAssessment.Core/Services/OrderService.cs |  4 ++++
 uniapp/pages/assessment/history/index.vue      | 18 +++++++++++++++---
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/server/MiAssessment/src/MiAssessment.Core/Services/AssessmentService.cs b/server/MiAssessment/src/MiAssessment.Core/Services/AssessmentService.cs
index 4fc1099..96f90a7 100644
--- a/server/MiAssessment/src/MiAssessment.Core/Services/AssessmentService.cs
+++ b/server/MiAssessment/src/MiAssessment.Core/Services/AssessmentService.cs
@@ -654,6 +654,7 @@ public class AssessmentService : IAssessmentService
             3 => "生成中",
             4 => "已完成",
             5 => "生成失败",
+            6 => "报告生成中",
             _ => "未知"
         };
     }
diff --git a/server/MiAssessment/src/MiAssessment.Core/Services/OrderService.cs b/server/MiAssessment/src/MiAssessment.Core/Services/OrderService.cs
index 92ffa67..b99f966 100644
--- a/server/MiAssessment/src/MiAssessment.Core/Services/OrderService.cs
+++ b/server/MiAssessment/src/MiAssessment.Core/Services/OrderService.cs
@@ -735,6 +735,8 @@ public class OrderService : IOrderService
                 2 => "测评中",
                 3 => "测评生成中",
                 4 => "已测评",
+                5 => "生成失败",
+                6 => "报告生成中",
                 _ => GetOrderStatusText(orderStatus)
             };
         }
@@ -755,6 +757,8 @@ public class OrderService : IOrderService
             2 => "测评中",
             3 => "生成中",
             4 => "已完成",
+            5 => "生成失败",
+            6 => "报告生成中",
             _ => "未知"
         };
     }
diff --git a/uniapp/pages/assessment/history/index.vue b/uniapp/pages/assessment/history/index.vue
index fdd8fdf..c252b56 100644
--- a/uniapp/pages/assessment/history/index.vue
+++ b/uniapp/pages/assessment/history/index.vue
@@ -19,7 +19,9 @@ const ASSESSMENT_STATUS = {
   PENDING: 1,      // 待测评
   TESTING: 2,      // 测评中
   GENERATING: 3,   // 生成中
-  COMPLETED: 4     // 已完成
+  COMPLETED: 4,    // 已完成
+  FAILED: 5,       // 生成失败
+  DATA_READY: 6    // 数据已就绪（PDF生成中）
 }
 
 // 状态
@@ -42,7 +44,9 @@ function getStatusClass(status) {
     [ASSESSMENT_STATUS.PENDING]: 'status-pending',
     [ASSESSMENT_STATUS.TESTING]: 'status-testing',
     [ASSESSMENT_STATUS.GENERATING]: 'status-generating',
-    [ASSESSMENT_STATUS.COMPLETED]: 'status-completed'
+    [ASSESSMENT_STATUS.COMPLETED]: 'status-completed',
+    [ASSESSMENT_STATUS.FAILED]: 'status-failed',
+    [ASSESSMENT_STATUS.DATA_READY]: 'status-generating'
   }
   return classMap[status] || ''
 }
@@ -127,6 +131,14 @@ function viewResult(record) {
     return
   }
   
+  // 数据已就绪（PDF生成中）- 可查看网页报告
+  if (record.status === ASSESSMENT_STATUS.DATA_READY) {
+    uni.navigateTo({
+      url: `/pages/assessment/result/index?recordId=${record.id}`
+    })
+    return
+  }
+
   // 生成中 - 提示等待
   if (record.status === ASSESSMENT_STATUS.GENERATING) {
     uni.showToast({
@@ -197,7 +209,7 @@ onMounted(() => {
         </view>
         
         <!-- 卡片底部：已完成显示查看报告 -->
-        <view class="card-footer" v-if="record.status === ASSESSMENT_STATUS.COMPLETED">
+        <view class="card-footer" v-if="record.status === ASSESSMENT_STATUS.COMPLETED || record.status === ASSESSMENT_STATUS.DATA_READY">
           <view class="view-btn">
             <text>查看报告</text>
             <view class="arrow-icon"></view>