From 20159916dd5f3a89b97a9ba83bed37b841471921 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 24 七月 2024 12:43:58 +0800
Subject: [PATCH] 上片模块：上片模块对接完成，命令可正常写入 上片逻辑：复位后需要向plc发送联动请求，联动请求为1后可接收到上片机发送的上片请求，否则无法执行上片任务
---
UI-Project/src/views/PurchaseReturn/purchaseReturn.vue | 210 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 150 insertions(+), 60 deletions(-)
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index 101663e..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([]);
@@ -22,58 +23,136 @@
const handleMessage = (data) => {
// 杩涚倝涓�
if(data.intoGlass!=null){
- adjustedRects.value = data.intoGlass[0].map(rect => ({
+ 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: rect.xCoordinate * 0.3,
- ycoordinate: rect.yCoordinate * 0.3,
- width: rect.width * 0.2,
- height: rect.height * 0.2,
- widtha: rect.width,
- heighta: rect.height,
- }));
- }
+ 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 => ({
+ adjustedRects2.value = data.intoGlass2[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: rect.xCoordinate * 0.3,
- ycoordinate: rect.yCoordinate * 0.3,
- width: rect.width * 0.2,
- height: rect.height * 0.2,
- widtha: rect.width,
- heighta: rect.height,
- }));
- }
+ xcoordinate: newX * 0.12,
+ ycoordinate: rect.yCoordinate * 0.1,
+ width: adjustedWidth,
+ height: adjustedHeight,
+ widtha: adjustedWidtha,
+ heighta: adjustedHeighta,
+ };
+ });
+ }
// 杩涚倝鍓�
if(data.waitingGlass!=null){
- adjustedRectsa.value = data.waitingGlass[0].map(rect => ({
- ...rect, // 澶嶅埗鍘熷瀵硅薄鐨勫叾浠栧睘鎬�
- x: rect.xCoordinate * 0.4,
- y: rect.yCoordinate * 0.4,
- width: rect.width * 0.4,
- height: rect.height * 0.4,
- widtha: rect.width,
- heighta: rect.height,
- state: rect.state,
- }));
- }
+ adjustedRectsa.value = data.waitingGlass[0].map(rect => {
+ 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;
+ 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: newX * 0.24,
+ y: rect.xCoordinate * 0.16,
+ width: adjustedWidth,
+ height: adjustedHeight,
+ widtha: adjustedWidtha,
+ heighta: adjustedHeighta,
+ };
+});
+ }
// 宸插嚭鐐�
if(data.outGlass!=null){
- adjustedRectsb.value = data.outGlass[0].map(rect => ({
+ adjustedRectsb.value = data.outGlass[0].map(rect => {
+ 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;
+ 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.xCoordinate * 0.4,
- y: rect.yCoordinate * 0.4,
- width: rect.width * 0.4,
- height: rect.height * 0.4,
- widtha: rect.width,
- heighta: rect.height,
- state: rect.state
- }));
- console.log(data.outGlass[0]);
- }
+ x: newX * 0.24,
+ y: rect.xCoordinate * 0.16,
+ width: adjustedWidth,
+ height: adjustedHeight,
+ widtha: adjustedWidtha,
+ heighta: adjustedHeighta,
+ };
+});
+ }
};
onMounted(() => {
initializeWebSocket(socketUrl, handleMessage);
});
+function getRectColor(state) {
+ switch (state) {
+ case 0:
+ return '#f8e3c5';
+ case 1:
+ return '#d1edc4';
+ case -1:
+ return '#dedfe0';
+ }
+}
+function showDialog(row) {
+ blind.value = true;
+}
onBeforeUnmount(() => {
console.log("鍏抽棴浜�")
closeWebSocket();
@@ -88,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"
@@ -99,7 +178,8 @@
>
<div class="centered-text">
<div >{{ rect.glassId }}</div>
- <div style="text-align: center;">{{ rect.widtha }}*{{ rect.heighta }}</div>
+ <div >{{ rect.flowCardId }}</div>
+ <div>{{ rect.widtha }}*{{ rect.heighta }}</div>
</div>
</div>
</div>
@@ -108,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"
@@ -119,7 +199,8 @@
>
<div class="centered-text">
<div >{{ rect.glassId }}</div>
- <div style="text-align: center;">{{ rect.widtha }}*{{ rect.heighta }}</div>
+ <div >{{ rect.flowCardId }}</div>
+ <div>{{ rect.widtha }}*{{ rect.heighta }}</div>
</div>
</div>
</div>
@@ -130,20 +211,23 @@
</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: 100%;height: 100%;">
+ <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: rect.state === 0 ? '#dedfe0' : '#d1edc4' }">
+ backgroundColor: getRectColor(rect.state) }">
<div class="centered-text">
<div>{{ rect.glassId }}</div>
+ <div >{{ rect.flowCardId }}</div>
<div>{{ rect.widtha }}*{{ rect.heighta }}</div>
</div>
</div>
@@ -154,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"
@@ -168,7 +252,8 @@
backgroundColor: rect.state === 4 ? '#911005' : '#f8e3c5' }">
<div class="centered-text">
<div >{{ rect.glassId }}</div>
- <div style="text-align: center;">{{ rect.widtha }}*{{ rect.heighta }}</div>
+ <div >{{ rect.flowCardId }}</div>
+ <div>{{ rect.widtha }}*{{ rect.heighta }}</div>
</div>
</div>
</div>
@@ -176,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>
@@ -255,9 +346,8 @@
/* 璁剧疆鏂囧瓧灞呬腑鏍峰紡 */
/* display: flex; */
justify-content: center;
- text-align: center;
align-items: center;
height: 100%; /* 纭繚div鍗犳嵁鏁翠釜鐭╁舰鐨勯珮搴� */
- margin-top: 60%
+ font-size: small;
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0