From 03c894b105bff46879625b67cdebc8c2d947d29f Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 22 八月 2024 11:31:24 +0800
Subject: [PATCH] 修改流程卡打印样式，根据线路添加在磨边队列查不到时查所有线队列数据
---
UI-Project/src/views/PurchaseReturn/purchaseReturn.vue | 324 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 216 insertions(+), 108 deletions(-)
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index ee5825e..3d790cf 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -16,7 +16,7 @@
const blind = ref(false)
const width = ref();
const height = ref();
-const adjustedRects = ref([]);
+const adjustedRects1 = ref([]);
const adjustedRects2 = ref([]);
const adjustedRectsa = ref([]);
const adjustedRectsb = ref([]);
@@ -25,120 +25,167 @@
const socketUrl = `ws://${WebSocketHost}:${host}/api/temperingGlass/api/talk/temperingGlass`;
const handleMessage = (data) => {
// 杩涚倝涓�
- if(data.intoGlass!=null){
- adjustedRects.value = data.intoGlass[0].map(rect => {
- let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta;
- 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.12;
- adjustedHeight = rect.height * 0.1;
- adjustedWidtha = rect.width;
- adjustedHeighta = rect.height;
- newX = 5087 - (rect.xCoordinate + rect.width);
- }
- return {
- ...rect,
- xcoordinate: newX * 0.12,
- ycoordinate: rect.yCoordinate * 0.1,
- width: adjustedWidth,
- height: adjustedHeight,
- widtha: adjustedWidtha,
- heighta: adjustedHeighta,
- };
- });
- }
if(data.intoGlass2!=null){
adjustedRects2.value = data.intoGlass2[0].map(rect => {
- let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta;
- let newX = rect.yCoordinate;
+ isActive: false
+ const scaleFactor = 794.67/5087;
+ 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 = 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.12;
- adjustedHeight = rect.height * 0.1;
- adjustedWidtha = rect.width;
- adjustedHeighta = rect.height;
- newX = 5087 - (rect.xCoordinate + rect.width);
- }
+ adjustedWidth = widtha * scaleFactor;
+ adjustedHeight = heighta * 0.1;
+ // adjustedWidtha = widtha;
+ // adjustedHeighta = heighta;
+ newX = 5087 - (rect.yCoordinate + widtha);
+ } else {
+ adjustedWidth = heighta * scaleFactor;
+ adjustedHeight = widtha * 0.1;
+ // adjustedWidtha = widtha;
+ // adjustedHeighta = heighta;
+ newX = 5087 - (rect.yCoordinate + heighta);
+ }
return {
...rect,
- xcoordinate: newX * 0.12,
- ycoordinate: rect.yCoordinate * 0.1,
+ 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.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) {
+ widtha = rect.height;
+ heighta = rect.width;
+ }else {
+ widtha = rect.width;
+ heighta = rect.height;
+ }
+ if (rect.angle === 0) {
+ adjustedWidth = widtha * scaleFactor;
+ adjustedHeight = heighta * 0.1;
+ // adjustedWidtha = widtha;
+ // adjustedHeighta = heighta;
+ newX = 5087 - (rect.yCoordinate + widtha);
+ } else {
+ adjustedWidth = heighta * scaleFactor;
+ adjustedHeight = widtha * 0.1;
+ // adjustedWidtha = widtha;
+ // adjustedHeighta = heighta;
+ newX = 5087 - (rect.yCoordinate + heighta);
+ }
+ return {
+ ...rect,
+ xcoordinate: newX * scaleFactor,
+ ycoordinate: rect.xCoordinate * 0.1,
+ width: adjustedWidth,
+ height: adjustedHeight,
+ widtha: rect.width,
+ heighta: rect.height,
+ };
+ });
+ }else{
+ adjustedRects2.value = ''
}
// 杩涚倝鍓�
if(data.waitingGlass!=null){
adjustedRectsa.value = data.waitingGlass[0].map(rect => {
- let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta;
+ isActive: false
+ const scaleFactor = 1621.78/5190;
+ 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 = rect.width * 0.24;
- adjustedHeight = rect.height * 0.16;
- adjustedWidtha = rect.width;
- adjustedHeighta = rect.height;
- newX = 5190 - (rect.yCoordinate + rect.width);
+ adjustedWidth = widtha * scaleFactor;
+ adjustedHeight = heighta * 0.16;
+ // adjustedWidtha = widtha;
+ // adjustedHeighta = heighta;
+ newX = 5190 - (rect.yCoordinate + widtha);
} else {
- adjustedWidth = rect.height * 0.24;
- adjustedHeight = rect.width * 0.16;
- adjustedWidtha = rect.height;
- adjustedHeighta = rect.width;
- newX = 5190 - (rect.yCoordinate + rect.height);
+ adjustedWidth = heighta * scaleFactor;
+ adjustedHeight = widtha * 0.16;
+ // 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{
+ adjustedRectsa.value = ''
+ }
// 宸插嚭鐐�
if(data.outGlass!=null){
adjustedRectsb.value = data.outGlass[0].map(rect => {
- let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta;
+ 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;
+ heighta = rect.width;
+ }else {
+ widtha = rect.width;
+ heighta = rect.height;
+ }
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);
+ adjustedWidth = widtha * scaleFactor;
+ adjustedHeight = heighta * scaleFactory;
+ // adjustedWidtha = widtha;
+ // adjustedHeighta = heighta;
+ // newX = 5190 - (rect.yCoordinate + widtha);
+ newY = 2800 - (rect.xCoordinate + heighta);
} else {
- adjustedWidth = rect.height * 0.24;
- adjustedHeight = rect.width * 0.16;
- adjustedWidtha = rect.height;
- adjustedHeighta = rect.width;
- newX = 5190 - (rect.yCoordinate + rect.height);
+ 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{
+ adjustedRectsb.value = ''
+ }
};
onMounted(() => {
initializeWebSocket(socketUrl, handleMessage);
@@ -153,11 +200,11 @@
function getRectColora(state) {
switch (state) {
case 0:
- return '#d1edc4';
+ return '#7AC5CD';
case 1:
- return '#E6E6FA';
+ return '#95d475';
case -1:
- return '#dedfe0';
+ return '#CDAF95';
case 5:
return '#911005';
}
@@ -165,18 +212,75 @@
function getRectColorb(state) {
switch (state) {
case 3:
- return '#f8e3c5';
+ return '#eebe77';
case 4:
- return '#F0F8FF';
+ return '#CD6090';
case 5:
return '#911005';
}
}
-function showDialog(rect) {
+// if (adjustedRectsb[0].engineerId != null) {
+// engineerIdDisplayb = adjustedRectsb[0].engineerId
+// }
+// if (adjustedRectsa[0].engineerId != null) {
+// engineerIdDisplaya = adjustedRectsa[0].engineerId
+// }
+// if (adjustedRects2[0].engineerId != null) {
+// engineerIdDisplay2 = adjustedRects2[0].engineerId
+// }
+// if (adjustedRects[0].engineerId != null) {
+// engineerIdDisplay = adjustedRects[0].engineerId
+// }
+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 {
@@ -214,21 +318,22 @@
<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: left;background-color: #f4f4f5;height: 550px;">
- <div v-if="adjustedRects.length > 0">
- <div style="text-align: center;">鐐夊彿锛歿{ adjustedRects[0].engineerId }}-{{ adjustedRects[0].temperingLayoutId }}</div>
+ <div v-if="adjustedRects1.length > 0">
+ <!-- <div style="text-align: center;">鐐夊彿锛歿{ engineerIdDisplay }}-{{ adjustedRects[0].temperingLayoutId }}</div> -->
+ <div style="text-align: center;"> 鐐夊彿锛歿{ adjustedRects1[0].engineerId }}-{{ adjustedRects1[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"
+ 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>
@@ -242,20 +347,21 @@
</div>
<div style="width: 49%;float: right;background-color: #f4f4f5;height: 550px;">
<div v-if="adjustedRects2.length > 0">
- <div style="text-align: center;">鐐夊彿锛歿{ adjustedRects[0].engineerId }}-{{ adjustedRects[0].temperingLayoutId }}</div>
+ <div style="text-align: center;"> 鐐夊彿锛歿{ adjustedRects2[0].engineerId }}-{{ adjustedRects2[0].temperingLayoutId }} </div>
+ <!-- <div style="text-align: center;">鐐夊彿锛歿{ engineerIdDisplay2 }}-{{ 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"
- @click="showDialog(rect)"
+ :key="index"
+ @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>
@@ -273,17 +379,18 @@
<!-- 杩涚倝鍓� -->
<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;">鐐夊彿锛歿{ adjustedRects[0].engineerId }}-{{ adjustedRects[0].temperingLayoutId }}</div>
+ <div style="text-align: center;"> 鐐夊彿锛歿{ adjustedRectsa[0].engineerId }}-{{ adjustedRectsa[0].temperingLayoutId }} </div>
+ <!-- <div style="text-align: center;">鐐夊彿锛歿{ engineerIdDisplaya }}-{{ 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 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>
@@ -299,17 +406,18 @@
<!-- 宸插嚭鐐� -->
<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;">鐐夊彿锛歿{ adjustedRects[0].engineerId }}-{{ adjustedRects[0].temperingLayoutId }}</div>
+ <div style="text-align: center;"> 鐐夊彿锛歿{ adjustedRectsb[0].engineerId }}-{{ adjustedRectsb[0].temperingLayoutId }} </div>
+ <!-- <div style="text-align: center;">鐐夊彿锛歿{ engineerIdDisplayb }}-{{ 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"
- @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>
@@ -322,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>
@@ -336,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{
@@ -346,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