From 7fd37a99f4bf0a3f2955e60436c63e59b58054f4 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期六, 10 八月 2024 09:10:11 +0800
Subject: [PATCH] 新增自动报工功能，磨边队列，下片队列增加查询条件
---
UI-Project/src/views/PurchaseReturn/purchaseReturn.vue | 239 +++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 165 insertions(+), 74 deletions(-)
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index ee5825e..5a991d4 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -3,7 +3,7 @@
import {reactive} from "vue";
import {useRouter} from "vue-router"
import request from "@/utils/request"
-import { ref, onMounted, onBeforeUnmount } from 'vue';
+import { ref, onMounted, onBeforeUnmount,onUnmounted } from 'vue';
import { WebSocketHost ,host} from '@/utils/constants'
import { ElMessage, ElMessageBox } from 'element-plus'
import { initializeWebSocket, closeWebSocket } from '@/utils/WebSocketService';
@@ -16,88 +16,142 @@
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([]);
const currentGlassId = ref(null);
const currenttemperingFeedSequence = ref(null);
+let socket = null;
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;
+ adjustedRects1.value = data.intoGlass[0].map(rect => {
+ console.log( adjustedRects1.value);
+ let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;;
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);
- }
+ if (rect.width < rect.height) {
+ widtha = rect.height;
+ heighta = rect.width;
+ }else {
+ widtha = rect.width;
+ heighta = rect.height;
+ }
+ if (rect.angle === 0) {
+ adjustedWidth = widtha * 0.12;
+ adjustedHeight = heighta * 0.1;
+ adjustedWidtha = widtha;
+ adjustedHeighta = heighta;
+ newX = 5087 - (rect.yCoordinate + widtha);
+ } else {
+ adjustedWidth = heighta * 0.12;
+ 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);
+ // }
return {
...rect,
xcoordinate: newX * 0.12,
- ycoordinate: rect.yCoordinate * 0.1,
+ ycoordinate: rect.xCoordinate * 0.1,
width: adjustedWidth,
height: adjustedHeight,
widtha: adjustedWidtha,
heighta: adjustedHeighta,
};
});
+ }else{
+ adjustedRects1.value = ''
}
if(data.intoGlass2!=null){
adjustedRects2.value = data.intoGlass2[0].map(rect => {
- let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta;
+ console.log( adjustedRects2.value);
+ 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 * 0.12;
+ adjustedHeight = heighta * 0.1;
+ adjustedWidtha = widtha;
+ adjustedHeighta = heighta;
+ newX = 5087 - (rect.yCoordinate + widtha);
+ } else {
+ adjustedWidth = heighta * 0.12;
+ 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);
+ // }
return {
...rect,
xcoordinate: newX * 0.12,
- ycoordinate: rect.yCoordinate * 0.1,
+ ycoordinate: rect.xCoordinate * 0.1,
width: adjustedWidth,
height: adjustedHeight,
widtha: adjustedWidtha,
heighta: adjustedHeighta,
};
});
+ }else{
+ adjustedRects2.value = ''
}
// 杩涚倝鍓�
if(data.waitingGlass!=null){
adjustedRectsa.value = data.waitingGlass[0].map(rect => {
- let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta;
+ 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 * 0.24;
+ 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 * 0.24;
+ adjustedHeight = widtha * 0.16;
+ adjustedWidtha = heighta;
+ adjustedHeighta = widtha;
+ newX = 5190 - (rect.yCoordinate + heighta);
}
return {
...rect,
@@ -109,24 +163,33 @@
heighta: adjustedHeighta,
};
});
- }
+ }else{
+ adjustedRectsa.value = ''
+ }
// 宸插嚭鐐�
if(data.outGlass!=null){
adjustedRectsb.value = data.outGlass[0].map(rect => {
- let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta;
+ 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 * 0.24;
+ 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 * 0.24;
+ adjustedHeight = widtha * 0.16;
+ adjustedWidtha = heighta;
+ adjustedHeighta = widtha;
+ // newX = 5190 - (rect.yCoordinate + heighta);
}
return {
...rect, // 澶嶅埗鍘熷瀵硅薄鐨勫叾浠栧睘鎬�
@@ -138,40 +201,64 @@
heighta: adjustedHeighta,
};
});
- }
+ }else{
+ adjustedRectsb.value = ''
+ }
};
onMounted(() => {
- initializeWebSocket(socketUrl, handleMessage);
+ socket = initializeWebSocket(socketUrl, handleMessage);
});
+ onUnmounted(() => {
+ if (socket) {
+ closeWebSocket(socket);
+ }
+ });
function updateRectColors() {
adjustedRectsa.value.forEach(rect => {
if (rect.glassId === glassId) {
- rect.state = 5;
+ rect.state = 8;
}
});
+ adjustedRectsb.value.forEach(rect => {
+ if (rect.glassId === glassId) {
+ rect.state = 8;
+ }
+ });
}
function getRectColora(state) {
switch (state) {
case 0:
- return '#d1edc4';
+ return '#7AC5CD';
case 1:
- return '#E6E6FA';
+ return '#95d475';
case -1:
- return '#dedfe0';
- case 5:
+ return '#CDAF95';
+ case 8:
return '#911005';
}
}
function getRectColorb(state) {
switch (state) {
case 3:
- return '#f8e3c5';
+ return '#eebe77';
case 4:
- return '#F0F8FF';
- case 5:
+ return '#CD6090';
+ case 8:
return '#911005';
}
}
+// 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 showDialog(rect) {
currentGlassId.value = rect.glassId;
currenttemperingFeedSequence.value = rect.temperingFeedSequence;
@@ -184,7 +271,7 @@
glassId: currentGlassId.value,
// temperingFeedSequence: currenttemperingFeedSequence.value,
line: 4001,
- status: 2,
+ status: 8,
workingProcedure: '閽㈠寲',
})
if (response.code == 200) {
@@ -214,12 +301,13 @@
<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)"
class="rect"
@@ -228,7 +316,7 @@
left: `${rect.xcoordinate}px`,
width: `${rect.width}px`,
height: `${rect.height}px`,
- backgroundColor: rect.state === 5 ? '#911005' : 'lightblue' }"
+ backgroundColor: rect.state === 8 ? '#911005' : 'lightblue' }"
>
<div class="centered-text">
<div >{{ rect.glassId }}</div>
@@ -242,12 +330,13 @@
</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"
+ :key="index"
@click="showDialog(rect)"
class="rect"
:style="{ position: 'absolute',
@@ -255,7 +344,7 @@
left: `${rect.xcoordinate}px`,
width: `${rect.width}px`,
height: `${rect.height}px`,
- backgroundColor: rect.state === 5 ? '#911005' : 'lightblue' }"
+ backgroundColor: rect.state === 8 ? '#911005' : 'lightblue' }"
>
<div class="centered-text">
<div >{{ rect.glassId }}</div>
@@ -273,7 +362,8 @@
<!-- 杩涚倝鍓� -->
<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
@@ -299,7 +389,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;">鐐夊彿锛歿{ 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
--
Gitblit v1.8.0