From 137ab94168623d78bbc369f41ddaaa6135e114a3 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 15 五月 2024 09:55:21 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/views/UnLoadGlass/Landingindication.vue | 50 +++++++++++++++++++++++++++++---------------------
1 files changed, 29 insertions(+), 21 deletions(-)
diff --git a/UI-Project/src/views/UnLoadGlass/Landingindication.vue b/UI-Project/src/views/UnLoadGlass/Landingindication.vue
index d43f129..ca6a564 100644
--- a/UI-Project/src/views/UnLoadGlass/Landingindication.vue
+++ b/UI-Project/src/views/UnLoadGlass/Landingindication.vue
@@ -1,8 +1,9 @@
<template>
<div class="glass-rack">
- <div>
+ <div >
<svg width="500" height="500" xmlns="http://www.w3.org/2000/svg">
<g stroke="null" id="Layer_1">
+ <!-- 浣跨敤 v-for 寰幆娓叉煋鏁版嵁 -->
<g v-for="(rack, index) in racks" :key="index">
<rect
:x="rack.x"
@@ -33,19 +34,20 @@
<script setup>
import Swal from 'sweetalert2'
import request from "@/utils/request";
-
-// 鍒濆鍖栨暟鎹�
-let racks = [
+const racks = [
{ x: 50, y: 100, height: 100, width: 60, fillColor: '#6a6da9', item: { height: 90, width: 10, fillColor: 'yellow', content: 'NG123456' } },
+
{ x: 280, y: 100, height: 100, width: 60, fillColor: '#6a6da9', item: { height: 30, width: 20, fillColor: 'yellow', content: 'NG12345678' } },
+
{ x: 140, y: 420, height: 60, width: 110, fillColor: '#6a6da9', item: { height: 30, width: 100, fillColor: 'yellow', content: 'NG1234561454' } }
+
];
-// 璁＄畻鍏冪礌浣嶇疆鐨勫嚱鏁�
+
const calculateItemXPosition = (rack, item, index) => {
- if (index === 0) {
+ if (index === 0 ) {
return rack.x;
- } else if (index === 1) {
+ } else if (index === 1 ) {
return rack.x + rack.width - item.width;
} else {
return rack.x + (rack.width - item.width) / 2;
@@ -53,7 +55,7 @@
};
const calculateItemYPosition = (rack, item, index) => {
- if (index === 0) {
+ if (index === 0 ) {
return rack.y + (rack.height - item.height) / 2;
} else if (index === 1) {
return rack.y + (rack.height - item.height) / 2;
@@ -62,24 +64,29 @@
}
};
-// 鑾峰彇鏁版嵁骞舵洿鏂� racks 鏁扮粍
+
const fetchFlowCardId = async () => {
try {
const response = await request.get('unLoadGlass/downWorkStation/getwo');
+ console.log(response)
if (response.code === 200) {
+ console.log(response.data);
+ // 閬嶅巻鍝嶅簲鏁版嵁骞舵浛鎹acks鏁扮粍涓殑item灞炴��
response.data.forEach((itemData, index) => {
if (index < racks.length) {
const rack = racks[index];
const newItem = {
content: itemData.item.content,
fillColor: itemData.item.fillColor,
- width: itemData.item.width / 10000,
- height: itemData.item.height / 10000
+ width: itemData.item.width/10000,
+ height: itemData.item.height/10000
};
- // 鏇存柊 racks 鏁扮粍
- Vue.set(racks, index, { ...rack, item: newItem });
+ rack.item == newItem;
+
}
});
+
+ console.log(racks); // 鏌ョ湅鏇存柊鍚庣殑racks鏁扮粍
} else {
ElMessage.error(response.msg);
}
@@ -88,16 +95,17 @@
}
};
-// 鑾峰彇鏁版嵁骞舵洿鏂� racks 鏁扮粍
-fetchFlowCardId();
+fetchFlowCardId()
+// setTimeout(fetchFlowCardId(),1000);
+
-// 鏄剧ず鑷畾涔夎鎶�
+
const showCustomAlert = (content) => {
- var str = "鏋跺彿 : 111\n" +
+ var str="鏋跺彿 : 111\n" +
"闀� : 111\n" +
"瀹� : 111\n" +
- "鍘� : 111\n" +
- "鐜荤拑ID : 111\n" +
+ "鍘� : 111\n"+
+ "鐜荤拑ID : 111\n"+
"鑶滅郴 : 111\n";
Swal.fire({
@@ -109,11 +117,11 @@
});
};
-// 鏄剧ず鍏冪礌淇℃伅
const showRectInfo = (rectInfo) => {
const content = rectInfo.item.content;
showCustomAlert(content);
};
+
</script>
<style scoped>
@@ -136,4 +144,4 @@
padding: 10px;
font-size: 14px;
}
-</style>
+</style>
\ No newline at end of file
--
Gitblit v1.8.0