From cbec6e3f120344f6f2d69808aaabb447bb52a693 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 22 八月 2024 09:45:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/PurchaseReturn/purchaseReturn.vue | 214 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 121 insertions(+), 93 deletions(-)
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index 3ab4e62..3d790cf 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -25,9 +25,10 @@
const socketUrl = `ws://${WebSocketHost}:${host}/api/temperingGlass/api/talk/temperingGlass`;
const handleMessage = (data) => {
// 杩涚倝涓�
- if(data.intoGlass!=null){
- adjustedRects1.value = data.intoGlass[0].map(rect => {
- console.log( adjustedRects1.value);
+ if(data.intoGlass2!=null){
+ adjustedRects2.value = data.intoGlass2[0].map(rect => {
+ isActive: false
+ const scaleFactor = 794.67/5087;
let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;;
let newX = rect.yCoordinate;
if (rect.width < rect.height) {
@@ -38,47 +39,35 @@
heighta = rect.height;
}
if (rect.angle === 0) {
- adjustedWidth = widtha * 0.12;
+ adjustedWidth = widtha * scaleFactor;
adjustedHeight = heighta * 0.1;
- adjustedWidtha = widtha;
- adjustedHeighta = heighta;
+ // adjustedWidtha = widtha;
+ // adjustedHeighta = heighta;
newX = 5087 - (rect.yCoordinate + widtha);
} else {
- adjustedWidth = heighta * 0.12;
+ adjustedWidth = heighta * scaleFactor;
adjustedHeight = widtha * 0.1;
- adjustedWidtha = heighta;
- adjustedHeighta = widtha;
- newX = 5087 - (rect.yCoordinate + heighta);
- }
- // if (rect.angle === 0) {
- // adjustedWidth = heighta * 0.12;
- // adjustedHeight = widtha * 0.1;
- // adjustedWidtha = heighta;
- // adjustedHeighta = widtha;
- // newX = 5087 - (rect.xCoordinate + heighta);
- // } else {
- // adjustedWidth = widtha * 0.12;
- // adjustedHeight = heighta * 0.1;
- // adjustedWidtha = widtha;
- // adjustedHeighta = heighta;
- // newX = 5087 - (rect.xCoordinate + widtha);
- // }
+ // adjustedWidtha = widtha;
+ // adjustedHeighta = heighta;
+ newX = 5087 - (rect.yCoordinate + heighta);
+ }
return {
...rect,
- xcoordinate: newX * 0.12,
+ xcoordinate: newX * scaleFactor,
ycoordinate: rect.xCoordinate * 0.1,
width: adjustedWidth,
height: adjustedHeight,
- widtha: adjustedWidtha,
- heighta: adjustedHeighta,
+ widtha: rect.width,
+ heighta: rect.height,
};
});
}else{
adjustedRects1.value = ''
}
- if(data.intoGlass2!=null){
- adjustedRects2.value = data.intoGlass2[0].map(rect => {
- console.log( adjustedRects2.value);
+ if(data.intoGlass!=null){
+ adjustedRects1.value = data.intoGlass[0].map(rect => {
+ isActive: false
+ const scaleFactor = 794.67/5087;
let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;;
let newX = rect.yCoordinate;
if (rect.width < rect.height) {
@@ -89,39 +78,26 @@
heighta = rect.height;
}
if (rect.angle === 0) {
- adjustedWidth = widtha * 0.12;
+ adjustedWidth = widtha * scaleFactor;
adjustedHeight = heighta * 0.1;
- adjustedWidtha = widtha;
- adjustedHeighta = heighta;
+ // adjustedWidtha = widtha;
+ // adjustedHeighta = heighta;
newX = 5087 - (rect.yCoordinate + widtha);
} else {
- adjustedWidth = heighta * 0.12;
+ adjustedWidth = heighta * scaleFactor;
adjustedHeight = widtha * 0.1;
- adjustedWidtha = heighta;
- adjustedHeighta = widtha;
+ // adjustedWidtha = widtha;
+ // adjustedHeighta = heighta;
newX = 5087 - (rect.yCoordinate + heighta);
- }
- // if (rect.angle === 0) {
- // adjustedWidth = heighta * 0.12;
- // adjustedHeight = widtha * 0.1;
- // adjustedWidtha = heighta;
- // adjustedHeighta = widtha;
- // newX = 5087 - (rect.xCoordinate + heighta);
- // } else {
- // adjustedWidth = widtha * 0.12;
- // adjustedHeight = heighta * 0.1;
- // adjustedWidtha = widtha;
- // adjustedHeighta = heighta;
- // newX = 5087 - (rect.xCoordinate + widtha);
- // }
+ }
return {
...rect,
- xcoordinate: newX * 0.12,
+ xcoordinate: newX * scaleFactor,
ycoordinate: rect.xCoordinate * 0.1,
width: adjustedWidth,
height: adjustedHeight,
- widtha: adjustedWidtha,
- heighta: adjustedHeighta,
+ widtha: rect.width,
+ heighta: rect.height,
};
});
}else{
@@ -130,6 +106,8 @@
// 杩涚倝鍓�
if(data.waitingGlass!=null){
adjustedRectsa.value = data.waitingGlass[0].map(rect => {
+ isActive: false
+ const scaleFactor = 1621.78/5190;
let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;;
let newX = rect.yCoordinate;
if (rect.width < rect.height) {
@@ -140,26 +118,26 @@
heighta = rect.height;
}
if (rect.angle === 0) {
- adjustedWidth = widtha * 0.24;
+ adjustedWidth = widtha * scaleFactor;
adjustedHeight = heighta * 0.16;
- adjustedWidtha = widtha;
- adjustedHeighta = heighta;
+ // adjustedWidtha = widtha;
+ // adjustedHeighta = heighta;
newX = 5190 - (rect.yCoordinate + widtha);
} else {
- adjustedWidth = heighta * 0.24;
+ adjustedWidth = heighta * scaleFactor;
adjustedHeight = widtha * 0.16;
- adjustedWidtha = heighta;
- adjustedHeighta = widtha;
+ // adjustedWidtha = widtha;
+ // adjustedHeighta = heighta;
newX = 5190 - (rect.yCoordinate + heighta);
}
return {
...rect,
- x: newX * 0.24,
+ x: newX * scaleFactor,
y: rect.xCoordinate * 0.16,
width: adjustedWidth,
height: adjustedHeight,
- widtha: adjustedWidtha,
- heighta: adjustedHeighta,
+ widtha: rect.width,
+ heighta: rect.height,
};
});
}else{
@@ -168,7 +146,10 @@
// 宸插嚭鐐�
if(data.outGlass!=null){
adjustedRectsb.value = data.outGlass[0].map(rect => {
- let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;;
+ isActive: false
+ const scaleFactor = 1621.78/5190;
+ const scaleFactory = 550/2800;
+ let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta,newY;
let newX = rect.yCoordinate;
if (rect.width < rect.height) {
widtha = rect.height;
@@ -178,26 +159,28 @@
heighta = rect.height;
}
if (rect.angle === 0) {
- adjustedWidth = widtha * 0.24;
- adjustedHeight = heighta * 0.16;
- adjustedWidtha = widtha;
- adjustedHeighta = heighta;
+ adjustedWidth = widtha * scaleFactor;
+ adjustedHeight = heighta * scaleFactory;
+ // adjustedWidtha = widtha;
+ // adjustedHeighta = heighta;
// newX = 5190 - (rect.yCoordinate + widtha);
+ newY = 2800 - (rect.xCoordinate + heighta);
} else {
- adjustedWidth = heighta * 0.24;
- adjustedHeight = widtha * 0.16;
- adjustedWidtha = heighta;
- adjustedHeighta = widtha;
+ adjustedWidth = heighta * scaleFactor;
+ adjustedHeight = widtha * scaleFactory;
+ // adjustedWidtha = heighta;
+ // adjustedHeighta = widtha;
// newX = 5190 - (rect.yCoordinate + heighta);
+ newY = 2800 - (rect.xCoordinate + widtha);
}
return {
...rect, // 澶嶅埗鍘熷瀵硅薄鐨勫叾浠栧睘鎬�
- x: newX * 0.24,
- y: rect.xCoordinate * 0.16,
+ x: newX * scaleFactor,
+ y: newY * scaleFactory,
width: adjustedWidth,
height: adjustedHeight,
- widtha: adjustedWidtha,
- heighta: adjustedHeighta,
+ widtha: rect.width,
+ heighta: rect.height,
};
});
}else{
@@ -248,11 +231,56 @@
// if (adjustedRects[0].engineerId != null) {
// engineerIdDisplay = adjustedRects[0].engineerId
// }
-function showDialog(rect) {
+function showDialog1(rect) {
currentGlassId.value = rect.glassId;
currenttemperingFeedSequence.value = rect.temperingFeedSequence;
blind.value = true;
-}
+ adjustedRects1.value = adjustedRects1.value.map(rect =>
+ rect.glass_id === glassId ? { ...rect, isActive: true } : rect
+ );
+}
+function showDialog2(rect) {
+ currentGlassId.value = rect.glassId;
+ currenttemperingFeedSequence.value = rect.temperingFeedSequence;
+ blind.value = true;
+ adjustedRects2.value = adjustedRects2.value.map(rect =>
+ rect.glass_id === glassId ? { ...rect, isActive: true } : rect
+ );
+}
+function showDialoga(rect) {
+ currentGlassId.value = rect.glassId;
+ currenttemperingFeedSequence.value = rect.temperingFeedSequence;
+ blind.value = true;
+ adjustedRectsa.value = adjustedRectsa.value.map(rect =>
+ rect.glass_id === glassId ? { ...rect, isActive: true } : rect
+ );
+}
+function showDialogb(rect) {
+ currentGlassId.value = rect.glassId;
+ currenttemperingFeedSequence.value = rect.temperingFeedSequence;
+ blind.value = true;
+ adjustedRectsb.value = adjustedRectsb.value.map(rect =>
+ rect.glass_id === glassId ? { ...rect, isActive: true } : rect
+ );
+}
+const handleDialogClose = () => {
+ adjustedRects1.value = adjustedRects1.value.map(rect => ({
+ ...rect,
+ isActive: false
+ }));
+ // adjustedRects2.value = adjustedRects2.value.map(rect => ({
+ // ...rect,
+ // isActive: false
+ // }));
+ // adjustedRectsa.value = adjustedRectsa.value.map(rect => ({
+ // ...rect,
+ // isActive: false
+ // }));
+ adjustedRectsb.value = adjustedRectsb.value.map(rect => ({
+ ...rect,
+ isActive: false
+ }));
+}
// 鐮存崯
const handleDamage = async () => {
try {
@@ -298,14 +326,14 @@
<div
v-for="(rect, index) in adjustedRects1"
:key="index"
- @click="showDialog(rect)"
+ @click="showDialog1(rect)"
class="rect"
:style="{ position: 'absolute',
top: `${rect.ycoordinate}px`,
left: `${rect.xcoordinate}px`,
width: `${rect.width}px`,
height: `${rect.height}px`,
- backgroundColor: rect.state === 5 ? '#911005' : 'lightblue' }"
+ backgroundColor: rect.isActive ? '#ADFF2F' : rect.state === 5 ? '#911005' : 'lightblue' }"
>
<div class="centered-text">
<div >{{ rect.glassId }}</div>
@@ -326,14 +354,14 @@
<div
v-for="(rect, index) in adjustedRects2"
:key="index"
- @click="showDialog(rect)"
+ @click="showDialog2(rect)"
class="rect"
:style="{ position: 'absolute',
top: `${rect.ycoordinate}px`,
left: `${rect.xcoordinate}px`,
width: `${rect.width}px`,
height: `${rect.height}px`,
- backgroundColor: rect.state === 5 ? '#911005' : 'lightblue' }"
+ backgroundColor: rect.isActive ? '#ADFF2F' : rect.state === 5 ? '#911005' : 'lightblue' }"
>
<div class="centered-text">
<div >{{ rect.glassId }}</div>
@@ -358,11 +386,11 @@
<div
v-for="(rect, index) in adjustedRectsa"
:key="index"
- @click="showDialog(rect)"
+ @click="showDialoga(rect)"
class="rect"
:style="{ position: 'absolute', top: `${rect.y}px`, left: `${rect.x}px`,
width: `${rect.width}px`, height: `${rect.height}px`,
- backgroundColor: getRectColora(rect.state) }">
+ backgroundColor: rect.isActive ? '#ADFF2F' : getRectColora(rect.state) }">
<div class="centered-text">
<div>{{ rect.glassId }}</div>
<div >{{ rect.flowCardId }}</div>
@@ -385,11 +413,11 @@
<div
v-for="(rect, index) in adjustedRectsb"
:key="index"
- @click="showDialog(rect)"
+ @click="showDialogb(rect)"
class="rect"
:style="{ position: 'absolute', top: `${rect.y}px`, left: `${rect.x}px`,
width: `${rect.width}px`, height: `${rect.height}px`,
- backgroundColor: getRectColorb(rect.state) }">
+ backgroundColor: rect.isActive ? '#ADFF2F' : getRectColorb(rect.state) }">
<!-- backgroundColor: rect.state === 4 ? '#911005' : '#f8e3c5' }"> -->
<div class="centered-text">
<div >{{ rect.glassId }}</div>
@@ -402,8 +430,8 @@
</div>
</el-card>
</div>
-
-<el-dialog v-model="blind" top="30vh" width="15%" style="text-align: center;">
+
+<el-dialog v-model="blind" top="30vh" width="15%" style="text-align: center;" @close="handleDialogClose">
<el-button type="warning" plain :icon="Delete" @click="handleDamage" style="width: 140px;margin-left: 10px;">
{{ $t('order.dilapidation') }}
</el-button>
@@ -416,8 +444,8 @@
background-color: #529b2e;
text-align: center;
display: inline-block;
- /* align-items:center; */
- /* justify-content:center; */
+ /* align-items:center; */
+ /* justify-content:center; */
margin-left: 20px;
}
#boxb{
@@ -426,16 +454,16 @@
/* display:flex; */
text-align: center;
display: inline-block;
- align-items:center;
- justify-content:center;
+ align-items:center;
+ justify-content:center;
margin-left: 20px;
}
#box{
border: 1px solid black;
background-color: #337ecc;
display:flex;
- align-items:center;
- justify-content:center;
+ align-items:center;
+ justify-content:center;
}
#home-card {
width: 100%;
--
Gitblit v1.8.0