From aaf4f788120b7221c5b9377e196848dd9ec4e962 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 22 八月 2024 10:18:25 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/views/PurchaseReturn/purchaseStorage.vue | 113 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 84 insertions(+), 29 deletions(-)
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
index 075ed55..7f51276 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
@@ -4,18 +4,18 @@
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 dialogFormVisible = ref(true)
const dialogFormVisiblea = ref(false)
const blind = ref(false)
-
+
const getTableRow = (row,type) =>{
switch (type) {
case 'edit' :{
@@ -31,9 +31,11 @@
}
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/temperingGlass/api/talk/temperingGlass`;
-const handleMessage = (data) => {
- if (data.overGlass && data.overGlass.length > 0) {
- const newRects = data.overGlass[0].map(rect => {
+// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
+const handleMessage = (data) => {
+ // 鏇存柊 tableData 鐨勬暟鎹�
+ if(data.overGlass!=null){
+ adjustedRects.value = data.overGlass[0].map(rect => {
const scaleFactor = 1621.78/5190;
let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;
let newX = rect.yCoordinate;
@@ -48,9 +50,15 @@
if (rect.angle === 0) {
adjustedWidth = widtha * scaleFactor;
adjustedHeight = heighta * 0.16;
+ // adjustedWidtha = widtha;
+ // adjustedHeighta = heighta;
+ // newX = 5190 - (rect.yCoordinate + rect.width);
} else {
adjustedWidth = heighta * scaleFactor;
adjustedHeight = widtha * 0.16;
+ // adjustedWidtha = heighta;
+ // adjustedHeighta = widtha;
+ // newX = 5190 - (rect.yCoordinate + rect.height);
}
return {
...rect,
@@ -60,20 +68,72 @@
height: adjustedHeight,
widtha: rect.width,
heighta: rect.height,
+ // isActive: false,
+ };
+});
}
- });
+};
+// const handleMessage = (data) => {
+// // 鍋囪 data.overGlass[0] 鏄煩褰㈡暟缁�
+// const newRects = data.overGlass[0].map(newRect => ({
+// ...newRect,
+// const scaleFactor = 1621.78 / 5190;
+// let widtha, heighta, adjustedWidth, adjustedHeight;
- // 鍚堝苟鏂版棫鐭╁舰锛屼繚鐣� isActive 鐘舵��
- adjustedRects.value = adjustedRects.value.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)));
- }
-};
+// // 浜ゆ崲瀹藉害鍜岄珮搴︼紙濡傛灉鐭╁舰鏄�滄í鍚戔�濈殑锛�
+// 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.16;
+// } else {
+// adjustedWidth = heighta * scaleFactor;
+// adjustedHeight = widtha * 0.16;
+// }
+
+// // 娉ㄦ剰锛氳繖閲屽彲鑳介渶瑕侀噸鏂拌�冭檻 newX 鐨勮绠楁柟寮�
+// // 鏆傛椂淇濈暀涓哄師濮� yCoordinate 鐨勫鐞嗭紝浣嗛�氬父 x 鍧愭爣涓嶅簲鏉ヨ嚜 y 鍧愭爣
+// let newX = rect.yCoordinate; // 鍙兘鏄釜閿欒锛岄櫎闈炴湁鐗瑰畾鐢ㄩ��
+
+// // 杩斿洖鏂扮殑鐭╁舰瀵硅薄
+// return {
+// ...rect, // 澶嶅埗鍘熷鐭╁舰鐨勬墍鏈夊睘鎬�
+// xcoordinate: newX * scaleFactor, // 娉ㄦ剰锛氳繖閲岀殑 newX 鍙兘闇�瑕佽皟鏁�
+// ycoordinate: rect.xCoordinate * 0.16,
+// width: adjustedWidth,
+// height: adjustedHeight,
+// widtha,
+// heighta,
+// isActive: false, // 榛樿涓洪潪婵�娲荤姸鎬�
+// // 鍙互娣诲姞鍏朵粬闇�瑕佺殑灞炴��
+// }
+// }));
+
+ // 浣跨敤鏂版暟鎹洿鏂� adjustedRects
+ // 娉ㄦ剰锛氳繖閲屾垜浠亣璁� adjustedRects.value 涓殑鐭╁舰涔熸湁 id 灞炴��
+// adjustedRects.value = adjustedRects.value.map(oldRect => {
+// const updatedRect = newRects.find(newRect => newRect.id === oldRect.id);
+// if (updatedRect) {
+// // 濡傛灉鎵惧埌浜嗗搴旂殑鐭╁舰锛屽垯鍚堝苟灞炴�у拰淇濈暀鍘熷婵�娲荤姸鎬侊紙濡傛灉闇�瑕佺殑璇濓級
+// // 浣嗗湪杩欎釜渚嬪瓙涓紝鎴戜滑鎬绘槸灏� isActive 璁剧疆涓� false
+// return {
+// ...oldRect,
+// ...updatedRect, // 鍚堝苟鏂扮煩褰㈢殑灞炴�э紝浣嗕細瑕嗙洊 isActive
+// isActive: false, // 鎬绘槸璁剧疆涓� false锛岄櫎闈炴偍鏈夋洿澶嶆潅鐨勯�昏緫
+// };
+// }
+// // 濡傛灉娌℃湁鎵惧埌瀵瑰簲鐨勭煩褰紝鍒欎繚鐣欏師鏍�
+// return oldRect;
+// }).concat(newRects.filter(newRect => !adjustedRects.value.some(oldRect => oldRect.id === newRect.id)));
+// // concat 鐢ㄤ簬娣诲姞閭ｄ簺鍦� adjustedRects.value 涓笉瀛樺湪鐨勬柊鐭╁舰
+// };
function updateRectColors() {
adjustedRects.value.forEach(rect => {
if (rect.glassId === glassId) {
@@ -91,22 +151,17 @@
return '#911005';
}
}
-function showDialog(rect) {
- const index = adjustedRects.value.findIndex(r => r.glassId === rect.glassId);
- if (index !== -1) {
- adjustedRects.value[index].isActive = true;
- }
+function showDialog(rect) {
+ rect.isActive = true;
currentGlassId.value = rect.glassId;
currenttemperingFeedSequence.value = rect.temperingFeedSequence;
blind.value = true;
}
-
const handleDialogClose = () => {
adjustedRects.value.forEach(rect => {
- rect.isActive = false;
+ rect.isActive = false; // 鍏抽棴瀵硅瘽妗嗘椂閲嶇疆鎵�鏈夌煩褰㈢殑 isActive 鐘舵��
});
- blind.value = false;
-};
+};
// 鐮存崯
const handleDamage = async () => {
try {
@@ -144,7 +199,7 @@
closeWebSocket();
});
</script>
-
+
<template>
<div style="margin-top: 10px;">
<div>
@@ -181,9 +236,9 @@
</el-button>
</el-dialog>
</div>
-
+
</template>
-
+
<style scoped>
#boxa{
border: 1px solid rgb(119, 116, 116);
--
Gitblit v1.8.0