Merge remote-tracking branch 'origin/master'

zhoushihao

2025-03-03 bd21c609d3e0f325f10f20bb1f59ae24a4b35dc2

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

@@ -13,8 +13,9 @@
              backgroundColor: rect.isActive ? '#ADFF2F' : getRectColor(rect.state)
               }">
            <div class="centered-text">
              <div>{{ rect.glassId }}</div>
              <div>{{ rect.widtha }}*{{ rect.heighta }}</div>
              <div style="font-size: 20px;font-weight: bold;">{{ rect.glassId }}</div>
              <div style="font-size: 20px;font-weight: bold;">{{ rect.flowCardId }}</div>
              <div style="font-size: 30px;font-weight: bold;">{{ rect.widtha }}*{{ rect.heighta }}</div>
            </div>
          </div>
        </div>
@@ -58,7 +59,7 @@
          if (existingRect) {
            return {
              ...existingRect,
              xAxisa: (6000 - (rect.xAxis + rect.width)) * scaleFactor * 1.1,
              xAxisa: (6000 - (rect.xAxis + rect.edgWidth)) * scaleFactor * 1.1,
              yAxisa: rect.yAxis * scaleFactory * 1.1,
              width: rect.edgWidth * scaleFactor * 1.1,
              height: rect.edgHeight * scaleFactory * 1.1,
@@ -71,7 +72,7 @@
            // 如果不存在，则添加新矩形，默认 isActive 为 false
            return {
              ...rect,
              xAxisa: (6000 - (rect.xAxis + rect.width)) * scaleFactor * 1.1,
              xAxisa: (6000 - (rect.xAxis + rect.edgWidth)) * scaleFactor * 1.1,
              yAxisa: rect.yAxis * scaleFactory * 1.1,
              width: rect.edgWidth * scaleFactor * 1.1,
              height: rect.edgHeight * scaleFactory * 1.1,
@@ -188,7 +189,7 @@
  justify-content: center;
  align-items: center;
  height: 100%; /* 确保div占据整个矩形的高度 */
  font-size: large;
  /* font-size: large; */
}
#line {
  position: absolute;