From e27ac872241c10dbca9d14abb08d0e4e1f138bc0 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 02 八月 2024 14:10:11 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes
---
UI-Project/src/views/Identify/identify.vue | 79 ++++++++++++++++++++-------------------
1 files changed, 40 insertions(+), 39 deletions(-)
diff --git a/UI-Project/src/views/Identify/identify.vue b/UI-Project/src/views/Identify/identify.vue
index 5111448..e7be5c2 100644
--- a/UI-Project/src/views/Identify/identify.vue
+++ b/UI-Project/src/views/Identify/identify.vue
@@ -1,10 +1,10 @@
<template>
<el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;" v-loading="loading">
- <el-scrollbar height="600px">
+ <el-scrollbar height="600px" >
<div id="app" style="margin-top: 20px;">
- <div
- :style="{ width: `${olWidth}px`, height: `${olHeight}px`,position: 'relative' }"
- >
+ <!-- <div
+ :style="{ width: `${olWidth}px`, height: `${olHeight}px`,position: 'relative',}"
+ > -->
<div
v-for="(rect, index) in adjustedRects"
:key="rect.glass_id"
@@ -34,7 +34,7 @@
{{ $t('order.Takeaway') }}</el-button>
</el-dialog>
</div>
- </div>
+ <!-- </div> -->
</el-scrollbar>
</el-card>
</template>
@@ -64,42 +64,42 @@
currentGlassId.value = glassId;
blind.value = true;
}
-onMounted(async () => {
- try {
- const response = await request.post('/cacheGlass/taskCache/currentCutTerritory'); // 鏇挎崲涓轰綘鐨凙PI绔偣
- if (response.code === 200) {
- // const process_id = response.data[0].process_id
- const rawRects = response.data; // 璁剧疆鐭╁舰鏁版嵁
- console.log(response.data);
- const { olWidth: newolWidth, olHeight: newolHeight, process_id: newprocess_id ,glass_id:newglass_id } = response.data; // 鑾峰彇灏哄
- olWidth.value = newolWidth; // 璁剧疆瀹瑰櫒瀹藉害
- olHeight.value = newolHeight; // 璁剧疆瀹瑰櫒楂樺害
- process_id.value = newprocess_id;
- glass_id.value = newglass_id;
+// onMounted(async () => {
+// try {
+// const response = await request.post('/cacheGlass/taskCache/currentCutTerritory'); // 鏇挎崲涓轰綘鐨凙PI绔偣
+// if (response.code === 200) {
+// // const process_id = response.data[0].process_id
+// const rawRects = response.data; // 璁剧疆鐭╁舰鏁版嵁
+// console.log(response.data);
+// const { olWidth: newolWidth, olHeight: newolHeight, process_id: newprocess_id ,glass_id:newglass_id } = response.data; // 鑾峰彇灏哄
+// olWidth.value = newolWidth; // 璁剧疆瀹瑰櫒瀹藉害
+// olHeight.value = newolHeight; // 璁剧疆瀹瑰櫒楂樺害
+// process_id.value = newprocess_id;
+// glass_id.value = newglass_id;
- adjustedRects.value = rawRects.map(rect => ({
- ...rect, // 澶嶅埗鍘熷瀵硅薄鐨勫叾浠栧睘鎬�
- x_axis: (rect.x_axis*100) * 0.003, // 灏唜鍊奸櫎浠�3
- y_axis: (rect.y_axis*100) * 0.003,
- width: (rect.width*100) * 0.002 ,
- widtha: rect.width ,
- heighta: rect.height ,
- height:( rect.height*100) * 0.002 ,
- glass_state: rect.glass_state
- }));
- console.log(adjustedRects.value);
+// adjustedRects.value = rawRects.map(rect => ({
+// ...rect, // 澶嶅埗鍘熷瀵硅薄鐨勫叾浠栧睘鎬�
+// x_axis: (rect.x_axis*100) * 0.003, // 灏唜鍊奸櫎浠�3
+// y_axis: (rect.y_axis*100) * 0.003,
+// width: (rect.width*100) * 0.002 ,
+// widtha: rect.width ,
+// heighta: rect.height ,
+// height:( rect.height*100) * 0.002 ,
+// glass_state: rect.glass_state
+// }));
+// console.log(adjustedRects.value);
- // console.log( (rect.width*100) / 300 );
- } else {
- // console.error('Failed to fetch rectangles from API.');
- console.error('Failed to fetch rects from API.');
- }
- } catch (error) {
- // console.error('Error fetching rectangles :', error);
- console.error('Error fetching rects :', error);
- }
-});
+// // console.log( (rect.width*100) / 300 );
+// } else {
+// // console.error('Failed to fetch rectangles from API.');
+// console.error('Failed to fetch rects from API.');
+// }
+// } catch (error) {
+// // console.error('Error fetching rectangles :', error);
+// console.error('Error fetching rects :', error);
+// }
+// });
// 鐮存崯
const handleDamage = async () => {
try {
@@ -187,7 +187,8 @@
// adjustedRects.value = data.currentCutTerritory[0]
adjustedRects.value = data.currentCutTerritory[0].map(rect => ({
...rect,
- x_axis: (rect.x_axis*100) * 0.003,
+ x_axis: 1360 -(rect.x_axis + rect.width) * 0.37,
+ // x_axis: (rect.x_axis*100) * 0.003,
y_axis: (rect.y_axis*100) * 0.003,
width: (rect.width*100) * 0.002 ,
widtha: rect.width ,
--
Gitblit v1.8.0