From 309f33161c47a2c3db4cc1535eee8bc335c0c664 Mon Sep 17 00:00:00 2001
From: wang <3597712270@qq.com>
Date: 星期一, 22 四月 2024 20:07:37 +0800
Subject: [PATCH] 上片机、掰片/识别
---
UI-Project/src/views/Identify/identify.vue | 106 +++++++++++++++++++++++++++++++---------------------
1 files changed, 63 insertions(+), 43 deletions(-)
diff --git a/UI-Project/src/views/Identify/identify.vue b/UI-Project/src/views/Identify/identify.vue
index be0e99f..13a7185 100644
--- a/UI-Project/src/views/Identify/identify.vue
+++ b/UI-Project/src/views/Identify/identify.vue
@@ -1,10 +1,14 @@
<template>
<el-card style="margin-left: 10px; margin-top: 10px; margin-right: 10px;" v-loading="loading">
- <div style="display: flex;">
+ <div style="display: flex;margin-bottom: 30px;">
<div style="margin-left: 400px; font-size: 20px;">宸ョ▼鍙凤細P20240305001 </div>
<div style="margin-left: 150px; font-size: 20px;">鐗堝浘缂栧彿锛�1</div>
</div>
- <svg width="100%" height="690" xmlns="http://www.w3.org/2000/svg" style="margin-top: -40px;">
+ <el-scrollbar height="650px">
+ <div id="home-card">
+ <div id="home-item">
+ <svg width="100%" height="400" xmlns="http://www.w3.org/2000/svg" style="margin-top: -100px;margin-left: -80px;" :data="tableData">
+ <!-- 绠ご -->
<defs>
<marker id="arrow" markerUnits="strokeWidth" markerWidth="12" markerHeight="12" viewBox="0 0 12 12" refX="6"
refY="6" orient="auto">
@@ -23,26 +27,12 @@
style="stroke:#c8c9cc;stroke-width:3;"
@click="showRectInfo(rack)"
/>
+ <!-- 绠ご -->
<line x1='510' y1='309' x2='260' y2='310' stroke='#911005' stroke-width='2' marker-end='url(#arrow)'>
- </line>
- <line x1='850' y1='309' x2='1100' y2='310' stroke='#911005' stroke-width='2' marker-end='url(#arrow)'>
- </line>
- <line x1='510' y1='409' x2='260' y2='410' stroke='#911005' stroke-width='2' marker-end='url(#arrow)'>
- </line>
- <line x1='1200' y1='650' x2='1200' y2='470' stroke='#911005' stroke-width='2' marker-end='url(#arrow)'>
</line>
<text x="370" y="240" dominant-baseline="middle" text-anchor="middle">NG2024030501A-01</text>
<text x="370" y="260" dominant-baseline="middle" text-anchor="middle">500*300</text>
- <text x="970" y="240" dominant-baseline="middle" text-anchor="middle">NG2024030501A-02</text>
- <text x="970" y="260" dominant-baseline="middle" text-anchor="middle">500*300</text>
-
- <text x="600" y="500" dominant-baseline="middle" text-anchor="middle">NG2024030501A-03</text>
- <text x="600" y="520" dominant-baseline="middle" text-anchor="middle">800*450</text>
-
-
- <text x="1280" y="520" dominant-baseline="middle" text-anchor="middle">NG2024030501A-04</text>
- <text x="1280" y="540" dominant-baseline="middle" text-anchor="middle">400*300</text>
<g v-for="(item, itemIndex) in rack.items" :key="itemIndex">
<rect
:x="calculateItemXPosition(rack, item, itemIndex)"
@@ -54,22 +44,36 @@
</g>
</g>
</svg>
+ </div>
+ </div>
+ </el-scrollbar>
</el-card>
</template>
<script>
import Swal from 'sweetalert2'
import request from "@/utils/request";
+// const tableData = ref([])
-request.get("/TidyUpGlassModule/CurrentCutTerritory").then((res) => {
+request.post("/cacheGlass/taskCache/currentCutTerritory").then((res) => {
if (res.code == 200) {
console.log(res.data);
+ tableData.value = res.data
} else {
ElMessage.warning(res.msg)
- router.push("/login")
+
}
});
+
+// request.get("/TidyUpGlassModule/CurrentCutTerritory").then((res) => {
+// if (res.code == 200) {
+// console.log(res.data);
+// } else {
+// ElMessage.warning(res.msg)
+// router.push("/login")
+// }
+// });
export default {
data() {
@@ -84,30 +88,6 @@
{ position: 'bottom-right', width: 40, height: 30, fillColor: '#ffffff', content: 'NG12345678' }
]
},
- {
- x: 685, y: 126, width: 600, height: 240, fillColor: '#93d2f3',
- items: [
- { position: 'bottom-left', width: 40, height: 30, fillColor: '#ffffff', content: 'NG123456' },
- { position: 'bottom-right', width: 40, height: 30, fillColor: '#ffffff', content: 'NG123456' },
- { position: 'top-right', width: 40, height: 30, fillColor: '#ffffff', content: 'NG1234567' }
- ]
- },
- {
- x: 70, y: 380, width: 1100, height: 260, fillColor: '#81b337',
- items: [
- { position: 'top-left', width: 40, height: 30, fillColor: '#ffffff', content: 'NG123456' },
- { position: 'bottom-right', width: 40, height: 30, fillColor: '#ffffff', content: 'NG123456' },
- { position: 'top-right', width: 40, height: 30, fillColor: '#ffffff', content: 'NG1234567' }
- ]
- },
- {
- x: 1185, y: 380, width: 200, height: 300,fillColor: '#81b337',
- items: [
- { position: 'bottom-right', width: 40, height: 30, fillColor: '#ffffff', content: 'NG123456' },
- { position: 'top-right',width: 40, height: 30, fillColor: '#ffffff', content: 'NG123456' },
- { position: 'top-left', width: 40, height: 30, fillColor: '#ffffff', content: 'NG1234567' },
- ]
- }
// Add more racks and items here as needed
],
@@ -183,4 +163,44 @@
color: black;
border: 1px solid black;
}
+
+#home-card {
+ width: 100%;
+ overflow: hidden;
+ padding: 10px 0px;
+ display: flex;
+ flex-wrap: wrap;
+ #home-item {
+ /* border-style: solid; */
+ /* border-width: 1px;
+ border-color: red; */
+ width: calc(34% - 20px);
+ padding: 20px 0px 20px 20px;
+ margin-right: 20px;
+ margin-bottom: 10px;
+ display: flex;
+ justify-content: center;
+ /* align-items: center; */
+ background: #fff;
+ width: 700px;
+ #home-img {
+ display: inline-block;
+ width: 160px;
+ height: 60px;
+ margin: 0;
+ padding: 0;
+ }
+ #home-right {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: flex-start;
+ margin-left: 10px;
+ #home-num {
+ font-size: 40px;
+ margin: 5px 0;
+ }
+ }
+ }
+ }
</style>
--
Gitblit v1.8.0