From c8e616de8ce8a247fe692250790fe8c89e71e862 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 16 七月 2024 08:34:48 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

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

diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 0dbaa83..3a9af7a 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -90,8 +90,8 @@
         width:'瀹�',
         height:'楂�',
         startstatus:'鍚敤鐘舵��',
-        disable:'绂佺敤',
-        start:'鍚敤',
+        disable:'宸茬鐢�',
+        start:'宸插惎鐢�',
         deficiencieste:'鎶ョ己',
         updown:'浜哄伐涓嬬墖',
         operate:'鎿嶄綔',
@@ -168,8 +168,8 @@
         gridnumber:'鏍呮牸鍙�',
         gridnumbera:'鏍呮牸鍙凤細',
         grid:'璇疯緭鍏ユ爡鏍煎彿',
-        enable:'鍚敤',
-        disable:'绂佺敤',
+        enable:'宸插惎鐢�',
+        disable:'宸茬鐢�',
         remainingwidth:'鍓╀綑瀹藉害',
         add:'娣诲姞',
         sheetID:'閽㈠寲灏忕墖淇℃伅琛↖D',
@@ -237,7 +237,7 @@
         state:'鐘舵��',
         devicenumber:'璁惧鍙�',
         startstatus:'鍚敤鐘舵��',
-        enable:'鍚敤',
+        enable:'宸插惎鐢�',
         unenable:'鏈惎鐢�',
         operate:'鎿嶄綔',
         bindingshelves:'缁戝畾鏋跺瓙',
@@ -410,7 +410,7 @@
         notstocked: '鏈叆搴�',
         inboundstatus: '閮ㄥ垎鍏ュ簱鐘舵��',
         allstatus: '鍏ㄩ儴鍏ュ簱鐘舵��',
-
-        
+        completedquantity: '瀹屾垚鏁伴噺',
+        scrapquantity: '鎶ュ簾鏁伴噺',
     }
 }
\ No newline at end of file

--
Gitblit v1.8.0