From 2b91b242113bd10f1be241d19ab154e9ad6506cd Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 10 六月 2025 14:18:00 +0800
Subject: [PATCH] 国际化命名

---
 UI-Project/src/views/NewPage.vue |   20 ++++++++------------
 1 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/UI-Project/src/views/NewPage.vue b/UI-Project/src/views/NewPage.vue
index 8b81abe..96c235d 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,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(  
@@ -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