From e90b0a04595e4de46802572bd5d7c6d9293ce2f2 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 22 七月 2024 14:59:21 +0800
Subject: [PATCH] 改变进炉前的颜色，将进炉前、进炉后旋转
---
UI-Project/src/views/PurchaseReturn/purchaseStorage.vue | 12 ++++++------
UI-Project/src/views/PurchaseReturn/purchaseReturn.vue | 46 ++++++++++++++++++++++++++++------------------
2 files changed, 34 insertions(+), 24 deletions(-)
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index d22626b..80847ed 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -76,20 +76,20 @@
adjustedRectsa.value = data.waitingGlass[0].map(rect => {
let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta;
if (rect.angle === 90) {
- adjustedWidth = rect.height * 0.4;
- adjustedHeight = rect.width * 0.4;
- adjustedWidtha = rect.height;
- adjustedHeighta = rect.width;
- } else {
- adjustedWidth = rect.width * 0.4;
- adjustedHeight = rect.height * 0.4;
+ adjustedWidth = rect.width * 0.27;
+ adjustedHeight = rect.height * 0.2;
adjustedWidtha = rect.width;
adjustedHeighta = rect.height;
+ } else {
+ adjustedWidth = rect.height * 0.27;
+ adjustedHeight = rect.width * 0.2;
+ adjustedWidtha = rect.height;
+ adjustedHeighta = rect.width;
}
return {
...rect,
- x: rect.xCoordinate * 0.4,
- y: rect.yCoordinate * 0.4,
+ x: rect.yCoordinate * 0.27,
+ y: rect.xCoordinate * 0.2,
width: adjustedWidth,
height: adjustedHeight,
widtha: adjustedWidtha,
@@ -102,20 +102,20 @@
adjustedRectsb.value = data.outGlass[0].map(rect => {
let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta;
if (rect.angle === 90) {
- adjustedWidth = rect.height * 0.4;
- adjustedHeight = rect.width * 0.4;
- adjustedWidtha = rect.height;
- adjustedHeighta = rect.width;
- } else {
adjustedWidth = rect.width * 0.4;
adjustedHeight = rect.height * 0.4;
adjustedWidtha = rect.width;
adjustedHeighta = rect.height;
+ } else {
+ adjustedWidth = rect.height * 0.4;
+ adjustedHeight = rect.width * 0.4;
+ adjustedWidtha = rect.height;
+ adjustedHeighta = rect.width;
}
return {
...rect, // 澶嶅埗鍘熷瀵硅薄鐨勫叾浠栧睘鎬�
- x: rect.xCoordinate * 0.4,
- y: rect.yCoordinate * 0.4,
+ x: rect.yCoordinate * 0.4,
+ y: rect.xCoordinate * 0.4,
width: adjustedWidth,
height: adjustedHeight,
widtha: adjustedWidtha,
@@ -127,6 +127,16 @@
onMounted(() => {
initializeWebSocket(socketUrl, handleMessage);
});
+function getRectColor(state) {
+ switch (state) {
+ case 0:
+ return '#f8e3c5';
+ case 1:
+ return '#d1edc4';
+ case -1:
+ return '#dedfe0';
+ }
+}
onBeforeUnmount(() => {
console.log("鍏抽棴浜�")
closeWebSocket();
@@ -187,14 +197,14 @@
<div v-if="adjustedRectsa.length > 0">
<div style="text-align: center;">娴佺▼鍗�: {{ adjustedRectsa[0].flowCardId }}</div>
<el-scrollbar height="550px">
- <div style="position: relative;width: 100%;height: 100%;">
+ <div style="position: relative;width: 1400px;">
<div
v-for="(rect, index) in adjustedRectsa"
:key="index"
class="rect"
:style="{ position: 'absolute', top: `${rect.y}px`, left: `${rect.x}px`,
width: `${rect.width}px`, height: `${rect.height}px`,
- backgroundColor: rect.state === 0 ? '#dedfe0' : '#d1edc4' }">
+ backgroundColor: getRectColor(rect.state) }">
<div class="centered-text">
<div>{{ rect.glassId }}</div>
<div style="margin-top: 50px;margin-left: -85px;">{{ rect.widtha }}*{{ rect.heighta }}</div>
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
index c152ac3..be8a2b0 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
@@ -33,20 +33,20 @@
adjustedRects.value = data.overGlass[0].map(rect => {
let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta;
if (rect.angle === 90) {
- adjustedWidth = rect.height * 0.3;
- adjustedHeight = rect.width * 0.3;
+ adjustedWidth = rect.height * 0.2;
+ adjustedHeight = rect.width * 0.2;
adjustedWidtha = rect.height;
adjustedHeighta = rect.width;
} else {
- adjustedWidth = rect.width * 0.3;
- adjustedHeight = rect.height * 0.3;
+ adjustedWidth = rect.width * 0.2;
+ adjustedHeight = rect.height * 0.2;
adjustedWidtha = rect.width;
adjustedHeighta = rect.height;
}
return {
...rect, // 澶嶅埗鍘熷瀵硅薄鐨勫叾浠栧睘鎬�
- xcoordinate: rect.xCoordinate * 0.3,
- ycoordinate: rect.yCoordinate * 0.3,
+ xcoordinate: rect.xCoordinate * 0.2,
+ ycoordinate: rect.yCoordinate * 0.2,
width: adjustedWidth,
height: adjustedHeight,
widtha: adjustedWidtha,
--
Gitblit v1.8.0