From 88cbf1a8c50a15f35dd78a50adc43e71a6530775 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 26 五月 2025 16:22:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 817731d..92a5c76 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:'棰勭暀灞傚彿',
@@ -401,6 +402,7 @@
           addconfigName:'娣诲姞閰嶇疆',
           editconfigName:'淇敼閰嶇疆',
           configName:'閰嶇疆鍚�',
+          configNamea:'閰嶇疆鍚嶏細',
           configCode:'閰嶇疆浠ｇ爜',
           configValue:'閰嶇疆鍊�',
           configValuea:'閰嶇疆鍊硷細',
@@ -511,6 +513,56 @@
           createTime :'杩斿簱鏃ユ湡',
       },
       large:{
+        Productionsituation:'鐢熶骇鎯呭喌',
+        Productionandoperationstatus:'鐢熶骇杩愯鎯呭喌',
+        cuttingState:'鍒囧壊褰撳ぉ杩愯鎯呭喌',
+        edgingState:'纾ㄨ竟褰撳ぉ杩愯鎯呭喌',
+        temperingState:'閽㈠寲褰撳ぉ杩愯鎯呭喌',
+        hollowState:'涓┖褰撳ぉ杩愯鎯呭喌',
+        switch:'鍒囨崲',
+        running:'杩愯涓�',
+        stopping:'鍋滄',
+        diffMinutes:'鍒嗛挓',
+        loadstart:'鍒囧壊寮�濮嬫椂闂�',
+        loadend:'鍒囧壊缁撴潫鏃堕棿',
+        loadtotal: '鍒囧壊鎬绘椂闂�',
+        loadfree: '鍒囧壊绌洪棽鏃堕棿',
+        loaddiff: '鍒囧壊宸ヤ綔鏃堕棿',
+        loadnumber: '鍒囧壊鎬绘暟閲�',
+        loadarea: '鍒囧壊鎬婚潰绉�',
+        tempstart: '閽㈠寲寮�濮嬫椂闂�',
+        tempend: '閽㈠寲缁撴潫鏃堕棿',
+        temptotal: '閽㈠寲鎬绘椂闂�',
+        tempfree: '閽㈠寲绌洪棽鏃堕棿',
+        tempdiff: '閽㈠寲宸ヤ綔鏃堕棿',
+        tempstove:  '閽㈠寲鐐夊彿',
+        tempnumber: '閽㈠寲鎬绘暟閲�',
+        temparea: '閽㈠寲鎬婚潰绉�',
+        hollowstart: '涓┖寮�濮嬫椂闂�',
+        hollowend: '涓┖缁撴潫鏃堕棿',
+        hollowtotal: '涓┖鎬绘椂闂�',
+        hollowfree: '涓┖绌洪棽鏃堕棿',
+        hollowdiff: '涓┖宸ヤ綔鏃堕棿',
+        hollownumber: '涓┖鎬绘暟閲�',
+        hollowEngineer: '涓┖宸ョ▼',
+        hollowarea: '涓┖鎬婚潰绉�',
+        hollowtotal: '涓┖鎬绘椂闂�',
+        engineerId: '宸ョ▼鍙�',
+        totalnumber: '鎬绘暟閲�',
+        tatalarea: '鎬婚潰绉�',
+
+        statistics: '鐢熶骇缁熻',
+        ExporttoExcel:'瀵煎嚭excel',
+          slice:'鐗�',
+          load:'鍒囧壊',
+          edg:'纾ㄨ竟',
+          temp:'閽㈠寲',
+          hollow:'涓┖',
+          oneFinish:'涓�绾垮畬鎴�',
+          twoFinish:'浜岀嚎瀹屾垚',
+          oneunFinish:'涓�绾挎湭瀹屾垚',
+          twounFinish:'浜岀嚎鏈畬鎴�',
+          ondDamage:'涓�绾跨牬鎹�',
           percent:'杩涘害鐧惧垎姣�',
           time: '娆＄牬鏃堕棿',
           tionnumber: '璁㈠崟鍙�',
@@ -742,6 +794,8 @@
           finegrinding: '绮剧（',
       },
     hellow: {
+        clickmakesure: '鏄惁纭鐐瑰嚮锛�',
+        logarithm: '瀵规暟锛�',
         totalPairQuantitya: '浠诲姟鎬婚厤瀵规暟',
         pairQuantitya: '宸插嚭閰嶅鏁�',
         waitingout: '绛夊緟鍑虹墖',
@@ -907,6 +961,7 @@
         schedulingswitch: '璋冨害寮�鍏�',
     },
     screendisplay:{
+        pchoice: '璇烽�夋嫨',
         pwidth: '璇疯緭鍏ュ搴�',
         pheight: '璇疯緭鍏ラ珮搴�',
         upnumber: '涓婄墖鏁伴噺',

--
Gitblit v1.8.0