Merge remote-tracking branch 'origin/master'

zhoushihao

2024-06-12 1cded29e225b3a73768d8badfc19fba825673451

 UI-Project/src/views/Identify/identify.vue

@@ -76,12 +76,12 @@

      adjustedRects.value = rawRects.map(rect => ({  
        ...rect, // 复制原始对象的其他属性  
        x_axis: (rect.x_axis*100) * 0.005, // 将x值除以3  
        y_axis: (rect.y_axis*100) * 0.005,
        width: (rect.width*100) * 0.004 ,
        x_axis: (rect.x_axis*100) * 0.004, // 将x值除以3  
        y_axis: (rect.y_axis*100) * 0.004,
        width: (rect.width*100) * 0.002 ,
        widtha: rect.width ,
        heighta: rect.height ,
        height:( rect.height*100) * 0.004 ,
        height:( rect.height*100) * 0.002 ,
        glass_state: rect.glass_state
      }));  
      console.log(adjustedRects.value);
@@ -183,12 +183,12 @@
  // adjustedRects.value = data.currentCutTerritory[0]
  adjustedRects.value = data.currentCutTerritory[0].map(rect => ({  
        ...rect, // 复制原始对象的其他属性  
        x_axis: (rect.x_axis*100) * 0.005, // 将x值除以3  
        y_axis: (rect.y_axis*100) * 0.005,
        width: (rect.width*100) * 0.004 ,
        x_axis: (rect.x_axis*100) * 0.004, // 将x值除以3  
        y_axis: (rect.y_axis*100) * 0.004,
        width: (rect.width*100) * 0.002 ,
        widtha: rect.width ,
        heighta: rect.height ,
        height:( rect.height*100) * 0.004 ,
        height:( rect.height*100) * 0.002 ,
        glass_state: rect.glass_state
      }));  
 // console.log("更新后数据", tableData);