From b6c7e996491ab34cc2d772e3ece137de81f2e9f7 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 24 七月 2024 13:21:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/PurchaseReturn/purchaseReturn.vue | 131 ++++++++++++++++++++++++++-----------------
1 files changed, 80 insertions(+), 51 deletions(-)
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index 80847ed..42ec676 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -12,6 +12,7 @@
const dialogFormVisible = ref(false)
const dialogFormVisiblea = ref(true)
const dialogFormVisibleb = ref(false)
+const blind = ref(false)
const width = ref();
const height = ref();
const adjustedRects = ref([]);
@@ -24,21 +25,24 @@
if(data.intoGlass!=null){
adjustedRects.value = data.intoGlass[0].map(rect => {
let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta;
- if (rect.angle === 90) {
- adjustedWidth = rect.height * 0.3;
- adjustedHeight = rect.width * 0.3;
+ 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.3;
- adjustedHeight = rect.height * 0.3;
+ 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.3,
- ycoordinate: rect.yCoordinate * 0.3,
+ xcoordinate: newX * 0.12,
+ ycoordinate: rect.yCoordinate * 0.1,
width: adjustedWidth,
height: adjustedHeight,
widtha: adjustedWidtha,
@@ -49,21 +53,24 @@
if(data.intoGlass2!=null){
adjustedRects2.value = data.intoGlass2[0].map(rect => {
let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta;
- if (rect.angle === 90) {
- adjustedWidth = rect.height * 0.3;
- adjustedHeight = rect.width * 0.3;
+ 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.3;
- adjustedHeight = rect.height * 0.3;
+ 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.3,
- ycoordinate: rect.yCoordinate * 0.3,
+ xcoordinate: newX * 0.12,
+ ycoordinate: rect.yCoordinate * 0.1,
width: adjustedWidth,
height: adjustedHeight,
widtha: adjustedWidtha,
@@ -74,22 +81,25 @@
// 杩涚倝鍓�
if(data.waitingGlass!=null){
adjustedRectsa.value = data.waitingGlass[0].map(rect => {
- let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta;
- if (rect.angle === 90) {
- adjustedWidth = rect.width * 0.27;
- adjustedHeight = rect.height * 0.2;
+ let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta;
+ let newX = rect.yCoordinate;
+ if (rect.angle === 0) {
+ adjustedWidth = rect.width * 0.24;
+ adjustedHeight = rect.height * 0.16;
adjustedWidtha = rect.width;
adjustedHeighta = rect.height;
- } else {
- adjustedWidth = rect.height * 0.27;
- adjustedHeight = rect.width * 0.2;
+ 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.27,
- y: rect.xCoordinate * 0.2,
+ x: newX * 0.24,
+ y: rect.xCoordinate * 0.16,
width: adjustedWidth,
height: adjustedHeight,
widtha: adjustedWidtha,
@@ -101,21 +111,24 @@
if(data.outGlass!=null){
adjustedRectsb.value = data.outGlass[0].map(rect => {
let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta;
- if (rect.angle === 90) {
- adjustedWidth = rect.width * 0.4;
- adjustedHeight = rect.height * 0.4;
+ let newX = rect.yCoordinate;
+ if (rect.angle === 0) {
+ 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.4;
- adjustedHeight = rect.width * 0.4;
+ 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.4,
- y: rect.xCoordinate * 0.4,
+ x: newX * 0.24,
+ y: rect.xCoordinate * 0.16,
width: adjustedWidth,
height: adjustedHeight,
widtha: adjustedWidtha,
@@ -137,6 +150,9 @@
return '#dedfe0';
}
}
+function showDialog(row) {
+ blind.value = true;
+}
onBeforeUnmount(() => {
console.log("鍏抽棴浜�")
closeWebSocket();
@@ -151,9 +167,9 @@
<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="position: relative;width: 1400px;">
+ <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"
:key="index"
@@ -162,7 +178,8 @@
>
<div class="centered-text">
<div >{{ rect.glassId }}</div>
- <div style="margin-top: 50px;margin-left: -85px;">{{ rect.widtha }}*{{ rect.heighta }}</div>
+ <div >{{ rect.flowCardId }}</div>
+ <div>{{ rect.widtha }}*{{ rect.heighta }}</div>
</div>
</div>
</div>
@@ -171,9 +188,9 @@
</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="position: relative;width: 1400px;">
+ <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"
:key="index"
@@ -182,7 +199,8 @@
>
<div class="centered-text">
<div >{{ rect.glassId }}</div>
- <div style="margin-top: 50px;margin-left: -85px;">{{ rect.widtha }}*{{ rect.heighta }}</div>
+ <div >{{ rect.flowCardId }}</div>
+ <div>{{ rect.widtha }}*{{ rect.heighta }}</div>
</div>
</div>
</div>
@@ -193,21 +211,24 @@
</div>
<div v-if="dialogFormVisiblea">
<!-- 杩涚倝鍓� -->
- <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;" v-loading="loading">
+ <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="position: relative;width: 1400px;">
+ <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"
:key="index"
+ @click="showDialog"
class="rect"
:style="{ position: 'absolute', top: `${rect.y}px`, left: `${rect.x}px`,
width: `${rect.width}px`, height: `${rect.height}px`,
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>
+ <div >{{ rect.flowCardId }}</div>
+ <div>{{ rect.widtha }}*{{ rect.heighta }}</div>
</div>
</div>
</div>
@@ -217,11 +238,11 @@
</div>
<div v-if="dialogFormVisibleb">
<!-- 宸插嚭鐐� -->
- <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;" v-loading="loading">
+ <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="position: relative;width: 1400px;">
+ <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"
:key="index"
@@ -231,7 +252,8 @@
backgroundColor: rect.state === 4 ? '#911005' : '#f8e3c5' }">
<div class="centered-text">
<div >{{ rect.glassId }}</div>
- <div style="margin-top: 50px;margin-left: -85px;">{{ rect.widtha }}*{{ rect.heighta }}</div>
+ <div >{{ rect.flowCardId }}</div>
+ <div>{{ rect.widtha }}*{{ rect.heighta }}</div>
</div>
</div>
</div>
@@ -239,6 +261,12 @@
</div>
</el-card>
</div>
+
+<el-dialog v-model="blind" top="30vh" width="15%" style="text-align: center;">
+ <el-button type="warning" plain :icon="Delete" @click="handleDamage(currentGlassId)" style="width: 140px;margin-left: 10px;">
+ {{ $t('order.dilapidation') }}
+ </el-button>
+ </el-dialog>
</div>
</template>
<style scoped>
@@ -316,9 +344,10 @@
}
.centered-text {
/* 璁剧疆鏂囧瓧灞呬腑鏍峰紡 */
- display: flex;
+ /* display: flex; */
justify-content: center;
align-items: center;
height: 100%; /* 纭繚div鍗犳嵁鏁翠釜鐭╁舰鐨勯珮搴� */
+ font-size: small;
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0