From 3a38edcb5e9c15a9591e1e913d3583f3d437caf1 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 16 十月 2024 10:05:29 +0800
Subject: [PATCH] Merge remote-tracking branch '公司服务器/master'

---
 UI-Project/src/lang/zh.js |   61 ++++++++++++++++++++----------
 1 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index d1de9eb..d2fa6e0 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -199,26 +199,27 @@
         tid:'璁惧id',
         tida:'璁惧id锛�',
         fin:'鏄惁瀹屾垚浠诲姟锛�',
-        sureadd:'纭娣诲姞',
-        sureadda:'鏄惁纭娣诲姞锛�',
-        zailong:'鍦ㄧ涓�',
-        rengongxp:'浜哄伐涓嬬墖',
-        up:'涓婁竴椤�',
-        down:'涓嬩竴椤�',
-        now:'褰撳墠椤垫樉绀�',
-        tit:'鏉℃暟鎹�',
-        temperingqueries:'閽㈠寲鏌ヨ',
-        specifytempering:'鎸囧畾涓�鐐�',
-        specifyengineerid:'鎸囧畾宸ョ▼',
-        projectnumber:'宸ョ▼鍙�',
-        layoutnumber:'閽㈠寲鐗堝浘鍙�',
-        numberglasses:'鐜荤拑鏁伴噺',
-        specifytemperinga:'鏄惁鎸囧畾閽㈠寲璇ユ潯淇℃伅锛�',
-        temperedswitch:'閽㈠寲寮�鍏�',
-        dutyinformation:'鍊肩彮淇℃伅',
-        process:'宸ュ簭',
-        team:'鐝粍',
-        basic:'璁惧',
+        sureadd: '纭娣诲姞',
+        sureadda: '鏄惁纭娣诲姞锛�',
+        zailong: '鍦ㄧ涓�',
+        rengongxp: '浜哄伐涓嬬墖',
+        up: '涓婁竴椤�',
+        down: '涓嬩竴椤�',
+        now: '褰撳墠椤垫樉绀�',
+        tit: '鏉℃暟鎹�',
+        temperingqueries: '閽㈠寲鏌ヨ',
+        specifytempering: '鎸囧畾涓�鐐�',
+        specifyout: '鎸囧畾浜哄伐鍑虹墖',
+        specifyengineerid: '鎸囧畾宸ョ▼',
+        projectnumber: '宸ョ▼鍙�',
+        layoutnumber: '閽㈠寲鐗堝浘鍙�',
+        numberglasses: '鐜荤拑鏁伴噺',
+        specifytemperinga: '鏄惁鎸囧畾閽㈠寲璇ユ潯淇℃伅锛�',
+        temperedswitch: '閽㈠寲寮�鍏�',
+        dutyinformation: '鍊肩彮淇℃伅',
+        process: '宸ュ簭',
+        team: '鐝粍',
+        basic: '璁惧',
         makesure:'纭淇濆瓨',
         // cancel:'鍙栨秷',
         temperingtotal:'閽㈠寲鐐夋暟锛�',
@@ -563,4 +564,24 @@
         inquire :'鏌ヨ',
         station :'宸ヤ綅',
     },
+    Mounting:{
+        previewproject :'閫夋嫨棰勮宸ョ▼',
+        loadinglinea :'涓婄墖绾�',
+        loadingline :'涓婄墖绾匡細',
+        inloadingline :'璇烽�夋嫨涓婄墖绾�',
+        oneloadingline :'涓�鍙蜂笂鐗囩嚎',
+        twoloadingline :'浜屽彿涓婄墖绾�',
+        waiting :'绛夊緟涓�',
+        setparameters :'璁剧疆鍙傛暟',
+        project :'宸ョ▼鍙�',
+        projecta :'宸ョ▼鍙凤細',
+        width :'鍘熺墖瀹�',
+        height :'鍘熺墖楂�',
+        thickness :'鍘熺墖鍘�',
+        projectnumber :'宸ョ▼鍘熺墖搴忓彿',
+        state :'鐘舵��',
+        createtime :'鍒涘缓鏃堕棿',
+        all :'鍏ㄩ��',
+
+    }
 }
\ No newline at end of file

--
Gitblit v1.8.0