From a6be747fb2d15cbb8aad9490bacc374a055ed63f Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 31 十二月 2024 15:16:01 +0800
Subject: [PATCH] 大理片笼指定工程入参，掰片/识别模块样式更改
---
UI-Project/src/views/Identify/identify.vue | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/UI-Project/src/views/Identify/identify.vue b/UI-Project/src/views/Identify/identify.vue
index 7a82929..7521e9f 100644
--- a/UI-Project/src/views/Identify/identify.vue
+++ b/UI-Project/src/views/Identify/identify.vue
@@ -23,7 +23,7 @@
class="rect"
@click="showDialog(rect.glassId)"
:style="{ position: 'absolute',
- top: `${rect.yaxis}px`, left: `${rect.xaxis}px`, width: `${rect.edgWidth}px`, height: `${rect.edgHeight}px`,
+ top: `${rect.yaxisa}px`, left: `${rect.xaxisa}px`, width: `${rect.width}px`, height: `${rect.height}px`,
backgroundColor: rect.isActive ? '#ADFF2F' : getRectColor(rect.state)
}"
>
@@ -152,6 +152,7 @@
var url="/cacheGlass/taskCache/queryCutDrawingByEngineerId?engineerId="+engineerId.value+ "&patternSequence=" + 1;
const response = await request.post(url)
if (response.code === 200) {
+
const rawRects = response.data.currentCutDrawing;
rawData.value = response.data;
totalPages.value = response.data.totalPatternSequence;
@@ -159,8 +160,8 @@
const scaleFactory = 750/3300;
adjustedRects.value = rawRects.map(rect => ({
...rect,
- xaxis: (6000 -(rect.xaxis + rect.edgWidth)) * scaleFactor,
- yaxis: rect.yaxis * scaleFactory,
+ xaxisa: (6000 -(rect.xaxis + rect.edgWidth)) * scaleFactor,
+ yaxisa: rect.yaxis * scaleFactory,
width: rect.edgWidth * scaleFactor ,
widtha: rect.edgWidth ,
heighta: rect.edgHeight ,
@@ -182,8 +183,8 @@
const scaleFactory = 750/3300;
adjustedRects.value = rawRects.map(rect => ({
...rect,
- xaxis: (6000 -(rect.xaxis + rect.edgWidth)) * scaleFactor,
- yaxis: rect.yaxis * scaleFactory,
+ xaxisa: (6000 -(rect.xaxis + rect.edgWidth)) * scaleFactor,
+ yaxisa: rect.yaxis * scaleFactory,
width: rect.edgWidth * scaleFactor ,
widtha: rect.edgWidth ,
heighta: rect.edgHeight ,
--
Gitblit v1.8.0