From 0ba25e3492c380c0bd9478e45026875b4343e331 Mon Sep 17 00:00:00 2001
From: tangweijie <877588133@qq.com>
Date: Tue, 27 Jan 2026 11:57:32 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"fix(dashboard):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=89=A9=E4=BD=99=E5=88=91=E6=9C=9F=E5=A4=A9=E6=95=B0=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E9=80=BB=E8=BE=91=E4=B8=8D=E4=B8=80=E8=87=B4=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ae0493428efbb553fa9573cd632187bf2d013a0b.
---
 src/api/prison/dashboard/index.ts | 1 -
 src/views/Dashboard/Index.vue     | 8 +++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/api/prison/dashboard/index.ts b/src/api/prison/dashboard/index.ts
index 08768d15..1ec6c9bf 100644
--- a/src/api/prison/dashboard/index.ts
+++ b/src/api/prison/dashboard/index.ts
@@ -217,7 +217,6 @@ export interface PrisonerDashboardStatsRespVO {
   imprisonmentDate: string // 入狱时间
   releaseDate: string // 出狱时间
   servedDays: number // 已服刑天数
-  remainingDays: number // 剩余刑期天数
   age: number // 年龄
   nativePlace: string // 籍贯
   education: string // 文化程度
diff --git a/src/views/Dashboard/Index.vue b/src/views/Dashboard/Index.vue
index 876a759b..f9f8eaed 100644
--- a/src/views/Dashboard/Index.vue
+++ b/src/views/Dashboard/Index.vue
@@ -285,7 +285,13 @@ const loadData = async (prisonerId: number) => {
     // 计算累计服刑天数和剩余刑期天数
     const servedDaysValue = res.servedDays || 0;
     servedDays.value = servedDaysValue
-    remainingDays.value = res.remainingDays || 0;
+    remainingDays.value = 0;
+    if (res.imprisonmentDate && res.releaseDate) {
+      const startDate = new Date(res.imprisonmentDate);
+      const endDate = new Date(res.releaseDate);
+      const totalDays = Math.floor((endDate.getTime() - startDate.getTime()) / (1000 * 60 * 60 * 24));
+      remainingDays.value = Math.max(0, totalDays - servedDaysValue);
+    }
 
     // 获取计分考核数据 - 累计扣分次数和累计加分次数
     let totalPenaltyCount = 0;