From aa1acc2abe14526abf0579c9af25e81553ce1d27 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期三, 18 九月 2024 09:09:53 +0800
Subject: [PATCH] 前端页面细节更改，按钮中英文，样式等

---
 UI-Project/src/lang/zh.js |   40 ++++++++++++++++++++++++++++++++++++++--
 1 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 978142c..5d0976a 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -121,13 +121,49 @@
         page:'椤甸潰锛�',
         pagechoice:'璇烽�夋嫨椤甸潰',
     },
-    marking:{
+    glassInfo: {
+        number: '搴忓彿',
+        glassId: '鐜荤拑ID',
+        batchNumber: '鎵规鍙�',
+        scanId: '鎵爜ID',
+        programId: '绋嬪簭ID',
+        taskType: '浠诲姟绫诲瀷',
+        taskSequence: '浠诲姟椤哄簭',
+        taskQuantity: '浠诲姟鏁伴噺',
+        length: '闀�',
+        width: '瀹�',
+        thickness: '鍘�',
+        drawingGlue: '鐐硅兌鍥剧焊',
+        drawingMarking: '鎵撴爣鍥剧焊',
+        silkScreenX: '涓濆嵃X',
+        silkScreenY: '涓濆嵃Y',
+        isMarking: '鏄惁鎵撴爣',
+        isSilkScreen: '鏄惁涓濆嵃',
+        workState: '浠诲姟鐘舵��',
+        lineConfigurationId: '鎵�鍦ㄤ綅缃�',
+        state: '鐢熶骇鐘舵��',
+        glassState: '鐜荤拑鐘舵��'
+    },
+
+    machine: {
+        marking: '鑷姩鎵撴爣鏈�',
+        silkScreen:'鑷姩涓濆嵃鏈�',
+        GlueDispenser:'鑷姩鐐硅兌鏈�'
+    },
+    functionState:{
         deleteTips:'鏄惁纭鐮存崯锛�',
         delete :'鍒犻櫎',
         tips:'鏄惁纭锛�',
         yes:'鏄�',
         sure :'纭',
         cancel :'鍙栨秷',
-        canceled :'澶辫触'
+        canceled :'澶辫触',
+        anew :'閲嶅彂',
+        finish :'瀹屽伐',
+        lose :'鐮存崯',
+        downLine :'涓嬬嚎',
+        topLine :'涓婄嚎',
+        start :'寮�宸�',
+        stop :'鏆傚仠'
     }
 }
\ No newline at end of file

--
Gitblit v1.8.0