@@ -163,7 +183,6 @@ const FILTER_OPTIONS: { key: string; label: string }[] = [
{ key: 'product_design', label: '产品设计' },
{ key: 'ui_design', label: 'UI设计' },
{ key: 'dev', label: '开发' },
- { key: 'integration', label: '联调' },
{ key: 'testing', label: '测试' },
{ key: 'released', label: '已发布' },
{ key: 'planned', label: '规划中' },
@@ -177,11 +196,17 @@ export default function ProjectDetailPage() {
const { overview, fetchOverview } = useProductStore();
const { requirements, fetchRequirements } = useRequirementStore();
const { records, fetchRecords } = useOvertimeStore();
+ const { plans, fetchPlans } = useVersionPlanStore();
+ const { tasks: devTasks, fetchTasks: fetchDevTasks } = useDevTaskStore();
+ const { testCases, fetchTestCases } = useTestCaseStore();
const [statusFilter, setStatusFilter] = useState
('all');
useEffect(() => { fetchOverview(); }, [fetchOverview]);
useEffect(() => { fetchRequirements(); }, [fetchRequirements]);
useEffect(() => { fetchRecords(); }, [fetchRecords]);
+ useEffect(() => { fetchPlans(); }, [fetchPlans]);
+ useEffect(() => { fetchDevTasks(); }, [fetchDevTasks]);
+ useEffect(() => { fetchTestCases(); }, [fetchTestCases]);
const project = useMemo(() => getProjectDetail(overview, projectId), [overview, projectId]);
@@ -200,12 +225,89 @@ export default function ProjectDetailPage() {
return list.sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime());
}, [project, statusFilter]);
+ // Compute actual overall progress per version
+ const versionProgressMap = useMemo(() => {
+ if (!project) return {} as Record;
+ const map: Record = {};
+ for (const v of project.versions) {
+ const vPlans = plans.filter((p) => p.versionId === v.id);
+ const vReqs = requirements.filter((r) => r.versionId === v.id);
+ const vReqIds = new Set(vReqs.map((r) => r.id));
+ const vDevTasks = devTasks.filter((t) => vReqIds.has(t.requirementId));
+ const vTestCases = testCases.filter((c) => c.versionId === v.id);
+
+ const segments: number[] = [];
+
+ const researchPlans = vPlans.filter((p) => p.type === 'research');
+ if (researchPlans.length > 0) {
+ const totals = researchPlans.reduce((acc, p) => {
+ const tasks = p.tasks || [];
+ acc.total += tasks.length;
+ acc.done += tasks.filter((t) => t.status === 'completed').length;
+ return acc;
+ }, { total: 0, done: 0 });
+ segments.push(totals.total > 0 ? (totals.done / totals.total) * 100 : 0);
+ }
+
+ const productPlans = vPlans.filter((p) => p.type === 'product');
+ if (productPlans.length > 0) {
+ const totals = productPlans.reduce((acc, p) => {
+ const linked = p.linkedRequirementIds || [];
+ const completed = p.completedRequirementIds || [];
+ acc.total += linked.length;
+ acc.done += completed.filter((id) => linked.includes(id)).length;
+ return acc;
+ }, { total: 0, done: 0 });
+ segments.push(totals.total > 0 ? (totals.done / totals.total) * 100 : 0);
+ }
+
+ const uiPlans = vPlans.filter((p) => p.type === 'ui');
+ if (uiPlans.length > 0) {
+ const totals = uiPlans.reduce((acc, p) => {
+ const linked = p.linkedRequirementIds || [];
+ const completed = p.completedRequirementIds || [];
+ acc.total += linked.length;
+ acc.done += completed.filter((id) => linked.includes(id)).length;
+ return acc;
+ }, { total: 0, done: 0 });
+ segments.push(totals.total > 0 ? (totals.done / totals.total) * 100 : 0);
+ }
+
+ if (vDevTasks.length > 0) {
+ const totalEstimate = vDevTasks.reduce((sum, t) => sum + t.estimateHours, 0);
+ let devProgress: number;
+ if (totalEstimate === 0) {
+ devProgress = vDevTasks.reduce((sum, t) => sum + STATUS_PROGRESS[t.status], 0) / vDevTasks.length;
+ } else {
+ const weighted = vDevTasks.reduce((sum, t) => sum + t.estimateHours * STATUS_PROGRESS[t.status], 0);
+ devProgress = weighted / totalEstimate;
+ }
+ segments.push(devProgress);
+ }
+
+ if (vTestCases.length > 0) {
+ const executed = vTestCases.filter((c) => c.status === 'passed' || c.status === 'failed' || c.status === 'blocked').length;
+ segments.push((executed / vTestCases.length) * 100);
+ }
+
+ map[v.id] = segments.length > 0 ? Math.round(segments.reduce((s, x) => s + x, 0) / segments.length) : 0;
+ }
+ return map;
+ }, [project, plans, requirements, devTasks, testCases]);
+
const stats = useMemo(() => {
if (!project) return { total: 0, developing: 0, released: 0, totalDays: 0, reqCount: 0, overtimeHours: 0 };
const total = project.versions.length;
const developing = project.versions.filter((v) => v.status === 'developing').length;
const released = project.versions.filter((v) => v.status === 'released').length;
- const totalDays = project.versions.reduce((sum, v) => sum + (v.progress ?? []).reduce((s, p) => s + p.daysSpent, 0), 0);
+ const totalDays = project.versions.reduce((sum, v) => {
+ if (!v.startDate) return sum;
+ const start = new Date(v.startDate);
+ start.setHours(0, 0, 0, 0);
+ const end = v.status === 'released' && v.releaseDate ? new Date(v.releaseDate) : new Date();
+ end.setHours(0, 0, 0, 0);
+ return sum + Math.max(0, Math.floor((end.getTime() - start.getTime()) / (1000 * 60 * 60 * 24)));
+ }, 0);
const reqCount = requirements.filter((r) => r.projectId === projectId).length;
const overtimeHours = Math.round(records.filter((r) => r.projectId === projectId).reduce((sum, r) => sum + r.duration, 0) * 10) / 10;
return { total, developing, released, totalDays, reqCount, overtimeHours };
@@ -283,7 +385,7 @@ export default function ProjectDetailPage() {
{sortedVersions.length === 0 ? (
暂无版本
) : (
- sortedVersions.map((v) => router.push(`/versions/${id}`)} />)
+ sortedVersions.map((v) => router.push(`/versions/${id}`)} />)
)}