From d55b5b015eef8c31d9dea6587dc6fd0e02818cd1 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 31 十月 2025 08:21:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/NewPage.vue | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/UI-Project/src/views/NewPage.vue b/UI-Project/src/views/NewPage.vue
index 8b81abe..29d459e 100644
--- a/UI-Project/src/views/NewPage.vue
+++ b/UI-Project/src/views/NewPage.vue
@@ -5,10 +5,10 @@
<el-input v-model="current" style="margin-left: 20px;margin-top: 15px;width: 240px" placeholder="璇疯緭鍏ュ伐绋嬪彿" @input="updateUrl"/>
<el-button style="margin-top: 15px;margin-left: 15px;" type="primary" @click="fetchData">鏌ヨ</el-button>
</div>
- <el-card style="flex: 1;margin-left: 400px;margin-top: 50px;margin-right: 10px;width: 1100px;" height="900" v-loading="loading">
+ <el-card style="flex: 1;margin-left: 400px;margin-top: 50px;margin-right: 10px;width: 1100px;" height="900" >
<div v-for="(row, rowIndex) in divsData" :key="rowIndex" class="row">
<div v-for="(rect, colIndex) in row" :key="colIndex" class="div-container">
- <!-- <div style="text-align: center;">鐐夊彿锛歿{ getAdjustedRectsForRow(rowIndex)[0].layout_id }}</div> -->
+ <div style="text-align: center;">鐐夊彿锛歿{ getAdjustedRectsForRow(rowIndex)[0].layout_id }} ---- 瑁呰浇鐜囷細{{ getAdjustedRectsForRow(rowIndex)[0].olLayoutRate }}</div>
<el-scrollbar height="550px" width="1000px" style="background-color: #e9e9eb;">
<div style="position: relative;width: 100%;height: 100%;">
<div
@@ -22,9 +22,10 @@
height: `${rect.height}px`,
backgroundColor: 'lightblue'}">
<div class="centered-text">
- <div style="font-size: 15px;font-weight: bold;">{{ rect.process_id }}</div>
- <div style="font-size: 15px;font-weight: bold;">{{ rect.project_no }}</div>
- <div style="font-size: 30px;font-weight: bold;">{{ rect.widtha }}*{{ rect.heighta }}</div>
+ <div style="font-size: 10px;font-weight: bold;">{{ rect.sort }}</div>
+ <div style="font-size: 10px;font-weight: bold;">{{ rect.process_id }}</div>
+ <div style="font-size: 10px;font-weight: bold;">{{ rect.project_no }}</div>
+ <div style="font-size: 10px;font-weight: bold;">{{ rect.widtha }}*{{ rect.heighta }}</div>
</div>
</div>
</div>
@@ -59,11 +60,9 @@
if (response.code === 200) {
rawData.value = response.data;
processData(rawData.value);
- } else {
- // ElMessage.warning(res.msg)
+ } else {
}
- } catch (error) {
- // console.error('Error fetching rects :', error);
+ } catch (error) {
}
});
watch(
@@ -80,8 +79,7 @@
rawData.value = response.data;
processData(rawData.value);
}
-} catch (error) {
- console.error('Failed to fetch data:', error);
+} catch (error) {
} finally {
loading.value = false;
}
@@ -95,7 +93,7 @@
const rowIndex = divsData.value;
adjustedRectsPerRow.value = divsData.value.map(() => []);
divsData.value.forEach((row, rowIndex) => {
- const rawRowData = rawData.value[rowIndex];
+ const rawRowData = rawData.value[rowIndex].listGlass;
if (rawRowData) {
adjustedRectsPerRow.value[rowIndex] = rawRowData.map(rect => {
let adjustedWidth, adjustedHeight,newX,widtha,heighta;
@@ -133,9 +131,7 @@
function getAdjustedRectsForRow(rowIndex) {
return adjustedRectsPerRow.value[rowIndex] || [];
}
- </script>
-
-
+</script>
<style scoped>
.row {
display: flex;
--
Gitblit v1.8.0