From 984ac5519665973f091ac8611530881fc92268be Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 17 十二月 2024 09:52:44 +0800
Subject: [PATCH] 1、卧理历史任务更新，按照设备id更新任务，避免两条线同时开启任务冲突

---
 UI-Project/src/lang/zh.js |   26 ++++++++++++++++----------
 1 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index e69b1b8..89cb7d2 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -34,6 +34,7 @@
           quit:"閫�鍑�",
       },
       basicData:{
+          printing:'鑷姩鎵撳嵃',
           laserprinting:'鎵撴爣鏈哄氨缁姸鎬侊細',
           cuttingmachine:'鍒囧壊鏈哄氨缁姸鎬侊細',
           machine:'涓婄墖鏈鸿仈鏈虹姸鎬侊細',
@@ -103,13 +104,18 @@
           cancel:'鍙栨秷',
       },
       order:{
+          projectnumber:'璇疯緭鍏ュ伐绋嬪彿',
           dilapidation:'鐮存崯',
           takeaway:'浜哄伐鎷胯蛋',
           takeon:'鎽嗙墖瀹屾垚',
       },
       searchOrder:{
-        deleteTask:'鍒犻櫎宸ョ▼',
-        pdeleteTask:'鏄惁鍒犻櫎宸ョ▼锛�',
+          processcard:'鎸囧畾娴佺▼鍗�',
+          filminformation:'浜哄伐涓嬬墖淇℃伅',
+          currentglassinformation:'鎵爜鏋綋鍓嶇幓鐠冧俊鎭�',
+          printlabels:'鎵撳嵃鏍囩',
+          deleteTask:'鍒犻櫎宸ョ▼',
+          pdeleteTask:'鏄惁鍒犻櫎宸ョ▼锛�',
           searchlayout:'闈為挗鍖栨祦绋嬪崱鏌ヨ',
           fullfurnaces:'婊＄倝鏁伴噺',
           specifiedproject:'褰撳墠鎸囧畾宸ョ▼',
@@ -233,7 +239,6 @@
           team:'鐝粍',
           basic:'璁惧',
           makesure:'纭淇濆瓨',
-          cancel:'鍙栨秷',
           temperingtotal:'閽㈠寲鐐夋暟锛�',
           glasstotal:'鐜荤拑鎬绘暟锛�',
           Labelprinting:'鏍囩鎵撳嵃',
@@ -334,7 +339,6 @@
           width:'瀹藉害',
           height:'楂樺害',
       },
-   
       productStock:{
           addusers:'娣诲姞鐢ㄦ埛',
           username:'鐢ㄦ埛鍚�',
@@ -405,14 +409,11 @@
       },
       replenish:{
           patchManagement:'琛ョ墖绠＄悊',
-   
       },
       rework:{
           reworkManagement:'杩斿伐绠＄悊',
           addRework:"杩斿伐鏂板 ",
       },
-   
-   
       role:{
           id:'ID',
           characterHomepage:'瑙掕壊棣栭〉',
@@ -506,9 +507,9 @@
           productiontime :'鐢熶骇鏃堕棿',
           starttime :'寮�濮嬫椂闂�',
           endtime :'缁撴潫鏃堕棿',
-          ctype :'娓呴�夋嫨绫诲瀷',
-          cstate :'娓呴�夋嫨鐘舵��',
-          cprocess :'娓呴�夋嫨宸ュ簭',
+          ctype :'璇烽�夋嫨绫诲瀷',
+          cstate :'璇烽�夋嫨鐘舵��',
+          cprocess :'璇烽�夋嫨宸ュ簭',
           all :'鍏ㄩ儴',
           completed :'瀹屽伐',
           broke :'鐮存崯',
@@ -645,6 +646,10 @@
           finegrinding: '绮剧（',
       },
     hellow: {
+        line: '绾胯矾',
+        line1: '绾胯矾涓�',
+        line2: '绾胯矾浜�',
+        line3: '绾胯矾涓�',
         createtask: '鍒涘缓浠诲姟',
         starttask: '寮�濮嬩换鍔�',
         pstarttask: '鏄惁寮�濮嬩换鍔★紵',
@@ -654,6 +659,7 @@
         claimednumber: '宸查鍙栭厤瀵规暟閲忥細',
         linenumber: '杩涘叆涓┖绾挎暟閲忥細',
         order: '鍑虹墖椤哄簭',
+        flowCardId: '娴佺▼鍗�',
         thickness: '鍘氬害',
         coatingtypes: '鑶滅郴',
         layer: '灞傛暟',

--
Gitblit v1.8.0