From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 11 十月 2024 08:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/PurchaseReturn/purchaseStorage.vue | 66 ++++++++++++++++++++------------
1 files changed, 41 insertions(+), 25 deletions(-)
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
index 075ed55..bba4ca2 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
@@ -4,18 +4,19 @@
import {useRouter} from "vue-router"
import { ElMessage, ElMessageBox } from 'element-plus'
import request from "@/utils/request"
-
+
import { ref, onMounted, onBeforeUnmount,onUnmounted } from 'vue';
import { WebSocketHost ,host} from '@/utils/constants'
import { initializeWebSocket, closeWebSocket } from '@/utils/WebSocketService';
const adjustedRects = ref([]);
const currentGlassId = ref(null);
const currenttemperingFeedSequence = ref(null);
-
+const currentRect = ref(null);
+const canSelectProject = ref(true);
const dialogFormVisible = ref(true)
const dialogFormVisiblea = ref(false)
const blind = ref(false)
-
+
const getTableRow = (row,type) =>{
switch (type) {
case 'edit' :{
@@ -33,8 +34,16 @@
const socketUrl = `ws://${WebSocketHost}:${host}/api/temperingGlass/api/talk/temperingGlass`;
const handleMessage = (data) => {
if (data.overGlass && data.overGlass.length > 0) {
+ // 鎻愬彇鏂扮殑鐭╁舰ID
+ const newGlassIds = new Set(data.overGlass[0].map(rect => rect.glassId));
+
+ // 杩囨护鍑哄凡瀛樺湪鐨勭煩褰�
+ const existingRects = adjustedRects.value.filter(rect => newGlassIds.has(rect.glassId));
+
+ // 璁＄畻鏂扮殑鐭╁舰
const newRects = data.overGlass[0].map(rect => {
- const scaleFactor = 1621.78/5190;
+ const scaleFactor = 1390/5190;
+ const scaleFactorY = 750/2800;
let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;
let newX = rect.yCoordinate;
@@ -47,33 +56,35 @@
}
if (rect.angle === 0) {
adjustedWidth = widtha * scaleFactor;
- adjustedHeight = heighta * 0.16;
+ adjustedHeight = heighta * scaleFactorY;
} else {
adjustedWidth = heighta * scaleFactor;
- adjustedHeight = widtha * 0.16;
+ adjustedHeight = widtha * scaleFactorY;
}
return {
...rect,
xcoordinate: newX * scaleFactor,
- ycoordinate: rect.xCoordinate * 0.16,
+ ycoordinate: rect.xCoordinate * scaleFactorY,
width: adjustedWidth,
height: adjustedHeight,
widtha: rect.width,
heighta: rect.height,
}
- });
+ });
- // 鍚堝苟鏂版棫鐭╁舰锛屼繚鐣� isActive 鐘舵��
- adjustedRects.value = adjustedRects.value.map(oldRect => {
+ // 鍚堝苟鏂版棫鐭╁舰锛屽苟淇濈暀 isActive 鐘舵��
+ adjustedRects.value = existingRects.map(oldRect => {
const newRect = newRects.find(r => r.glassId === oldRect.glassId);
if (newRect) {
return { ...oldRect, ...newRect, isActive: oldRect.isActive };
}
- return oldRect; // 濡傛灉鏃х煩褰㈠湪鏂版暟鎹腑涓嶅瓨鍦紝鍒欎繚鐣欏師鏍�
- }).concat(newRects.filter(r => !adjustedRects.value.some(o => o.glassId === r.glassId)));
+ return oldRect; // 濡傛灉鏃х煩褰㈠湪鏂版暟鎹腑涓嶅瓨鍦紝浣嗕繚鐣欏湪newGlassIds涓紝鍒欎繚鐣欏師鏍�
+ }).concat(newRects.filter(r => !existingRects.some(o => o.glassId === r.glassId)));
}
-};
-
+ else if (data.overGlass == null) {
+ adjustedRects.value = []
+ }
+};
function updateRectColors() {
adjustedRects.value.forEach(rect => {
if (rect.glassId === glassId) {
@@ -98,7 +109,13 @@
}
currentGlassId.value = rect.glassId;
currenttemperingFeedSequence.value = rect.temperingFeedSequence;
- blind.value = true;
+ blind.value = true;
+ currentRect.value = rect;
+ if (currentRect.value.state == 8) {
+ canSelectProject.value = false;
+ } else if (currentRect.value.state !== 8) {
+ canSelectProject.value = true;
+ }
}
const handleDialogClose = () => {
@@ -144,15 +161,15 @@
closeWebSocket();
});
</script>
-
+
<template>
<div style="margin-top: 10px;">
<div>
- <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 600px;" v-loading="loading">
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 800px;" v-loading="loading">
<!-- <el-card style="margin-left: 10px;margin-top: 10px;margin-right: 10px;" v-loading="loading"> -->
<div v-if="adjustedRects.length > 0">
<div style="text-align: center;">鐐夊彿锛歿{ adjustedRects[0].engineerId }}-{{ adjustedRects[0].temperingLayoutId }}</div>
- <el-scrollbar height="550px" width="1200px" style="background-color: #e9e9eb;">
+ <el-scrollbar height="750px" width="1400px" style="background-color: #e9e9eb;">
<div style="position: relative;">
<div
v-for="(rect, index) in adjustedRects"
@@ -164,10 +181,9 @@
backgroundColor: rect.isActive ? '#ADFF2F' : getRectColora(rect.state)
}">
<div class="centered-text">
- <div >{{ rect.glassId }}</div>
- <div >{{ rect.flowCardId }}</div>
- <div>{{ rect.widtha }}*{{ rect.heighta }}</div>
- <!-- <div style="margin-top: 25px;margin-left: -60px;">{{ rect.widtha }}*{{ rect.heighta }}</div> -->
+ <div style="font-size: 15px;font-weight: bold;">{{ rect.glassId }}</div>
+ <div style="font-size: 15px;font-weight: bold;">{{ rect.flowCardId }}</div>
+ <div style="font-size: 30px;font-weight: bold;">{{ rect.widtha }}*{{ rect.heighta }}</div>
</div>
</div>
</div>
@@ -176,14 +192,14 @@
</el-card>
</div>
<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;">
+ <el-button :disabled="!canSelectProject" type="warning" plain :icon="Delete" @click="handleDamage" style="width: 140px;margin-left: 10px;">
{{ $t('order.dilapidation') }}
</el-button>
</el-dialog>
</div>
-
+
</template>
-
+
<style scoped>
#boxa{
border: 1px solid rgb(119, 116, 116);
--
Gitblit v1.8.0