From 5db14138646f88b780fcf90000abdd0cd925c1b9 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 18 一月 2024 09:54:21 +0800
Subject: [PATCH] 主界面添加扫码枪二维码显示，添加软急停，调整终止任务功能
---
CanadaMes-ui/src/lang/locales/zh-CN.json | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index b86982f..5273df5 100644
--- a/CanadaMes-ui/src/lang/locales/zh-CN.json
+++ b/CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -290,7 +290,7 @@
"current Information": "褰撳墠淇℃伅",
"Modify Information": "淇敼淇℃伅",
"Clear Current": "娓呴櫎褰撳墠",
- "Confirm Modification": "纭淇敼",
+ "Confirm": "纭",
"The glass ID already exists in the loading queue": "涓婄墖闃熷垪宸插瓨鍦ㄦ鐜荤拑id",
"This glass ID already exists in the sorting cage": "鐞嗙墖绗煎唴宸插瓨鍦ㄦ鐜荤拑id",
"Outing Queue":"鍑虹墖闃熷垪",
@@ -338,6 +338,17 @@
"Outside":"澶栦晶",
"Inside":"鍐呬晶",
"Cancel":"鍙栨秷",
+ "Are you sure to clear this barcode ?":"纭畾娓呴櫎姝ょ幓鐠僫d鍚� ?",
+ "Terminate Feeding":"缁堟杩涚墖",
+ "Terminate Outing":"缁堟鍑虹墖",
+ "SoftEmergencyStop":"杞�ュ仠",
+ "Unable to clear glass ID in automatic mode":"鏃犳硶鍦ㄨ嚜鍔ㄦā寮忎笅娓呴櫎鐜荤拑ID",
+ "Are you sure you want an emergency stop ?":"纭畾瑕佹�ュ仠鍚�?",
+ "Current State":"褰撳墠鐘舵��",
+ "Automatic":"鑷姩",
+ "Hand Movement":"鎵嬪姩",
+ "Please enter the correct glassID":"璇疯緭鍏ユ纭殑鐜荤拑ID",
+ "Switch":"鍒囨崲",
"langparameter": {
"conveyor Velocity(Auto FAST)": "D01-D06 鐨甫杈撻�佽嚜鍔ㄥ揩閫�",
"conveyor Velocity(Auto SLOW)": "D01-D06 鐨甫杈撻�佽嚜鍔ㄦ參閫�",
--
Gitblit v1.8.0