From 23d44ea65449f4bfd81d92ab2fe0a866348d289b Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 23 七月 2024 16:02:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/PurchaseReturn/purchaseReturn.vue | 69 +++++++++++++++++++++-------------
1 files changed, 43 insertions(+), 26 deletions(-)
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index 202df31..42ec676 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -25,20 +25,23 @@
if(data.intoGlass!=null){
adjustedRects.value = data.intoGlass[0].map(rect => {
let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta;
- if (rect.angle === 0) {
- adjustedWidth = rect.height * 0.13;
+ let newX = rect.yCoordinate;
+ if (rect.angle === 0) {
+ adjustedWidth = rect.height * 0.12;
adjustedHeight = rect.width * 0.1;
adjustedWidtha = rect.height;
adjustedHeighta = rect.width;
+ newX = 5087 - (rect.xCoordinate + rect.height);
} else {
- adjustedWidth = rect.width * 0.13;
+ adjustedWidth = rect.width * 0.12;
adjustedHeight = rect.height * 0.1;
adjustedWidtha = rect.width;
adjustedHeighta = rect.height;
+ newX = 5087 - (rect.xCoordinate + rect.width);
}
return {
...rect,
- xcoordinate: rect.xCoordinate * 0.13,
+ xcoordinate: newX * 0.12,
ycoordinate: rect.yCoordinate * 0.1,
width: adjustedWidth,
height: adjustedHeight,
@@ -50,20 +53,23 @@
if(data.intoGlass2!=null){
adjustedRects2.value = data.intoGlass2[0].map(rect => {
let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta;
- if (rect.angle === 0) {
- adjustedWidth = rect.height * 0.13;
+ let newX = rect.yCoordinate;
+ if (rect.angle === 0) {
+ adjustedWidth = rect.height * 0.12;
adjustedHeight = rect.width * 0.1;
adjustedWidtha = rect.height;
adjustedHeighta = rect.width;
- } else {
- adjustedWidth = rect.width * 0.13;
+ newX = 5087 - (rect.xCoordinate + rect.height);
+ } else {
+ adjustedWidth = rect.width * 0.12;
adjustedHeight = rect.height * 0.1;
adjustedWidtha = rect.width;
adjustedHeighta = rect.height;
- }
+ newX = 5087 - (rect.xCoordinate + rect.width);
+ }
return {
...rect,
- xcoordinate: rect.xCoordinate * 0.13,
+ xcoordinate: newX * 0.12,
ycoordinate: rect.yCoordinate * 0.1,
width: adjustedWidth,
height: adjustedHeight,
@@ -75,21 +81,24 @@
// 杩涚倝鍓�
if(data.waitingGlass!=null){
adjustedRectsa.value = data.waitingGlass[0].map(rect => {
- let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta;
+ let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta;
+ let newX = rect.yCoordinate;
if (rect.angle === 0) {
- adjustedWidth = rect.width * 0.25;
+ adjustedWidth = rect.width * 0.24;
adjustedHeight = rect.height * 0.16;
adjustedWidtha = rect.width;
adjustedHeighta = rect.height;
- } else {
- adjustedWidth = rect.height * 0.25;
+ newX = 5190 - (rect.yCoordinate + rect.width);
+ } else {
+ adjustedWidth = rect.height * 0.24;
adjustedHeight = rect.width * 0.16;
adjustedWidtha = rect.height;
adjustedHeighta = rect.width;
+ newX = 5190 - (rect.yCoordinate + rect.height);
}
return {
...rect,
- x: rect.yCoordinate * 0.25,
+ x: newX * 0.24,
y: rect.xCoordinate * 0.16,
width: adjustedWidth,
height: adjustedHeight,
@@ -102,20 +111,23 @@
if(data.outGlass!=null){
adjustedRectsb.value = data.outGlass[0].map(rect => {
let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta;
+ let newX = rect.yCoordinate;
if (rect.angle === 0) {
- adjustedWidth = rect.width * 0.25;
+ adjustedWidth = rect.width * 0.24;
adjustedHeight = rect.height * 0.16;
adjustedWidtha = rect.width;
adjustedHeighta = rect.height;
+ newX = 5190 - (rect.yCoordinate + rect.width);
} else {
- adjustedWidth = rect.height * 0.25;
+ adjustedWidth = rect.height * 0.24;
adjustedHeight = rect.width * 0.16;
adjustedWidtha = rect.height;
adjustedHeighta = rect.width;
+ newX = 5190 - (rect.yCoordinate + rect.height);
}
return {
...rect, // 澶嶅埗鍘熷瀵硅薄鐨勫叾浠栧睘鎬�
- x: rect.yCoordinate * 0.25,
+ x: newX * 0.24,
y: rect.xCoordinate * 0.16,
width: adjustedWidth,
height: adjustedHeight,
@@ -155,8 +167,8 @@
<el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 600px;" v-loading="loading">
<div style="width: 49%;float: left;background-color: #f4f4f5;height: 550px;">
<div v-if="adjustedRects.length > 0">
- <div style="text-align: center;">娴佺▼鍗�: {{ adjustedRects[0].flowCardId }}</div>
- <el-scrollbar height="630px">
+ <div style="text-align: center;">鐐夊彿锛歿{ adjustedRects[0].engineerId }}-{{ adjustedRects[0].temperingLayoutId }}</div>
+ <el-scrollbar height="550px" style="background-color: #e9e9eb;">
<div style="position: relative;max-width: 1400px;">
<div
v-for="(rect, index) in adjustedRects"
@@ -166,6 +178,7 @@
>
<div class="centered-text">
<div >{{ rect.glassId }}</div>
+ <div >{{ rect.flowCardId }}</div>
<div>{{ rect.widtha }}*{{ rect.heighta }}</div>
</div>
</div>
@@ -175,8 +188,8 @@
</div>
<div style="width: 49%;float: right;background-color: #f4f4f5;height: 550px;">
<div v-if="adjustedRects2.length > 0">
- <div style="text-align: center;">娴佺▼鍗�: {{ adjustedRects2[0].flowCardId }}</div>
- <el-scrollbar height="550px">
+ <div style="text-align: center;">鐐夊彿锛歿{ adjustedRects[0].engineerId }}-{{ adjustedRects[0].temperingLayoutId }}</div>
+ <el-scrollbar height="550px" style="background-color: #e9e9eb;">
<div style="position: relative;max-width: 1400px;">
<div
v-for="(rect, index) in adjustedRects2"
@@ -186,6 +199,7 @@
>
<div class="centered-text">
<div >{{ rect.glassId }}</div>
+ <div >{{ rect.flowCardId }}</div>
<div>{{ rect.widtha }}*{{ rect.heighta }}</div>
</div>
</div>
@@ -199,8 +213,9 @@
<!-- 杩涚倝鍓� -->
<el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 600px;" v-loading="loading">
<div v-if="adjustedRectsa.length > 0">
- <div style="text-align: center;">娴佺▼鍗�: {{ adjustedRectsa[0].flowCardId }}</div>
- <el-scrollbar height="550px">
+ <div style="text-align: center;">鐐夊彿锛歿{ adjustedRects[0].engineerId }}-{{ adjustedRects[0].temperingLayoutId }}</div>
+ <!-- <div style="text-align: center;">娴佺▼鍗�: {{ adjustedRectsa[0].flowCardId }}</div> -->
+ <el-scrollbar height="550px" style="background-color: #e9e9eb;">
<div style="position: relative;max-width: 1400px;">
<div
v-for="(rect, index) in adjustedRectsa"
@@ -212,6 +227,7 @@
backgroundColor: getRectColor(rect.state) }">
<div class="centered-text">
<div>{{ rect.glassId }}</div>
+ <div >{{ rect.flowCardId }}</div>
<div>{{ rect.widtha }}*{{ rect.heighta }}</div>
</div>
</div>
@@ -224,8 +240,8 @@
<!-- 宸插嚭鐐� -->
<el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 600px;" v-loading="loading">
<div v-if="adjustedRectsb.length > 0">
- <div style="text-align: center;">娴佺▼鍗�: {{ adjustedRectsb[0].flowCardId }}</div>
- <el-scrollbar height="550px">
+ <div style="text-align: center;">鐐夊彿锛歿{ adjustedRects[0].engineerId }}-{{ adjustedRects[0].temperingLayoutId }}</div>
+ <el-scrollbar height="550px" style="background-color: #e9e9eb;">
<div style="position: relative;max-width: 1400px;">
<div
v-for="(rect, index) in adjustedRectsb"
@@ -236,6 +252,7 @@
backgroundColor: rect.state === 4 ? '#911005' : '#f8e3c5' }">
<div class="centered-text">
<div >{{ rect.glassId }}</div>
+ <div >{{ rect.flowCardId }}</div>
<div>{{ rect.widtha }}*{{ rect.heighta }}</div>
</div>
</div>
--
Gitblit v1.8.0