From ed722acfaf6f10ba2e6c3e1b4d68a2552bdde245 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 19 三月 2025 16:51:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/lang/en.js | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/UI-Project/src/lang/en.js b/UI-Project/src/lang/en.js
index 8756cce..41149f9 100644
--- a/UI-Project/src/lang/en.js
+++ b/UI-Project/src/lang/en.js
@@ -136,6 +136,8 @@
takeon:'The arrangement is complete',
},
searchOrder:{
+ startCell:'鐩爣灞傚彿',
+ endCell:'棰勭暀灞傚彿',
begin:'寮�濮�',
finish:'瀹屾垚',
uncar:'鏈笂杞�',
@@ -568,6 +570,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