From 3c7d672fb7d6c34742fb7da6f66616ccf3be2c9a Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 08 十一月 2024 14:50:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 UI-Project/src/lang/zh.js |   53 ++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 45bec92..544e3c4 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -546,7 +546,16 @@
       },
       film:{
           mes:'鍘熺墖浠撳偍璇︽儏',
-          warehousing:'鍏ュ簱',
+          warehousing:'鍘熺墖鍏ュ簱',
+          pwarehousing:'鍏ュ簱璇锋眰',
+          wareout:'鍘熺墖鍑哄簱',
+          information:'鏄惁鍑哄簱璇ユ潯淇℃伅锛�',
+          pwareout:'鍑哄簱璇锋眰',
+          position:'鍚婅浣嶏細',
+          cposition:'璇烽�夋嫨鍚婅浣�',
+          position1:'鍚婅浣�1',
+          position2:'鍚婅浣�2',
+          addglass:'鍘熺墖淇℃伅',
           operate: '鎿嶄綔',
           exit:'缂栬緫',
           delete:'鍒犻櫎',
@@ -606,23 +615,29 @@
           station :'宸ヤ綅',
       },
       Mounting:{
-          previewproject :'閫夋嫨棰勮宸ョ▼',
-          loadinglinea :'涓婄墖绾�',
-          loadingline :'涓婄墖绾匡細',
-          inloadingline :'璇烽�夋嫨涓婄墖绾�',
-          oneloadingline :'涓�鍙蜂笂鐗囩嚎',
-          twoloadingline :'浜屽彿涓婄墖绾�',
-          waiting :'绛夊緟涓�',
-          setparameters :'璁剧疆鍙傛暟',
-          project :'宸ョ▼鍙�',
-          projecta :'宸ョ▼鍙凤細',
-          width :'鍘熺墖瀹�',
-          height :'鍘熺墖楂�',
-          thickness :'鍘熺墖鍘�',
-          projectnumber :'宸ョ▼鍘熺墖搴忓彿',
-          state :'鐘舵��',
-          createtime :'鍒涘缓鏃堕棿',
-          all :'鍏ㄩ��',
-   
+          previewproject: '閫夋嫨棰勮宸ョ▼',
+          loadinglinea: '涓婄墖绾�',
+          loadingline: '涓婄墖绾匡細',
+          inloadingline: '璇烽�夋嫨涓婄墖绾�',
+          oneloadingline: '涓�鍙蜂笂鐗囩嚎',
+          twoloadingline: '浜屽彿涓婄墖绾�',
+          waiting: '绛夊緟涓�',
+          pass: '閫氳繃',
+          setparameters: '璁剧疆鍙傛暟',
+          project: '宸ョ▼鍙�',
+          projecta: '宸ョ▼鍙凤細',
+          width: '鍘熺墖瀹�',
+          height: '鍘熺墖楂�',
+          thickness: '鍘熺墖鍘�',
+          projectnumber: '宸ョ▼鍘熺墖搴忓彿',
+          state: '鐘舵��',
+          createtime: '鍒涘缓鏃堕棿',
+          all: '鍏ㄩ��',
+          removalmethod: '璇烽�夋嫨闄よ啘鏂瑰紡',
+          removalmethoda: '闄よ啘鏂瑰紡锛�',
+          noremoval: '涓嶉櫎鑶�',
+          coarselyground: '绮楃(',
+          finegrinding: '绮剧(',
+
       }
   }
\ No newline at end of file

--
Gitblit v1.8.0