杭州利来项目
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
ZengTao
2025-02-26 62681d14e34466f4ed4eafaa2cef197c53e6fd82 
 UI-Project/src/views/PurchaseReturn/purchaseReturn.vue


@@ -85,8 +85,8 @@


    const existingRects = adjustedRects2.value.filter(rect => newGlassIds.has(rect.glassId));  


    // 计算新的矩形  


    const newRects = data.intoGlass2[0].map(rect => {  


      const scaleFactor =  845/5000;


      const scaleFactorY =  430/2750;


      const scaleFactor =  800/5000;


      const scaleFactorY =  407/2750;


        let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;


        let newX = rect.yCoordinate; 


      if (rect.width < rect.height) {


@@ -137,8 +137,8 @@


    const newGlassIds = new Set(data.intoGlass1[0].map(rect => rect.glassId));


    const existingRects = adjustedRects1.value.filter(rect => newGlassIds.has(rect.glassId));


    const newRects = data.intoGlass1[0].map(rect => {


      const scaleFactor =  845/5000;


      const scaleFactorY =  430/2750;


      const scaleFactor =  800/5000;


      const scaleFactorY =  407/2750;


      // const scaleFactor =  600/5087;


      // const scaleFactorY =  200/2800;


      let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;


@@ -191,8 +191,8 @@


    const newGlassIds = new Set(data.intoGlass3[0].map(rect => rect.glassId));


    const existingRects = adjustedRects3.value.filter(rect => newGlassIds.has(rect.glassId));


    const newRects = data.intoGlass3[0].map(rect => {


      const scaleFactor =  845/5000;


      const scaleFactorY =  430/2750;


      const scaleFactor =  800/5000;


      const scaleFactorY =  407/2750;


      let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;


      let newX = rect.yCoordinate; 


      if (rect.width < rect.height) {


@@ -245,8 +245,8 @@


    const existingRects = adjustedRects4.value.filter(rect => newGlassIds.has(rect.glassId));  


    // 计算新的矩形  


    const newRects = data.intoGlass4[0].map(rect => { 


      const scaleFactor =  845/5000;


      const scaleFactorY =  430/2750;


      const scaleFactor =  800/5000;


      const scaleFactorY =  407/2750;


        let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;


        let newX = rect.yCoordinate; 


      if (rect.width < rect.height) {


@@ -1279,11 +1279,11 @@


        <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 1000px;"


                 v-loading="loading">


                 


   <div style="width: 845px;float: right;background-color: #f4f4f5;height: 430px;margin-top: 20px;">


   <div style="width: 800px;float: right;background-color: #f4f4f5;height: 430px;margin-top: 20px;">


     <div v-if="adjustedRects3.length > 0">


       <!-- <div style="text-align: center;">炉号3：{{ engineerIdDisplay }}-{{ adjustedRects[0].temperingLayoutId }}</div>   -->


       <div style="text-align: center;"> {{ $t('processCard.temperinglayout') }}：{{ adjustedRects3[0].engineerId }}-{{ adjustedRects3[0].temperingLayoutId }} </div>


    <el-scrollbar height="430px" style="background-color: #e9e9eb;">


    <el-scrollbar height="417px" style="background-color: #e9e9eb;">


    <div  style="position: relative;max-width: 1400px;">  


      <div  


      v-for="(rect, index) in adjustedRects3"


@@ -1306,11 +1306,11 @@


   </el-scrollbar>


   </div>


          </div>


        <div style="width: 845px;float: left;background-color: #f4f4f5;height: 430px;margin-top: 20px;">


        <div style="width: 800px;float: left;background-color: #f4f4f5;height: 430px;margin-top: 20px;">


    <div v-if="adjustedRects4.length > 0">


    <div style="text-align: center;"> {{ $t('processCard.temperinglayout') }}：{{ adjustedRects4[0].engineerId }}-{{ adjustedRects4[0].temperingLayoutId }} </div>


    <!-- <div style="text-align: center;">炉号4：{{ engineerIdDisplay2 }}-{{ adjustedRects[0].temperingLayoutId }}</div>   -->


    <el-scrollbar height="430px" style="background-color: #e9e9eb;">


    <el-scrollbar height="417px" style="background-color: #e9e9eb;">


    <div  style="position: relative;max-width: 1400px;">  


      <div  


      v-for="(rect, index) in adjustedRects4"


@@ -1333,11 +1333,11 @@


   </el-scrollbar>


   </div>


        </div>


 <div style="width: 845px;float: right;background-color: #f4f4f5;height: 430px;margin-top: 20px;">


 <div style="width: 800px;float: right;background-color: #f4f4f5;height: 430px;margin-top: 20px;">


   <div v-if="adjustedRects1.length > 0">


              <!-- <div style="text-align: center;">炉号1：{{ engineerIdDisplay }}-{{ adjustedRects[0].temperingLayoutId }}</div>   -->


     <div style="text-align: center;"> {{ $t('processCard.temperinglayout') }}：{{ adjustedRects1[0].engineerId }}-{{ adjustedRects1[0].temperingLayoutId }} </div>


    <el-scrollbar height="430px" style="background-color: #e9e9eb;">


    <el-scrollbar height="417px" style="background-color: #e9e9eb;">


    <div  style="position: relative;">  


      <div  


      v-for="(rect, index) in adjustedRects1"


@@ -1360,11 +1360,11 @@


   </el-scrollbar>


   </div>


    </div>


     <div style="width: 845px;float: left;background-color: #f4f4f5;height: 430px;margin-top: 20px;">


     <div style="width: 800px;float: left;background-color: #f4f4f5;height: 430px;margin-top: 20px;">


    <div v-if="adjustedRects2.length > 0">


    <div style="text-align: center;"> {{ $t('processCard.temperinglayout') }}：{{ adjustedRects2[0].engineerId }}-{{ adjustedRects2[0].temperingLayoutId }} </div>


    <!-- <div style="text-align: center;">炉号2：{{ engineerIdDisplay2 }}-{{ adjustedRects[0].temperingLayoutId }}</div>   -->


    <el-scrollbar height="430px" style="background-color: #e9e9eb;">


    <el-scrollbar height="417px" style="background-color: #e9e9eb;">


    <div  style="position: relative;max-width: 1400px;">  


      <div  


      v-for="(rect, index) in adjustedRects2"