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/lang/zh.js |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 1029ed7..6d5d1c9 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -134,6 +134,7 @@
           takeon:'鎽嗙墖瀹屾垚',
       },
       searchOrder:{
+          furnaces:'婊$倝鐐夋暟',
           furnfullTemp:'鐜荤拑鎬婚噺',
           startCell:'鐩爣灞傚彿',
           endCell:'棰勭暀灞傚彿',
@@ -176,7 +177,7 @@
           searchlayout:'闈為挗鍖栨祦绋嬪崱鏌ヨ',
           fullfurnaces:'婊$倝鏁伴噺',
           specifiedproject:'褰撳墠鎸囧畾宸ョ▼',
-          undesignate:'鍙栨秷鎸囧畾',
+          undesignate:'鍙栨秷閽㈠寲',
           allnumber:'鎬绘暟閲�',
           numbercages:'绗煎瓙鍐呮暟閲�',
           missingquantity:'缂哄皯鏁伴噺',
@@ -288,7 +289,7 @@
           projectnumber:'宸ョ▼鍙�',
           layoutnumber:'閽㈠寲鐗堝浘鍙�',
           numberglasses:'鐜荤拑鏁伴噺',
-          specifytemperinga:'鏄惁鎸囧畾閽㈠寲璇ユ潯淇℃伅锛�',
+          specifytemperinga:'璇风‘璁よ澶囨槸鍚﹀凡鍏抽棴MES鑱旀満锛�',
           temperedswitch:'閽㈠寲寮�鍏�',
           dutyinformation:'鍊肩彮淇℃伅',
           process:'宸ュ簭',
@@ -511,6 +512,15 @@
           createTime :'杩斿簱鏃ユ湡',
       },
       large:{
+          load:'鍒囧壊',
+          edg:'纾ㄨ竟',
+          temp:'閽㈠寲',
+          hollow:'涓┖',
+          oneFinish:'涓�绾垮畬鎴�',
+          twoFinish:'浜岀嚎瀹屾垚',
+          oneunFinish:'涓�绾挎湭瀹屾垚',
+          twounFinish:'浜岀嚎鏈畬鎴�',
+          ondDamage:'涓�绾跨牬鎹�',
           percent:'杩涘害鐧惧垎姣�',
           time: '娆$牬鏃堕棿',
           tionnumber: '璁㈠崟鍙�',
@@ -742,6 +752,8 @@
           finegrinding: '绮剧(',
       },
     hellow: {
+        clickmakesure: '鏄惁纭鐐瑰嚮锛�',
+        logarithm: '瀵规暟锛�',
         totalPairQuantitya: '浠诲姟鎬婚厤瀵规暟',
         pairQuantitya: '宸插嚭閰嶅鏁�',
         waitingout: '绛夊緟鍑虹墖',
@@ -907,6 +919,7 @@
         schedulingswitch: '璋冨害寮�鍏�',
     },
     screendisplay:{
+        pchoice: '璇烽�夋嫨',
         pwidth: '璇疯緭鍏ュ搴�',
         pheight: '璇疯緭鍏ラ珮搴�',
         upnumber: '涓婄墖鏁伴噺',

--
Gitblit v1.8.0