From 4e3b8155722b66e25df3c6fd42cc586b68dea391 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/Identify/identify.vue | 72 +++++++++++++++++++++--------------
1 files changed, 43 insertions(+), 29 deletions(-)
diff --git a/UI-Project/src/views/Identify/identify.vue b/UI-Project/src/views/Identify/identify.vue
index ed36711..6a1e5f0 100644
--- a/UI-Project/src/views/Identify/identify.vue
+++ b/UI-Project/src/views/Identify/identify.vue
@@ -1,7 +1,7 @@
<template>
<div style="height: 500px;">
<div style="display: flex;">
- <el-input v-model="engineerId" style="margin-left: 15px;margin-top: 10px;width: 240px" :placeholder="$t('order.projectnumber')" @blur="handleBlur"/>
+ <el-input v-model="engineerId" style="margin-left: 15px;margin-top: 10px;width: 240px" :placeholder="$t('order.projectnumber')"/>
<el-button type="primary" style="margin-left: 10px;margin-top: 10px;" @click="sethistorical()">{{$t('reportmanage.inquire')}}</el-button>
<el-pagination
v-model:current-page="currentPage"
@@ -14,7 +14,7 @@
style="margin-top: 10px;"
/>
</div>
- <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 800px;" v-loading="loading">
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 800px;">
<el-scrollbar height="750px" width="1400px" style="background-color: #e9e9eb;">
<div style="position: relative;">
<div
@@ -82,6 +82,8 @@
const totalPages = ref(0);
const pageSize = ref(1);
const currentPage = ref('');
+const realwidth = ref('');
+const realheight = ref('');
const disabled = false;
const size = 'small';
const rawData = ref([]);
@@ -153,20 +155,23 @@
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;
- const scaleFactor = 1621.78/6000;
- const scaleFactory = 750/3300;
- adjustedRects.value = rawRects.map(rect => ({
+ realwidth.value = response.data.upPattenUsage.width;
+ realheight.value = response.data.upPattenUsage.height;
+ const realx = realwidth.value;
+ const realy = realheight.value;
+ const scaleFactor = 1621.78/realx;
+ const scaleFactory = 750/realy;
+ adjustedRects.value = rawRects.map(rect => ({
...rect,
- xaxisa: (6000 -(rect.xaxis + rect.edgWidth)) * scaleFactor * 1.1,
- yaxisa: rect.yaxis * scaleFactory * 1.1,
- width: rect.edgWidth * scaleFactor * 1.1,
- widtha: rect.edgWidth ,
+ xaxisa: rect.xaxis * scaleFactor,
+ yaxisa: (realy - (rect.yaxis + rect.edgHeight )) * scaleFactory,
+ width: rect.edgWidth * scaleFactor,
+ widtha: rect.edgWidth,
heighta: rect.edgHeight ,
- height: rect.edgHeight * scaleFactory * 1.1,
+ height: rect.edgHeight * scaleFactory,
state: rect.state
}));
currentPage.value = 1;
@@ -178,36 +183,45 @@
const response = await request.post(url)
if (response.code === 200) {
const rawRects = response.data.currentCutDrawing;
- console.log(response.data);
rawData.value = response.data;
- const scaleFactor = 1621.78/6000;
- const scaleFactory = 750/3300;
+ realwidth.value = response.data.upPattenUsage.width;
+ realheight.value = response.data.upPattenUsage.height;
+ const realx = realwidth.value;
+ const realy = realheight.value;
+ const scaleFactor = 1621.78/realx;
+ const scaleFactory = 750/realy;
adjustedRects.value = rawRects.map(rect => ({
...rect,
- xaxisa: (6000 -(rect.xaxis + rect.edgWidth)) * scaleFactor * 1.1,
- yaxisa: rect.yaxis * scaleFactory * 1.1,
- width: rect.edgWidth * scaleFactor * 1.1,
- widtha: rect.edgWidth ,
- heighta: rect.edgHeight ,
- height: rect.edgHeight * scaleFactory * 1.1,
+ xaxisa: rect.xaxis * scaleFactor,
+ yaxisa: (realy - (rect.yaxis + rect.edgHeight )) * scaleFactory,
+ width: rect.edgWidth * scaleFactor,
+ widtha: rect.edgWidth,
+ heighta: rect.edgHeight,
+ height: rect.edgHeight * scaleFactory,
state: rect.state
}));
}
};
function getRectColor(state: number): string {
switch (state) {
- case 0:
- return '#e1f3d8';
- case 100:
- return '#c8c9cc';
- case 110:
- return '#b3e19d';
- case 120:
- return '#f89898';
+ case 0:
+ return '#7AC5CD';
+ case 1:
+ return '#95d475';
+ case -1:
+ return '#99BBFF';
+ case 2:
+ return 'lightblue';
+ case 3:
+ return '#eebe77';
+ case 4:
+ return '#CD6090';
case 8:
return '#911005';
case 9:
- return '#f3d19e';
+ return '#4682B4';
+ default:
+ return '#CDAF95';
}
}
const optionsb = [
--
Gitblit v1.8.0