Merge remote-tracking branch 'origin/master'

zhoushihao

2025-03-10 976cee4892eec261f6c2927e788e476e5cc5028e

 UI-Project/src/lang/en.js

@@ -96,6 +96,9 @@
          emptymissions:'空任务',
          advancetask:'进片任务',
          outputtasks:'出片任务',
          schedulingtasks:'调度任务',
          advancerequests:'进片请求',
          releaserequest:'出片请求',
          straighttasks:'直通任务',
          endingtask:'结束',
          another:'其他',
@@ -129,6 +132,16 @@
          takeon:'The arrangement is complete',
      },
      searchOrder:{
          totallogarithms:'总对数',
          numberpairs:'配对数',
          numberoccupied:'占用格子数',
          totalfurnaces:'总炉数',
          cagesnumber:'笼内数量',
          slotnumber:'占有格子数',
          progress:'进度',
          whethersame:'是否相同',
          same:'相同',
          notsame:'不相同',
          partask:'任务重置',
          partasks:'是否任务重置？',
          empty:'默认空任务',
@@ -478,6 +491,7 @@
          createTime :'Return date',
      },
      large:{
          percent:'Percent',
          time: 'The time of the break',
          number: 'Order number',
          jobnumber: 'Job number',
@@ -548,6 +562,7 @@
          dreportwork :'Unreported work',
          pendingwork :'Pending job application',
          reportwork :'Reported work',
          reportworked :'Reported worked',
          incise :'slicing',
          edging :'edging',
          steel :'toughened',
@@ -581,6 +596,7 @@
          premark :'Please enter a note',
      },
      film:{
          fail:'失败',
          mes:'Original film storage details',
          warehousing:'store',
          pwarehousing:'入库请求',