From a78a9decb428762bcf6cc82641abbc5d6257008e Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 12 十二月 2024 14:14:29 +0800
Subject: [PATCH] 中空调度开关默认为true

---
 UI-Project/src/views/PurchaseReturn/purchaseReturn.vue |  345 ++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 253 insertions(+), 92 deletions(-)

diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index ff7df0b..bc70c0a 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -33,6 +33,7 @@
 const adjustedRects2 = ref([]);
 const adjustedRectsa = ref([]);
 const adjustedRectsb = ref([]);
+const currentPage = ref<number>(1);
 const tableData = ref([])
 const engineerId = ref('')
 const router = useRouter()
@@ -94,20 +95,23 @@
   // 渚嬪锛屽彲浠ユ坊鍔犱竴涓殣钘忕殑鎵撳嵃鏍峰紡琛�  
   window.print();  
 };  
+// 鏂规硶瀹氫箟
+function handlePageChange(page: number) {
+  currentPage.value = page;
+  console.log(page);
+  
+}
 const socketUrl = `ws://${WebSocketHost}:${host}/api/temperingGlass/api/talk/temperingGlass`;
 const handleMessage = (data) => {  
   // 杩涚倝涓彸
   if (data.intoGlass2 && data.intoGlass2.length > 0) {  
-    // 鎻愬彇鏂扮殑鐭╁舰ID  
     const newGlassIds = new Set(data.intoGlass2[0].map(rect => rect.glassId));  
-    // 杩囨护鍑哄凡瀛樺湪鐨勭煩褰�  
     const existingRects = adjustedRects2.value.filter(rect => newGlassIds.has(rect.glassId));  
-    // 璁$畻鏂扮殑鐭╁舰  
     const newRects = data.intoGlass2[0].map(rect => {  
-      const scaleFactor =  794.67/5087; 
-      const scaleFactorY =  430/2800; 
-        let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;
-        let newX = rect.yCoordinate; 
+      const scaleFactor =  1621.78/6000; 
+      const scaleFactorY =  700/2800; 
+      let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;; 
+  let newX = rect.yCoordinate; 
       if (rect.width < rect.height) {
         widtha = rect.height;
         heighta = rect.width;
@@ -115,29 +119,29 @@
         widtha = rect.width;
         heighta = rect.height;
       }
-      if (rect.angle === 0) {  
-    adjustedWidth = widtha * scaleFactor;
+  if (rect.angle === 0) {  
+    adjustedWidth = widtha * scaleFactor;  
     adjustedHeight = heighta * scaleFactorY;
     // adjustedWidtha = widtha;  
-    // adjustedHeighta = heighta;   
-    newX = 5087 - (rect.yCoordinate + widtha); 
+    // adjustedHeighta = heighta;  
+    newX = 6000 - (rect.yCoordinate + widtha); 
     } else {  
     adjustedWidth = heighta * scaleFactor;  
     adjustedHeight = widtha * scaleFactorY;  
     // adjustedWidtha = widtha;  
     // adjustedHeighta = heighta;  
-    newX = 5087 - (rect.yCoordinate + heighta); 
-  } 
-        return {  
-        ...rect, 
-        xcoordinate: newX * scaleFactor,
-        ycoordinate: rect.xCoordinate * scaleFactorY,
-        width: adjustedWidth,  
-        height: adjustedHeight,  
-        widtha: rect.width, 
-        heighta: rect.height,
-      }
-    });   
+    newX = 6000 - (rect.yCoordinate + heighta);  
+  }  
+  return {  
+    ...rect, 
+    x: newX * scaleFactor,  
+    y: rect.xCoordinate * scaleFactorY,  
+    width: adjustedWidth,  
+    height: adjustedHeight,  
+    widtha: rect.width, 
+    heighta: rect.height,
+  }
+    }); 
     // 鍚堝苟鏂版棫鐭╁舰锛屽苟淇濈暀 isActive 鐘舵��  
     adjustedRects2.value = existingRects.map(oldRect => {  
       const newRect = newRects.find(r => r.glassId === oldRect.glassId);  
@@ -147,20 +151,68 @@
       return oldRect; // 濡傛灉鏃х煩褰㈠湪鏂版暟鎹腑涓嶅瓨鍦紝浣嗕繚鐣欏湪newGlassIds涓紝鍒欎繚鐣欏師鏍�  
     }).concat(newRects.filter(r => !existingRects.some(o => o.glassId === r.glassId)));  
   }  
+  // if (data.intoGlass2 && data.intoGlass2.length > 0) {  
+  //   // 鎻愬彇鏂扮殑鐭╁舰ID  
+  //   const newGlassIds = new Set(data.intoGlass2[0].map(rect => rect.glassId));  
+  //   // 杩囨护鍑哄凡瀛樺湪鐨勭煩褰�  
+  //   const existingRects = adjustedRects2.value.filter(rect => newGlassIds.has(rect.glassId));  
+  //   // 璁$畻鏂扮殑鐭╁舰  
+  //   const newRects = data.intoGlass2[0].map(rect => {  
+  //     const scaleFactor =  794.67/5087; 
+  //     const scaleFactorY =  430/2800; 
+  //       let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;
+  //       let newX = rect.yCoordinate; 
+  //     if (rect.width < rect.height) {
+  //       widtha = rect.height;
+  //       heighta = rect.width;
+  //     }else {
+  //       widtha = rect.width;
+  //       heighta = rect.height;
+  //     }
+  //     if (rect.angle === 0) {  
+  //   adjustedWidth = widtha * scaleFactor;
+  //   adjustedHeight = heighta * scaleFactorY;
+  //   // adjustedWidtha = widtha;  
+  //   // adjustedHeighta = heighta;   
+  //   newX = 5087 - (rect.yCoordinate + widtha); 
+  //   } else {  
+  //   adjustedWidth = heighta * scaleFactor;  
+  //   adjustedHeight = widtha * scaleFactorY;  
+  //   // adjustedWidtha = widtha;  
+  //   // adjustedHeighta = heighta;  
+  //   newX = 5087 - (rect.yCoordinate + heighta); 
+  // } 
+  //       return {  
+  //       ...rect, 
+  //       xcoordinate: newX * scaleFactor,
+  //       ycoordinate: rect.xCoordinate * scaleFactorY,
+  //       width: adjustedWidth,  
+  //       height: adjustedHeight,  
+  //       widtha: rect.width, 
+  //       heighta: rect.height,
+  //     }
+  //   });   
+  //   // 鍚堝苟鏂版棫鐭╁舰锛屽苟淇濈暀 isActive 鐘舵��  
+  //   adjustedRects2.value = existingRects.map(oldRect => {  
+  //     const newRect = newRects.find(r => r.glassId === oldRect.glassId);  
+  //     if (newRect) {  
+  //       return { ...oldRect, ...newRect, isActive: oldRect.isActive };  
+  //     }  
+  //     return oldRect; // 濡傛灉鏃х煩褰㈠湪鏂版暟鎹腑涓嶅瓨鍦紝浣嗕繚鐣欏湪newGlassIds涓紝鍒欎繚鐣欏師鏍�  
+  //   }).concat(newRects.filter(r => !existingRects.some(o => o.glassId === r.glassId)));  
+  // }  
   else if (data.intoGlass2 == null) {
     adjustedRects2.value = []
   }
   // 杩涚倝涓乏
-  if (data.intoGlass && data.intoGlass.length > 0) {
-    console.log(data.intoGlass);
-    
-    const newGlassIds = new Set(data.intoGlass[0].map(rect => rect.glassId));
-    const existingRects = adjustedRects1.value.filter(rect => newGlassIds.has(rect.glassId));
-    const newRects = data.intoGlass[0].map(rect => {
-      const scaleFactor =  810.89/5087;
-      const scaleFactorY =  430/2800;
-      let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;
-      let newX = rect.yCoordinate; 
+  if (data.intoGlass && data.intoGlass.length > 0) {  
+    const newGlassIds = new Set(data.intoGlass[0].map(rect => rect.glassId));  
+    const existingRects = adjustedRects1.value.filter(rect => newGlassIds.has(rect.glassId));  
+    const newRects = data.intoGlass[0].map(rect => {  
+      const scaleFactor =  1621.78/6000; 
+      const scaleFactorY =  700/2800; 
+      let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;; 
+  let newX = rect.yCoordinate; 
       if (rect.width < rect.height) {
         widtha = rect.height;
         heighta = rect.width;
@@ -168,29 +220,29 @@
         widtha = rect.width;
         heighta = rect.height;
       }
-      if (rect.angle === 0) {  
-    adjustedWidth = widtha * scaleFactor;
+  if (rect.angle === 0) {  
+    adjustedWidth = widtha * scaleFactor;  
     adjustedHeight = heighta * scaleFactorY;
     // adjustedWidtha = widtha;  
     // adjustedHeighta = heighta;  
-    newX = 5087 - (rect.yCoordinate + widtha); 
+    newX = 6000 - (rect.yCoordinate + widtha); 
     } else {  
     adjustedWidth = heighta * scaleFactor;  
     adjustedHeight = widtha * scaleFactorY;  
     // adjustedWidtha = widtha;  
     // adjustedHeighta = heighta;  
-    newX = 5087 - (rect.yCoordinate + heighta);  
-  } 
-        return {  
-        ...rect, 
-        xcoordinate: newX * scaleFactor,
-        ycoordinate: rect.xCoordinate * scaleFactorY,
-        width: adjustedWidth,  
-        height: adjustedHeight,  
-        widtha: rect.width, 
-        heighta: rect.height,
-      }
-    });     
+    newX = 6000 - (rect.yCoordinate + heighta);  
+  }  
+  return {  
+    ...rect, 
+    x: newX * scaleFactor,  
+    y: rect.xCoordinate * scaleFactorY,  
+    width: adjustedWidth,  
+    height: adjustedHeight,  
+    widtha: rect.width, 
+    heighta: rect.height,
+  }
+    }); 
     // 鍚堝苟鏂版棫鐭╁舰锛屽苟淇濈暀 isActive 鐘舵��  
     adjustedRects1.value = existingRects.map(oldRect => {  
       const newRect = newRects.find(r => r.glassId === oldRect.glassId);  
@@ -200,15 +252,65 @@
       return oldRect; // 濡傛灉鏃х煩褰㈠湪鏂版暟鎹腑涓嶅瓨鍦紝浣嗕繚鐣欏湪newGlassIds涓紝鍒欎繚鐣欏師鏍�  
     }).concat(newRects.filter(r => !existingRects.some(o => o.glassId === r.glassId)));  
   }  
+  // if (data.intoGlass && data.intoGlass.length > 0) {
+  //   console.log(data.intoGlass);
+    
+  //   const newGlassIds = new Set(data.intoGlass[0].map(rect => rect.glassId));
+  //   const existingRects = adjustedRects1.value.filter(rect => newGlassIds.has(rect.glassId));
+  //   const newRects = data.intoGlass[0].map(rect => {
+  //     const scaleFactor =  810.89/5087;
+  //     const scaleFactorY =  430/2800;
+  //     let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;
+  //     let newX = rect.yCoordinate; 
+  //     if (rect.width < rect.height) {
+  //       widtha = rect.height;
+  //       heighta = rect.width;
+  //     }else {
+  //       widtha = rect.width;
+  //       heighta = rect.height;
+  //     }
+  //     if (rect.angle === 0) {  
+  //   adjustedWidth = widtha * scaleFactor;
+  //   adjustedHeight = heighta * scaleFactorY;
+  //   // adjustedWidtha = widtha;  
+  //   // adjustedHeighta = heighta;  
+  //   newX = 5087 - (rect.yCoordinate + widtha); 
+  //   } else {  
+  //   adjustedWidth = heighta * scaleFactor;  
+  //   adjustedHeight = widtha * scaleFactorY;  
+  //   // adjustedWidtha = widtha;  
+  //   // adjustedHeighta = heighta;  
+  //   newX = 5087 - (rect.yCoordinate + heighta);  
+  // } 
+  //       return {  
+  //       ...rect, 
+  //       xcoordinate: newX * scaleFactor,
+  //       ycoordinate: rect.xCoordinate * scaleFactorY,
+  //       width: adjustedWidth,  
+  //       height: adjustedHeight,  
+  //       widtha: rect.width, 
+  //       heighta: rect.height,
+  //     }
+  //   });     
+  //   // 鍚堝苟鏂版棫鐭╁舰锛屽苟淇濈暀 isActive 鐘舵��  
+  //   adjustedRects1.value = existingRects.map(oldRect => {  
+  //     const newRect = newRects.find(r => r.glassId === oldRect.glassId);  
+  //     if (newRect) {  
+  //       return { ...oldRect, ...newRect, isActive: oldRect.isActive };  
+  //     }  
+  //     return oldRect; // 濡傛灉鏃х煩褰㈠湪鏂版暟鎹腑涓嶅瓨鍦紝浣嗕繚鐣欏湪newGlassIds涓紝鍒欎繚鐣欏師鏍�  
+  //   }).concat(newRects.filter(r => !existingRects.some(o => o.glassId === r.glassId)));  
+  // }  
   else {
     adjustedRects1.value = []
   }
+  // 杩涚倝鍓�
   if (data.waitingGlass && data.waitingGlass.length > 0) {  
     const newGlassIds = new Set(data.waitingGlass[0].map(rect => rect.glassId));  
     const existingRects = adjustedRectsa.value.filter(rect => newGlassIds.has(rect.glassId));  
     const newRects = data.waitingGlass[0].map(rect => {  
-      const scaleFactor =  1390/6200; 
-      const scaleFactorY =  750/2800; 
+      const scaleFactor =  1621.78/6000; 
+      const scaleFactorY =  700/2800; 
       let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;; 
   let newX = rect.yCoordinate; 
       if (rect.width < rect.height) {
@@ -253,16 +355,14 @@
   else if (data.waitingGlass == null) {
     adjustedRectsa.value = []
   }
+  // 宸插嚭鐐�
   if (data.outGlass && data.outGlass.length > 0) {  
-    // 鎻愬彇鏂扮殑鐭╁舰ID  
     const newGlassIds = new Set(data.outGlass[0].map(rect => rect.glassId));  
-    // 杩囨护鍑哄凡瀛樺湪鐨勭煩褰�  
     const existingRects = adjustedRectsb.value.filter(rect => newGlassIds.has(rect.glassId));  
-    // 璁$畻鏂扮殑鐭╁舰  
     const newRects = data.outGlass[0].map(rect => {  
-      const scaleFactor =  1390/6000; 
-      const scaleFactory =  750/2800; 
-      let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta,newY;
+      const scaleFactor =  1621.78/6000; 
+      const scaleFactorY =  700/2800; 
+      let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;; 
   let newX = rect.yCoordinate; 
       if (rect.width < rect.height) {
         widtha = rect.height;
@@ -273,30 +373,27 @@
       }
   if (rect.angle === 0) {  
     adjustedWidth = widtha * scaleFactor;  
-    adjustedHeight = heighta * scaleFactory;  
+    adjustedHeight = heighta * scaleFactorY;
     // adjustedWidtha = widtha;  
     // adjustedHeighta = heighta;  
-    // newX = 5190 - (rect.yCoordinate + widtha); 
-    newY = 2800 - (rect.xCoordinate + heighta); 
-  } else {  
+    newX = 6000 - (rect.yCoordinate + widtha); 
+    } else {  
     adjustedWidth = heighta * scaleFactor;  
-    adjustedHeight = widtha * scaleFactory;  
-    // adjustedWidtha = heighta;  
-    // adjustedHeighta = widtha;  
-    // newX = 5190 - (rect.yCoordinate + heighta);  
-    newY = 2800 - (rect.xCoordinate + widtha); 
+    adjustedHeight = widtha * scaleFactorY;  
+    // adjustedWidtha = widtha;  
+    // adjustedHeighta = heighta;  
+    newX = 6000 - (rect.yCoordinate + heighta);  
   }  
   return {  
-        ...rect, // 澶嶅埗鍘熷瀵硅薄鐨勫叾浠栧睘鎬�  
-        x: newX * scaleFactor,
-        y: newY * scaleFactory,
-        width: adjustedWidth,  
-        height: adjustedHeight,  
-        widtha: rect.width, 
-        heighta: rect.height,
+    ...rect, 
+    x: newX * scaleFactor,  
+    y: rect.xCoordinate * scaleFactorY,  
+    width: adjustedWidth,  
+    height: adjustedHeight,  
+    widtha: rect.width, 
+    heighta: rect.height,
   }
-    });   
-  
+    }); 
     // 鍚堝苟鏂版棫鐭╁舰锛屽苟淇濈暀 isActive 鐘舵��  
     adjustedRectsb.value = existingRects.map(oldRect => {  
       const newRect = newRects.find(r => r.glassId === oldRect.glassId);  
@@ -305,7 +402,60 @@
       }  
       return oldRect; // 濡傛灉鏃х煩褰㈠湪鏂版暟鎹腑涓嶅瓨鍦紝浣嗕繚鐣欏湪newGlassIds涓紝鍒欎繚鐣欏師鏍�  
     }).concat(newRects.filter(r => !existingRects.some(o => o.glassId === r.glassId)));  
-  }  
+  }
+  // if (data.outGlass && data.outGlass.length > 0) {  
+  //   // 鎻愬彇鏂扮殑鐭╁舰ID  
+  //   const newGlassIds = new Set(data.outGlass[0].map(rect => rect.glassId));  
+  //   // 杩囨护鍑哄凡瀛樺湪鐨勭煩褰�  
+  //   const existingRects = adjustedRectsb.value.filter(rect => newGlassIds.has(rect.glassId));  
+  //   // 璁$畻鏂扮殑鐭╁舰  
+  //   const newRects = data.outGlass[0].map(rect => {  
+  //     const scaleFactor =  1390/6000; 
+  //     const scaleFactory =  750/2800; 
+  //     let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta,newY;
+  // let newX = rect.yCoordinate; 
+  //     if (rect.width < rect.height) {
+  //       widtha = rect.height;
+  //       heighta = rect.width;
+  //     }else {
+  //       widtha = rect.width;
+  //       heighta = rect.height;
+  //     }
+  // if (rect.angle === 0) {  
+  //   adjustedWidth = widtha * scaleFactor;  
+  //   adjustedHeight = heighta * scaleFactory;  
+  //   // adjustedWidtha = widtha;  
+  //   // adjustedHeighta = heighta;  
+  //   // newX = 5190 - (rect.yCoordinate + widtha); 
+  //   newY = 2800 - (rect.xCoordinate + heighta); 
+  // } else {  
+  //   adjustedWidth = heighta * scaleFactor;  
+  //   adjustedHeight = widtha * scaleFactory;  
+  //   // adjustedWidtha = heighta;  
+  //   // adjustedHeighta = widtha;  
+  //   // newX = 5190 - (rect.yCoordinate + heighta);  
+  //   newY = 2800 - (rect.xCoordinate + widtha); 
+  // }  
+  // return {  
+  //       ...rect, // 澶嶅埗鍘熷瀵硅薄鐨勫叾浠栧睘鎬�  
+  //       x: newX * scaleFactor,
+  //       y: newY * scaleFactory,
+  //       width: adjustedWidth,  
+  //       height: adjustedHeight,  
+  //       widtha: rect.width, 
+  //       heighta: rect.height,
+  // }
+  //   });   
+  
+  //   // 鍚堝苟鏂版棫鐭╁舰锛屽苟淇濈暀 isActive 鐘舵��  
+  //   adjustedRectsb.value = existingRects.map(oldRect => {  
+  //     const newRect = newRects.find(r => r.glassId === oldRect.glassId);  
+  //     if (newRect) {  
+  //       return { ...oldRect, ...newRect, isActive: oldRect.isActive };  
+  //     }  
+  //     return oldRect; // 濡傛灉鏃х煩褰㈠湪鏂版暟鎹腑涓嶅瓨鍦紝浣嗕繚鐣欏湪newGlassIds涓紝鍒欎繚鐣欏師鏍�  
+  //   }).concat(newRects.filter(r => !existingRects.some(o => o.glassId === r.glassId)));  
+  // }  
   else if (data.outGlass == null) {
     adjustedRectsb.value = []
   }
@@ -798,16 +948,17 @@
         {{ $t('processCard.print') }}
       </el-button>
       <div v-if="dialogFormVisible">
-        <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 600px;"
-                 v-loading="loading">
-          <div style="width: 49%;float: right;background-color: #f4f4f5;height: 430px;">
-            <div v-if="adjustedRects1.length > 0">
+        <!-- 杩涚倝涓彸 -->
+        <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 800px;" v-loading="loading">
+          <!-- <div style="width:900px;background-color: #f4f4f5;height: 420px;"> -->
+            <!-- <div v-if="adjustedRects1.length > 0"> -->
+              <div v-if="currentPage === 1 && adjustedRects1.length > 0">
               <!-- <div style="text-align: center;">鐐夊彿锛歿{ 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="750px" style="background-color: #e9e9eb;">
     <div  style="position: relative;max-width: 1400px;">  
       <div  
       v-for="(rect, index) in adjustedRects1"
@@ -815,8 +966,8 @@
       @click="showDialog1(rect)"  
       class="rect"
       :style="{ position: 'absolute', 
-       top: `${rect.ycoordinate}px`, 
-       left: `${rect.xcoordinate}px`,
+       top: `${rect.y}px`, 
+       left: `${rect.x}px`,
         width: `${rect.width}px`, 
         height: `${rect.height}px`,
         backgroundColor: rect.isActive ? '#ADFF2F' : getRectColor1(rect.state) }">
@@ -829,12 +980,13 @@
    </div>
    </el-scrollbar>
    </div>
-  </div>
-<div style="width: 50%;float: left;background-color: #f4f4f5;height: 430px;">
-    <div v-if="adjustedRects2.length > 0">
+  <!-- </div> -->
+  <!-- 杩涚倝涓乏 -->
+<!-- <div style="width: 750px;float: left;background-color: #f4f4f5;height: 350px;"> -->
+    <!-- <div v-if="adjustedRects2.length > 0"> -->
+      <div v-else-if="currentPage === 2 && adjustedRects2.length > 0">
     <div style="text-align: center;"> {{ $t('processCard.temperinglayout') }}锛歿{ adjustedRects2[0].engineerId }}-{{ adjustedRects2[0].temperingLayoutId }} </div>
-    <!-- <div style="text-align: center;">鐐夊彿锛歿{ engineerIdDisplay2 }}-{{ adjustedRects[0].temperingLayoutId }}</div>   -->
-    <el-scrollbar height="430px" style="background-color: #e9e9eb;">
+    <el-scrollbar height="750px" style="background-color: #e9e9eb;">
     <div  style="position: relative;max-width: 1400px;">  
       <div  
       v-for="(rect, index) in adjustedRects2"
@@ -842,8 +994,8 @@
       @click="showDialog2(rect)"  
       class="rect"
       :style="{ position: 'absolute', 
-       top: `${rect.ycoordinate}px`, 
-       left: `${rect.xcoordinate}px`, 
+       top: `${rect.y}px`, 
+       left: `${rect.x}px`, 
        width: `${rect.width}px`, 
        height: `${rect.height}px`,
         backgroundColor: rect.isActive ? '#ADFF2F' : getRectColor2(rect.state) }">
@@ -856,8 +1008,17 @@
    </div>
    </el-scrollbar>
    </div>
-</div>
+<!-- </div> -->
    </el-card>
+   <div style="display: flex;margin-left: 40%;margin-bottom: 10px;">
+    <el-pagination
+        size="small"
+        background
+        layout="prev, pager, next"
+        :total="20"
+        @current-change="handlePageChange"
+      />
+  </div>
     </div>
 <div v-if="dialogFormVisiblea">
   <!-- 杩涚倝鍓� -->
@@ -867,7 +1028,7 @@
     <!-- <div style="text-align: center;">鐐夊彿锛歿{ engineerIdDisplaya }}-{{ adjustedRects[0].temperingLayoutId }}</div>   -->
       <el-scrollbar height="750px" style="background-color: #e9e9eb;">
     <div  style="position: relative;max-width: 1400px;">  
-      <div  
+      <div
       v-for="(rect, index) in adjustedRectsa"  
       :key="index"  
       @click="showDialoga(rect)"  
@@ -893,7 +1054,7 @@
     <div style="text-align: center;"> {{ $t('processCard.temperinglayout') }}锛歿{ adjustedRectsb[0].engineerId }}-{{ adjustedRectsb[0].temperingLayoutId }} </div>
     <!-- <div style="text-align: center;">鐐夊彿锛歿{ engineerIdDisplayb }}-{{ adjustedRects[0].temperingLayoutId }}</div>   -->
       <el-scrollbar height="750px" style="background-color: #e9e9eb;">
-    <div  style="position: relative;max-width: 1400px;">  
+    <div  style="position: relative;max-width: 1400px;">
       <div  
       v-for="(rect, index) in adjustedRectsb"  
       :key="index"  

--
Gitblit v1.8.0