From dd4778d2cc47467a39473f02513ec5438b5c9512 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 05 九月 2025 12:31:58 +0800
Subject: [PATCH] 1、合并冲突

---
 UI-Project/src/lang/en.js |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 58 insertions(+), 0 deletions(-)

diff --git a/UI-Project/src/lang/en.js b/UI-Project/src/lang/en.js
index 90b7e7f..81fb0dd 100644
--- a/UI-Project/src/lang/en.js
+++ b/UI-Project/src/lang/en.js
@@ -129,12 +129,18 @@
     },
     order: {
         projectnumber: 'Please enter the project number',
+        noGlassToDamage:'No broken glass锛�',
         dilapidation: 'Breakage',
+        dilapidationWhether:'Whether it is broken with one click锛�',
         takeaway: 'Manual removal',
         takeawaya: 'Should the information be manually taken away锛�',
         takeon: 'The arrangement is complete',
     },
     searchOrder: {
+        firstLinePriority: 'First-line priority',
+        secondLinePriority: 'second-line priority',
+        hollowPriority:'Hollow priority',
+        furnaces:'Number of full furnaces',
         furnfullTemp: 'Total amount of glass',
         startCell: 'Target layer number',
         endCell: 'Reserved layer number',
@@ -231,6 +237,7 @@
         startstatus: 'Start status',
         startstatusa: 'Start status锛�',
         instartstatus: 'Please enter the enabled status',
+        choicestartstatus:'Please select Enable status',
         glassgaps: 'Glass gap',
         glassgapsa: 'Glass gap锛�',
         inglassgaps: 'Please enter the glass gap',
@@ -332,6 +339,8 @@
         finedging: 'has been edging',
     },
     processCard: {
+        thisIsTheIndoorSurface: 'This is the indoor surface',
+        thisSideIsOutsideTheRoom: 'This side is outside the room',
         intofurnace: 'Entering the furnace',
         beforefurnace: 'Before entering the furnace',
         outfurnace: 'Glass finished from tempering furnace',
@@ -400,7 +409,9 @@
     },
     productStock: {
         configName: 'configure name',
+        configNamea:'configure name锛�',
         configCode: 'Configuration Code',
+        inconfigValue:'Please enter the configured values',
         configValue: 'Configuration value',
         addusers: 'Add user',
         username: 'User name',
@@ -509,6 +520,46 @@
         createTime: 'Return date',
     },
     large: {
+        Productionsituation:'Production situation',
+        Productionandoperationstatus:'Production and operation status',
+        cuttingState:'Operation status on the day of cutting',
+        edgingState:'Operation status on the day of edge grinding',
+        temperingState:'Operation status of tempered steel on the day of tempering',
+        hollowState:'Production and operation status of hollow on the same day',
+        switch: 'Switch',
+        running: 'Running',
+        stopping:'Stopping',
+        diffMinutes:'diffMinutes',
+        loadstart:'Load start',
+        loadend:'Load end',
+        loadtotal: 'Load total',
+        loadfree: 'Load free',
+        loaddiff: 'Load diff',
+        loadnumber: 'Load number',
+        loadarea: 'Load area',
+        tempstart: 'Temp start',
+        tempend: 'Temp end',
+        temptotal: 'Temp total',
+        tempfree: 'Temp free',
+        tempdiff: 'Temp diff',
+        tempstove:  'temp stove',
+        tempnumber: 'Temp number',
+        temparea: 'Temp area',
+        hollowstart: 'Hollow start',
+        hollowend: 'Hollow end',
+        hollowtotal: 'Hollow total',
+        hollowfree: 'Hollow free',
+        hollowdiff: 'Hollow diff',
+        hollownumber: 'Hollow number',
+        hollowEngineer: 'Hollow engineer',
+        hollowtotal: 'Hollow total',
+        hollowarea: 'Hollow area',
+        engineerId: 'Engineer ID',
+        totalnumber: 'Total number',
+        tatalarea: 'Total area',
+        statistics: 'Statistics',
+        ExporttoExcel:'Export to Excel',
+        slice:'slice',
         load: 'load',
         edg: 'edg',
         temp: 'temp',
@@ -529,6 +580,7 @@
         detailID: 'Detail ID',
         building: 'Building No',
         serialnumber: 'Order serial number',
+        inproductname: 'Please enter a product name',
         productname: 'Product name',
         serial: 'Process validation number',
         slicemarker: 'Frame marker (position)',
@@ -554,6 +606,7 @@
         orderId: 'Order ID',
         order: 'Order details',
         customerName: 'The name of the customer',
+        incustomerName: 'Please enter the name of the customer',
         project: 'The name of the project',
         are: 'are',
         quantity: 'quantity',
@@ -747,6 +800,9 @@
         finegrinding: 'Fine grinding',
     },
     hellow: {
+        projectMsg2:'Please select a label template',
+        clickmakesure: 'Whether or not to confirm the click锛�',
+        logarithm: 'logarithm锛�',
         totalPairQuantitya: 'Total number of task allocation pairs',
         pairQuantitya: 'Number of deployed pairs',
         waitingout: 'Waiting for the release of the film',
@@ -869,6 +925,7 @@
         stopproject: 'Pause Task',
         pstopproject: 'Do you want to pause the task锛�',
         reviewproject: 'Preview project',
+        plselectproject: 'Select Preview Project',
         line: 'line',
         linea: 'line锛�',
         line1: 'Line 1',
@@ -894,6 +951,7 @@
         cardnumbera: 'Process card number锛�',
         layernumber: 'Layer number',
         totalnumber: 'Total number of films',
+        pairsnumbertotal: 'The total number of pairs锛�',
         pairsnumber: 'Matched quantity',
         missingnumber: 'Number of missing pieces',
         damagenumber: 'A quantity broken.',

--
Gitblit v1.8.0