1、合并冲突

zhoushihao

2025-09-05 dd4778d2cc47467a39473f02513ec5438b5c9512

 UI-Project/src/lang/zh.js

@@ -128,12 +128,17 @@
      },
      order:{
          projectnumber:'请输入工程号',
          noGlassToDamage:'没有可破损的玻璃！',
          dilapidation:'破损',
          dilapidationWhether:'是否一键破损？',
          takeaway:'人工拿走',
          takeawaya:'是否人工拿走该条信息？',
          takeon:'摆片完成',
      },
      searchOrder:{
          firstLinePriority: '一线优先',
          secondLinePriority: '二线优先',
          hollowPriority:'中空优先级',
          furnaces:'满炉炉数',
          furnfullTemp:'玻璃总量',
          startCell:'目标层号',
@@ -333,6 +338,8 @@
          finedging:'已磨边',
      },
      processCard:{
          thisIsTheIndoorSurface: '此面为室内面',
          thisSideIsOutsideTheRoom: '此面为室外面',
          intofurnace:'进炉中',
          beforefurnace:'进炉前',
          outfurnace:'已出炉玻璃',
@@ -577,6 +584,7 @@
          building: '楼号',
          serialnumber: '订单序号',
          productname: '产品名称',
          inproductname: '请输入产品名称',
          serial: '工艺确认序号',
          slicemarker: '层号',
          numberpatches: '补片数量',
@@ -601,6 +609,7 @@
          orderId: '订单ID',
          order: '订单详情',
          customerName: '客户名称',
          incustomerName: '请输入客户名称',
          project: '项目名称',
          are: '面积',
          quantity: '数量',
@@ -796,6 +805,7 @@
          finegrinding: '精磨',
      },
    hellow: {
        projectMsg2:'请选择标签模板',
        clickmakesure: '是否确认点击？',
        logarithm: '对数：',
        totalPairQuantitya: '任务总配对数',
@@ -919,7 +929,8 @@
        formulaNamea: '请输入配方名',
        stopproject: '暂停任务',
        pstopproject: '是否暂停任务？',
        reviewproject: '预览工程',
        reviewproject: '预览任务',
        plselectproject: '请选择任务',
        line: '线路',
        linea: '线路：',
        line1: '线路一',
@@ -946,6 +957,7 @@
        layernumber: '层号',
        totalnumber: '总片数',
        pairsnumber: '已配对数量',
        pairsnumbertotal: '已配对总数量：',
        missingnumber: '缺片数量',
        damagenumber: '破损数量',
        operate: '操作',