From a6b6a0fe63555a44682f2e1f9bc65a668c84a7e9 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 23 四月 2024 12:32:11 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/views/Identify/identify.vue | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/UI-Project/src/views/Identify/identify.vue b/UI-Project/src/views/Identify/identify.vue
index 0dfc7b9..13a7185 100644
--- a/UI-Project/src/views/Identify/identify.vue
+++ b/UI-Project/src/views/Identify/identify.vue
@@ -1,13 +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>
<el-scrollbar height="650px">
<div id="home-card">
- <div id="home-item" v-for="n in 20" :key="n">
- <svg width="100%" height="690" xmlns="http://www.w3.org/2000/svg" style="margin-top: -40px;">
+ <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">
@@ -26,6 +27,7 @@
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>
<text x="370" y="240" dominant-baseline="middle" text-anchor="middle">NG2024030501A-01</text>
@@ -51,16 +53,27 @@
<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() {
@@ -158,17 +171,18 @@
display: flex;
flex-wrap: wrap;
#home-item {
- border-style: solid;
- border-width: 1px;
- border-color: #E4E4E4;
+ /* border-style: solid; */
+ /* border-width: 1px;
+ border-color: red; */
width: calc(34% - 20px);
padding: 20px 0px 20px 20px;
- margin-right: 10px;
+ 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;
--
Gitblit v1.8.0