From 64f2f7629bab47b948ef5a0347f581a352f4a7ad Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 21 四月 2025 10:32:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 UI-Project/src/layout/MainErpView.vue |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/UI-Project/src/layout/MainErpView.vue b/UI-Project/src/layout/MainErpView.vue
index f41d08b..d00b2ce 100644
--- a/UI-Project/src/layout/MainErpView.vue
+++ b/UI-Project/src/layout/MainErpView.vue
@@ -79,16 +79,23 @@
       // 瀹氫箟涓嫳鏂囧鐓у叧绯诲璞�
    const translation  = {  
     '涓婄墖鏈�': 'Loading Machine',
-    '涓婄墖': 'Start showing a movie',
+    '涓婄墖涓�绾�': 'First line on film',
+    '涓婄墖浜岀嚎': 'Second line on film',
     '鎺扮墖/璇嗗埆': 'Breaking /Identification',
+    '鎺扮墖涓�绾�': 'Broken piece line',
+    '鎺扮墖浜岀嚎': 'Broken pieces with two lines',
     '鍗у紡缂撳瓨': 'Horizontal cache',
+    '鍗у紡缂撳瓨涓�鍙风嚎': 'Horizontal Cache 1',
+    '鍗у紡缂撳瓨浜屽彿绾�': 'Horizontal Cache 2',
     '纾ㄨ竟鍓嶅崸寮忕紦瀛�': 'Horizontal buffer before edge grinding',
     '涓嬬墖鍗у紡缂撳瓨': 'Offline horizontal cache',
     '纾ㄨ竟锛堝喎鍔犲伐锛�': 'Grinding edge (cold processing)',
+    '纾ㄨ竟(鍐峰姞宸�)': 'Grinding edge (cold processing)',
     '1绾跨(杈�(鍐峰姞宸�)': '1-line edge grinding (cold processing)',
     '2绾跨(杈�(鍐峰姞宸�)': '2-line edge grinding (cold processing)',
     '澶х悊鐗囩': 'Dali slice cage',
     '閽㈠寲': 'Toughened',
+    '閽㈠寲鏌ヨ': 'Tempered steel inquiry',
     '閽㈠寲鍓�': 'Before Tempering',
     '閽㈠寲鍚�': 'After Tempering',
     '涓嬬墖鍙�': 'Next Stage',
@@ -96,10 +103,20 @@
     '鐢ㄦ埛绠$悊': 'User Management',
     '鏉冮檺绠$悊': 'Rights Management',
     '瑙掕壊绠$悊': 'Roles',
+    '绯荤粺閰嶇疆': 'system configuration',
     '鍙鍖栫郴缁�': 'visualization system',
     '鎶ュ伐绠$悊': 'Job reporting management',
     '浠撳偍涓績': 'Storage Center',
     '鍘熺墖浠撳偍': 'Original film storage',
+    '涓┖': 'Hollow',
+    '涓┖涓�绾�': 'Hollow Line',
+    '涓┖浜岀嚎': 'Hollow Second Line',
+    '涓┖涓夌嚎': 'Hollow three line',
+    '涓┖鐞嗙墖绗�': 'Hollow Film processing cage',
+    '鎶橀摑妗嗕竴绾�': '1 Fold aluminum frame',
+    '鎶橀摑妗嗕簩绾�': '2 Fold aluminum frame',
+    '鎶橀摑妗嗕笁绾�': '3 Fold aluminum frame',
+    '澶у睆鏄剧ず': 'Large Screen Display',
      };  
   menuData.forEach(menu => {  
     menu.menuName = translation[menu.menuName] || menu.menuName;  

--
Gitblit v1.8.0