From a9c266890270e55a5840411b6d0fd4fe43494af8 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 22 八月 2024 09:42:13 +0800
Subject: [PATCH] 可视化系统下方表格高度变高，钢化前新增打印功能（样式正在完善）
---
UI-Project/src/views/PurchaseReturn/purchaseStorage.vue | 105 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 65 insertions(+), 40 deletions(-)
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
index 742ba24..075ed55 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
@@ -5,7 +5,7 @@
import { ElMessage, ElMessageBox } from 'element-plus'
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 { initializeWebSocket, closeWebSocket } from '@/utils/WebSocketService';
const adjustedRects = ref([]);
@@ -29,62 +29,84 @@
}
}
}
-
+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 => {
- let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta;
+const handleMessage = (data) => {
+ if (data.overGlass && data.overGlass.length > 0) {
+ const newRects = data.overGlass[0].map(rect => {
+ const scaleFactor = 1621.78/5190;
+ let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;
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);
+
+ 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 = rect.height * 0.24;
- adjustedHeight = rect.width * 0.16;
- adjustedWidtha = rect.height;
- adjustedHeighta = rect.width;
- newX = 5190 - (rect.yCoordinate + rect.height);
+ adjustedWidth = heighta * scaleFactor;
+ adjustedHeight = widtha * 0.16;
}
return {
...rect,
- xcoordinate: newX * 0.24,
+ xcoordinate: newX * scaleFactor,
ycoordinate: rect.xCoordinate * 0.16,
width: adjustedWidth,
height: adjustedHeight,
- widtha: adjustedWidtha,
- heighta: adjustedHeighta,
- };
-});
+ widtha: rect.width,
+ heighta: rect.height,
}
-};
+ });
+
+ // 鍚堝苟鏂版棫鐭╁舰锛屼繚鐣� 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)));
+ }
+};
+
function updateRectColors() {
- adjustedRectsa.value.forEach(rect => {
+ adjustedRects.value.forEach(rect => {
if (rect.glassId === glassId) {
- rect.state = 5;
+ rect.state = 8;
}
});
-}
+}
function getRectColora(state) {
- switch (state) {
+ switch (state) {
case 3:
- return '#f8e3c5';
+ return '#eebe77';
case 4:
- return '#F0F8FF';
- case 5:
+ return '#CD6090';
+ case 8:
return '#911005';
}
}
-function showDialog(rect) {
+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;
}
+
+const handleDialogClose = () => {
+ adjustedRects.value.forEach(rect => {
+ rect.isActive = false;
+ });
+ blind.value = false;
+};
// 鐮存崯
const handleDamage = async () => {
try {
@@ -92,7 +114,7 @@
glassId: currentGlassId.value,
// temperingFeedSequence: currenttemperingFeedSequence.value,
line: 4001,
- status: 2,
+ status: 8,
workingProcedure: '閽㈠寲',
})
if (response.code == 200) {
@@ -110,11 +132,13 @@
}
}
onMounted(() => {
- // fetchFlowCardId();
- // fetchTableData(); // 鑾峰彇鏁版嵁
- initializeWebSocket(socketUrl, handleMessage);
+ socket = initializeWebSocket(socketUrl, handleMessage);
});
-
+ onUnmounted(() => {
+ if (socket) {
+ closeWebSocket(socket);
+ }
+ });
onBeforeUnmount(() => {
console.log("鍏抽棴浜�")
closeWebSocket();
@@ -137,7 +161,8 @@
class="rect"
:style="{ position: 'absolute', top: `${rect.ycoordinate}px`, left: `${rect.xcoordinate}px`,
width: `${rect.width}px`, height: `${rect.height}px`,
- backgroundColor: getRectColora(rect.state) }">
+ backgroundColor: rect.isActive ? '#ADFF2F' : getRectColora(rect.state)
+ }">
<div class="centered-text">
<div >{{ rect.glassId }}</div>
<div >{{ rect.flowCardId }}</div>
@@ -150,7 +175,7 @@
</div>
</el-card>
</div>
- <el-dialog v-model="blind" top="30vh" width="15%" style="text-align: center;">
+ <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;">
{{ $t('order.dilapidation') }}
</el-button>
--
Gitblit v1.8.0