diff --git a/server/MiAssessment/src/MiAssessment.Admin.Business/Services/AssessmentRecordService.cs b/server/MiAssessment/src/MiAssessment.Admin.Business/Services/AssessmentRecordService.cs index 1865ccc..f7240ff 100644 --- a/server/MiAssessment/src/MiAssessment.Admin.Business/Services/AssessmentRecordService.cs +++ b/server/MiAssessment/src/MiAssessment.Admin.Business/Services/AssessmentRecordService.cs @@ -34,7 +34,8 @@ public class AssessmentRecordService : IAssessmentRecordService { 3, "生成中" }, { 4, "已完成" }, { 5, "生成失败" }, - { 6, "数据已就绪" } + { 6, "数据已就绪" }, + { 7, "需重测" } }; /// diff --git a/server/MiAssessment/src/MiAssessment.Admin/admin-web/src/views/business/assessment/record/index.vue b/server/MiAssessment/src/MiAssessment.Admin/admin-web/src/views/business/assessment/record/index.vue index 0443cef..353dcfc 100644 --- a/server/MiAssessment/src/MiAssessment.Admin/admin-web/src/views/business/assessment/record/index.vue +++ b/server/MiAssessment/src/MiAssessment.Admin/admin-web/src/views/business/assessment/record/index.vue @@ -106,10 +106,14 @@ + + + - diff --git a/uniapp/pages/assessment/questions/index.vue b/uniapp/pages/assessment/questions/index.vue index d662fe7..e3614b8 100644 --- a/uniapp/pages/assessment/questions/index.vue +++ b/uniapp/pages/assessment/questions/index.vue @@ -198,7 +198,7 @@ async function handleSubmit() { if (res && res.code === 0) { const resRecordId = res.data?.recordId || res.data?.id || recordId.value - uni.redirectTo({ url: `/pages/assessment/loading/index?recordId=${resRecordId}` }) + uni.redirectTo({ url: `/pages/assessment/loading/index?recordId=${resRecordId}&typeId=${typeId.value}` }) } else { uni.showToast({ title: res?.message || '提交失败,请重试', icon: 'none' }) } diff --git a/uniapp/pages/order/list/index.vue b/uniapp/pages/order/list/index.vue index 3f16ba0..0c2682d 100644 --- a/uniapp/pages/order/list/index.vue +++ b/uniapp/pages/order/list/index.vue @@ -58,7 +58,7 @@ function getDisplayStatus(order) { // 已支付/已完成的订单,根据测评记录状态显示 if (assessmentStatus) { - const map = { 1: '待测评', 2: '测评中', 3: '测评生成中', 4: '已测评' } + const map = { 1: '待测评', 2: '测评中', 3: '测评生成中', 4: '已测评', 7: '待测评' } return map[assessmentStatus] || order.statusText || '已支付' }