From a1bf701b728e79151bc34ffc8cbe479ab9ca53e4 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 11 三月 2025 16:25:38 +0800
Subject: [PATCH] 单独钢化页面新增序号显示，钢化前大理片笼部分样式及接口
---
UI-Project/src/views/NewPage.vue | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/UI-Project/src/views/NewPage.vue b/UI-Project/src/views/NewPage.vue
index 8b81abe..94a1e03 100644
--- a/UI-Project/src/views/NewPage.vue
+++ b/UI-Project/src/views/NewPage.vue
@@ -8,7 +8,7 @@
<el-card style="flex: 1;margin-left: 400px;margin-top: 50px;margin-right: 10px;width: 1100px;" height="900" v-loading="loading">
<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,6 +22,7 @@
height: `${rect.height}px`,
backgroundColor: 'lightblue'}">
<div class="centered-text">
+ <div style="font-size: 15px;font-weight: bold;">{{ rect.sort }}</div>
<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>
@@ -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(
@@ -78,6 +77,8 @@
const response = await request.post(`/cacheGlass/taskCache/temperingTerritory?current=${current.value}`);
if (response.code === 200) {
rawData.value = response.data;
+ console.log(response.data);
+
processData(rawData.value);
}
} catch (error) {
@@ -95,7 +96,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 +134,7 @@
function getAdjustedRectsForRow(rowIndex) {
return adjustedRectsPerRow.value[rowIndex] || [];
}
- </script>
-
-
+</script>
<style scoped>
.row {
display: flex;
--
Gitblit v1.8.0