From 667e2153221788c283d8162d7ea17637859f5a02 Mon Sep 17 00:00:00 2001
From: haoliang <821644@qq.com>
Date: Sat, 2 May 2026 22:56:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=A7=E9=87=8F=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E5=AD=97=E6=AE=B5=E6=98=A0=E5=B0=84=EF=BC=9A=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=89=8D=E7=AB=AF=E5=85=BC=E5=AE=B9=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?(date/quantity/runTime/cuttingTime/dataStatus)=EF=BC=8C?=
 =?UTF-8?q?=E4=BA=A7=E9=87=8F=E5=88=97=E7=9B=B4=E6=8E=A5=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=95=B0=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/production/ProductionPage.vue        | 2 +-
 src/CncModels/Dto/Production/DailyProductionListItem.cs | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/frontend/src/views/production/ProductionPage.vue b/frontend/src/views/production/ProductionPage.vue
index 58d8db9..bb05ffd 100644
--- a/frontend/src/views/production/ProductionPage.vue
+++ b/frontend/src/views/production/ProductionPage.vue
@@ -45,7 +45,7 @@
       <el-table-column prop="date" label="日期"/>
       <el-table-column prop="machineName" label="机床"/>
       <el-table-column prop="programName" label="程序名" show-overflow-tooltip/>
-      <el-table-column label="产量" align="center"><template #default="{row}">{{row.dataStatus==='data_missing'?'-':row.quantity}}</template></el-table-column>
+      <el-table-column label="产量" align="center"><template #default="{row}">{{row.quantity ?? '-'}}</template></el-table-column>
       <el-table-column prop="runTime" label="运行时间" align="center"/>
       <el-table-column prop="cuttingTime" label="切削时间" align="center"/>
       <el-table-column label="日状态" align="center"><template #default="{row}"><el-tag :type="row.dataStatus==='normal'?'info':row.dataStatus==='offline'?'danger':'warning'" size="small">{{row.dataStatus==='normal'?'正常':row.dataStatus==='offline'?'离线':'缺失'}}</el-tag></template></el-table-column>
diff --git a/src/CncModels/Dto/Production/DailyProductionListItem.cs b/src/CncModels/Dto/Production/DailyProductionListItem.cs
index cd64d8b..09f96f9 100644
--- a/src/CncModels/Dto/Production/DailyProductionListItem.cs
+++ b/src/CncModels/Dto/Production/DailyProductionListItem.cs
@@ -18,5 +18,13 @@ namespace CncModels.Dto.Production
         public decimal? TotalCuttingTime { get; set; }
         public decimal? TotalCycleTime { get; set; }
         public int? WorkerId { get; set; }
+
+        // 前端兼容字段（序列化时填充）
+        public string date => ProductionDate.ToString("yyyy-MM-dd");
+        public decimal quantity => TotalQuantity;
+        public decimal? runTime => TotalRunTime;
+        public decimal? cuttingTime => TotalCuttingTime;
+        public string dataStatus => TotalQuantity > 0 ? "normal" : "data_missing";
+        public bool isAdjusted => false;
     }
 }