From 5a7683e98e626cba3b52fd621b4d5340e16b6f2a Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期六, 15 三月 2025 15:47:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 UI-Project/src/lang/en.js |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/UI-Project/src/lang/en.js b/UI-Project/src/lang/en.js
index 8756cce..f27b961 100644
--- a/UI-Project/src/lang/en.js
+++ b/UI-Project/src/lang/en.js
@@ -568,6 +568,26 @@
           reportWorkQuantity:'reportWorkQuantity',
           reportWorkQuantityCount:'reporting_work_num_count',
           processId:'processId',
+          historicaltasks1:'historicaltasks1',
+          historicaltasks2:'historicaltasks2',
+          historicaltasks3:'historicaltasks3',
+          historicaltasks4:'historicaltasks4',
+          historicaltasks5:'historicaltasks5',
+          historicaltasks6:'historicaltasks6',
+          historicaltasks7:'historicaltasks7',
+          date:'date',
+          countOutOne:'countOutOne',
+          totalAreaOutOne:'totalAreaOutOne',
+          countOutTwo:'countOutTwo',
+          totalAreaOutTwo:'totalAreaOutTwo',
+          countIn:'countIn',
+          totalAreaIn:'totalAreaIn',
+          countOut:'countOut',
+          totalAreaOut:'totalAreaOut',
+          hollowCountOutOne:'hollowCountOutOne',
+          hollowTotalAreaOutOne:'hollowTotalAreaOutOne',
+          countOut:'countOut',
+          hollowCountOutTwo:'hollowCountOutTwo',
       },
       reportmanage:{
           productiontime :'production time',

--
Gitblit v1.8.0