Merge remote-tracking branch 'origin/master'

zhoushihao

2025-03-14 8114ef9bf2704a2bc05a15a36ab677808195a274

 UI-Project/src/lang/en.js

@@ -34,6 +34,10 @@
          quit:"Exit",
      },
      basicData:{
          untask:'无任务',
          up:'上片',
          tonumber:'上片总数量',
          finishnumber:'已完成数量',
          rackreset:'架子复位',
          prackreset:'是否架子复位？',
          printing:'自动打印',
@@ -132,14 +136,21 @@
          takeon:'The arrangement is complete',
      },
      searchOrder:{
          begin:'开始',
          finish:'完成',
          uncar:'未上车',
          inkage:'进片',
          successfullyprocessed:'任务成功处理',
          psuccessfullyprocessed:'是否进行任务成功处理？',
          taskfailure:'任务失败处理',
          ptaskfailure:'是否进行任务失败处理？',
          totallogarithms:'总对数',
          numberpairs:'配对数',
          numberoccupied:'占用格子数',
          totalfurnaces:'总炉数',
          cagesnumber:'笼内数量',
          slotnumber:'占有格子数',
          progress:'进度',
          temperingpriority:'钢化优先级',
          progress:'进度%',
          whethersame:'是否相同',
          same:'相同',
          notsame:'不相同',
@@ -290,6 +301,8 @@
          Schedulingswitch:'调度开关',
      },
      workOrder:{
          upnumber:'上片位编号',
          coatingtypesbe:'原片膜系',
          glassID:'Glass ID',
          height:'Height',
          width:'Width',
@@ -597,6 +610,7 @@
          premark :'Please enter a note',
      },
      film:{
          resetnumber:'架子号',
          fail:'失败',
          mes:'Original film storage details',
          warehousing:'store',
@@ -636,6 +650,7 @@
          filmsa:'Films：',
          createtime:'Creation time',
          remainquantity:'Remaining Quantity',
          thickremainquant:'Remaining quantity of original film (sheets)',
          thickremainquantity:'Remaining quantity of original film (sheets)：',
          inquantity:'Please enter the quantity',
          quantitya:'Number：',
@@ -695,6 +710,18 @@
          finegrinding: '精磨',
      },
      hellow: {
          hollowCountOutOne: '中空一线玻璃数量',
          hollowCountOutTwo: '中空二线玻璃数量',
          hollowTotalAreaOutOne: '中空一线玻璃面积',
          hollowTotalAreaOutTwo: '中空二线玻璃面积',
          countIn: '钢化前大理片笼玻璃数量',
          countOut: '钢化玻璃数量',
          countOutOne: '切割一线玻璃数量',
          countOutTwo: '切割二线玻璃数量',
          totalAreaIn: '钢化前大理片笼玻璃面积',
          totalAreaOut: '钢化玻璃面积',
          totalAreaOutOne: '切割一线玻璃面积',
          totalAreaOutTwo: '切割二线玻璃面积',
          freeone: '一线空闲状态：',
          freetwo: '二线空闲状态：',
          casFour: '气体4',
@@ -830,5 +857,10 @@
          pairQuantity: '总配对数量：',
          cpairQuantity: '请输入总配对数量',
          schedulingswitch: '调度开关',
      }
      },
    screendisplay:{
        pwidth: '请输入宽度',
        pheight: '请输入高度',
        upnumber: '上片数量',
    }
  }