From 00f0f705a03a9c0f4d29895a7622b270f5d7e7d2 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期六, 12 十月 2024 14:10:53 +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, 5 insertions(+), 9 deletions(-)
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 4f2483f..bd3eed4 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -216,12 +216,11 @@
specifytemperinga:'鏄惁鎸囧畾閽㈠寲璇ユ潯淇℃伅锛�',
temperedswitch:'閽㈠寲寮�鍏�',
dutyinformation:'鍊肩彮淇℃伅',
- line:'绾胯矾',
process:'宸ュ簭',
team:'鐝粍',
basic:'璁惧',
makesure:'纭淇濆瓨',
- cancel:'鍙栨秷',
+ // cancel:'鍙栨秷',
temperingtotal:'閽㈠寲鐐夋暟锛�',
glasstotal:'鐜荤拑鎬绘暟锛�',
},
@@ -452,11 +451,9 @@
allstatus: '鍏ㄩ儴鍏ュ簱鐘舵��',
completedquantity: '瀹屾垚鏁伴噺',
scrapquantity: '鎶ュ簾鏁伴噺',
- number: '鏁伴噺',
method: '鍔犲伐鏂瑰紡',
innumber: '宸插叆鏁伴噺',
productstatus: '鐢熶骇鐘舵��',
- projectnumber: '宸ョ▼鍙�',
right: '姝ｅ父',
stop: '缁堟',
inquire: '鏌ヨ',
@@ -490,7 +487,6 @@
glassID :'鐜荤拑ID',
projectnumber :'宸ョ▼鍙�',
layoutID :'閽㈠寲鐗堝浘ID',
- productiontime :'鐢熶骇鏃堕棿',
type :'绫诲瀷',
state :'鐘舵��',
processcards :'娴佺▼鍗�',
@@ -525,7 +521,6 @@
startslot:'寮�濮嬪伐浣�',
endslot:'鐩爣宸ヤ綅',
slotid:'鏍煎瓙ID',
- slot:'鏍煎瓙鍙�',
width:'鍘熺墖瀹�',
widtha:'鍘熺墖瀹斤細',
inwidth:'璇疯緭鍏ュ師鐗囧',
@@ -545,7 +540,6 @@
quantitya:'鏁伴噺锛�',
enableid:'浠诲姟ID',
originateslot:'璧峰鏍煎瓙',
- endslot:'鐩爣鏍煎瓙',
patternquantity:'鍘熺墖鏁伴噺',
enabletype:'浠诲姟绫诲瀷',
enablestate:'宸ヤ綅鐘舵��',
@@ -563,12 +557,14 @@
taskstatus :'浠诲姟鐘舵��',
built :'鏂板缓',
execution :'鎵ц涓�',
- finish :'瀹屾垚',
tasktype :'浠诲姟绫诲瀷',
stocke :'鍏ュ簱',
- outbound :'鍑哄簱',
dispatch :'璋冨害',
inquire :'鏌ヨ',
station :'宸ヤ綅',
},
+ Mounting:{
+ previewproject :'閫夋嫨棰勮宸ョ▼',
+
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0