From cfd9f0b05e4e9b46c4d72ec5cefd3c04648648ea Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 02 九月 2024 08:11:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/PurchaseReturn/purchaseStorage.vue | 145 +++++++++++++++++------------------------------
1 files changed, 53 insertions(+), 92 deletions(-)
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
index 7f51276..bba4ca2 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
@@ -11,7 +11,8 @@
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)
@@ -31,12 +32,18 @@
}
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/temperingGlass/api/talk/temperingGlass`;
-// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
-const handleMessage = (data) => {
- // 鏇存柊 tableData 鐨勬暟鎹�
- if(data.overGlass!=null){
- adjustedRects.value = data.overGlass[0].map(rect => {
- const scaleFactor = 1621.78/5190;
+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 = 1390/5190;
+ const scaleFactorY = 750/2800;
let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;
let newX = rect.yCoordinate;
@@ -49,91 +56,35 @@
}
if (rect.angle === 0) {
adjustedWidth = widtha * scaleFactor;
- adjustedHeight = heighta * 0.16;
- // adjustedWidtha = widtha;
- // adjustedHeighta = heighta;
- // newX = 5190 - (rect.yCoordinate + rect.width);
+ adjustedHeight = heighta * scaleFactorY;
} else {
adjustedWidth = heighta * scaleFactor;
- adjustedHeight = widtha * 0.16;
- // adjustedWidtha = heighta;
- // adjustedHeighta = widtha;
- // newX = 5190 - (rect.yCoordinate + rect.height);
+ 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: false,
- };
-});
+ }
+ });
+
+ // 鍚堝苟鏂版棫鐭╁舰锛屽苟淇濈暀 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; // 濡傛灉鏃х煩褰㈠湪鏂版暟鎹腑涓嶅瓨鍦紝浣嗕繚鐣欏湪newGlassIds涓紝鍒欎繚鐣欏師鏍�
+ }).concat(newRects.filter(r => !existingRects.some(o => o.glassId === r.glassId)));
+ }
+ else if (data.overGlass == null) {
+ adjustedRects.value = []
}
};
-// const handleMessage = (data) => {
-// // 鍋囪 data.overGlass[0] 鏄煩褰㈡暟缁�
-// const newRects = data.overGlass[0].map(newRect => ({
-// ...newRect,
-// const scaleFactor = 1621.78 / 5190;
-// let widtha, heighta, adjustedWidth, adjustedHeight;
-
-// // 浜ゆ崲瀹藉害鍜岄珮搴︼紙濡傛灉鐭╁舰鏄�滄í鍚戔�濈殑锛�
-// 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) {
@@ -151,17 +102,28 @@
return '#911005';
}
}
-function showDialog(rect) {
- rect.isActive = true;
+function showDialog(rect) {
+ const index = adjustedRects.value.findIndex(r => r.glassId === rect.glassId);
+ if (index !== -1) {
+ adjustedRects.value[index].isActive = true;
+ }
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 = () => {
adjustedRects.value.forEach(rect => {
- rect.isActive = false; // 鍏抽棴瀵硅瘽妗嗘椂閲嶇疆鎵�鏈夌煩褰㈢殑 isActive 鐘舵��
+ rect.isActive = false;
});
-};
+ blind.value = false;
+};
// 鐮存崯
const handleDamage = async () => {
try {
@@ -203,11 +165,11 @@
<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"
@@ -219,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>
@@ -231,7 +192,7 @@
</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>
--
Gitblit v1.8.0