From 09381335e11d32e01c8067b71d897c7064ec279d Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 20 五月 2024 14:38:18 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue | 161 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 103 insertions(+), 58 deletions(-)
diff --git a/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue b/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue
index 1c43b71..e5f562f 100644
--- a/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue
+++ b/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue
@@ -1,6 +1,6 @@
<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 寰幆娓叉煋鏁版嵁 -->
@@ -11,9 +11,9 @@
:width="rack.width"
:height="rack.height"
:fill="rack.fillColor"
- :data-index="index"
- class="rack-rect"
- @click="showRectInfo(rack)"
+ :data-index="index"
+ class="rack-rect"
+ @click="showRectInfo(rack)"
/>
<rect
:x="calculateItemXPosition(rack, rack.item, index)"
@@ -22,7 +22,7 @@
:height="rack.item.height"
:fill="rack.item.fillColor"
/>
- <text :x="rack.x + rack.width / 2" :y="rack.y - 10" text-anchor="middle">{{ index + 6 }}鍙峰伐浣�</text>
+ <text :x="rack.x + rack.width / 2" :y="rack.y - 10" text-anchor="middle">{{ index + 4 }}鍙峰伐浣�</text>
<text :x="rack.x + rack.width / 2" :y="rack.y + rack.height + 20" text-anchor="middle">{{ rack.item.content }}</text>
</g>
</g>
@@ -31,70 +31,116 @@
</div>
</template>
-<script>
+<script setup>
+import { ref, watchEffect } from 'vue';
import Swal from 'sweetalert2'
-export default {
- data() {
- return {
- racks: [
- { x: 50, y: 100, height: 100, width: 60, fillColor: '#6a6da9', item: { height: 90, width: 10, fillColor: 'yellow', content: 'NG123456' } },
- { x: 50, y: 270, height: 100, width: 60, fillColor: '#6a6da9', item: { height: 20, width: 10, fillColor: 'yellow', content: 'NG1234567' } },
- { x: 280, y: 100, height: 100, width: 60, fillColor: '#6a6da9', item: { height: 30, width: 20, fillColor: 'yellow', content: 'NG12345678' } },
- { x: 280, y: 270, height: 100, width: 60, fillColor: '#6a6da9', item: { height: 35, width: 23, fillColor: 'yellow', content: 'NG123456910' } },
- { x: 140, y: 420, height: 60, width: 110, fillColor: '#6a6da9', item: { height: 30, width: 100, fillColor: 'yellow', content: 'NG1234561454' } }
- ]
- };
- },
- methods: {
- calculateItemXPosition(rack, item, index) {
- if (index === 0 || index === 1) {
- return rack.x;
- } else if (index === 2 || index === 3) {
- return rack.x + rack.width - item.width;
- } else {
- return rack.x + (rack.width - item.width) / 2;
- }
- },
- calculateItemYPosition(rack, item, index) {
- if (index === 0 || index === 1) {
- return rack.y + (rack.height - item.height) / 2;
- } else if (index === 2 || index === 3) {
- return rack.y + (rack.height - item.height) / 2;
- } else {
- return rack.y + rack.height - item.height;
- }
- },
- showCustomAlert(content) {
- var str="鏋跺彿 : 111\n" +
- "闀� : 111\n" +
- "瀹� : 111\n" +
- "鍘� : 111\n"+
- "鐜荤拑ID : 111\n"+
- "鑶滅郴 : 111\n";
+import request from "@/utils/request";
-Swal.fire({
- title: '鐜荤拑淇℃伅',
- html: '<pre>' + str + '</pre>',
- customClass: {
- popup: 'format-pre'
+const racks = ref([
+ { 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: 90, width: 10, fillColor: 'yellow', content: 'NG12345678' } },
+
+ { x: 140, y: 420, height: 60, width: 110, fillColor: '#6a6da9', item: { height: 20, width: 100, fillColor: 'yellow', content: 'NG1234561454' } }
+
+]);
+
+watchEffect(() => {
+ // 瑙﹀彂鏁版嵁鍙樺寲鏃堕噸鏂版覆鏌�
+});
+// 璁＄畻鍏冪礌浣嶇疆鐨勫嚱鏁�
+const calculateItemXPosition = (rack, item, index) => {
+ if (index === 0) {
+ return rack.x;
+ } else if (index === 1) {
+ return rack.x + rack.width - item.width;
+ } else {
+ return rack.x + (rack.width - item.width) / 2;
+ }
+};
+
+const calculateItemYPosition = (rack, item, index) => {
+ if (index === 0) {
+ return rack.y + (rack.height - item.height) / 2;
+ } else if (index === 1) {
+ return rack.y + (rack.height - item.height) / 2;
+ } else {
+ return rack.y + rack.height - item.height;
+ }
+};
+
+
+const fetchFlowCardId = async () => {
+ try {
+ const response = await request.get('unLoadGlass/downWorkStation/getwo2');
+
+ if (response.code === 200) {
+ console.log(response);
+ // 閬嶅巻鍝嶅簲鏁版嵁骞舵浛鎹acks鏁扮粍涓殑item灞炴��
+ response.data.forEach((itemData, index) => {
+ if (index < racks.value.length) {
+ const rack = racks.value[index];
+ const newItem = {
+ content: itemData.item.content,
+ fillColor: itemData.item.fillColor,
+ width: itemData.item.width === 0 ? "" : 10,
+ height: itemData.item.height === 0 ? "" : 90
+ };
+
+ if (index === 2 && itemData.item.width > 0) {
+ newItem.width = 100;
+ newItem.height = 20;
+ }
+
+ rack.item = newItem;
+
+ console.log(racks.value); // 鎵撳嵃鏇存柊鍚庣殑 racks 鍊�
}
});
- },
- showRectInfo( rectInfo) {
- const content = rectInfo.item.content;
- this.$nextTick(() => {
- this.showCustomAlert(content);
- });
-},
+
+
+
+
+ } else {
+ ElMessage.error(response.msg);
+ }
+ } catch (error) {
+ console.error(error);
}
};
+
+fetchFlowCardId()
+
+// const showCustomAlert = (content) => {
+// var str="鏋跺彿 : 111\n" +
+// "闀� : 111\n" +
+// "瀹� : 111\n" +
+// "鍘� : 111\n"+
+// "鐜荤拑ID : 111\n"+
+// "鑶滅郴 : 111\n";
+
+// Swal.fire({
+// title: '鐜荤拑淇℃伅',
+// html: '<pre>' + str + '</pre>',
+// customClass: {
+// popup: 'format-pre'
+// }
+// });
+// };
+
+const showRectInfo = (rectInfo) => {
+ const content = rectInfo.item.content;
+ showCustomAlert(content);
+};
+
</script>
<style scoped>
.glass-rack {
margin-left: 20px;
width: 500px;
+ margin-top: 10px;
}
.rack-rect:hover {
cursor: pointer;
@@ -110,5 +156,4 @@
padding: 10px;
font-size: 14px;
}
-
-</style>
+</style>
\ No newline at end of file
--
Gitblit v1.8.0