Merge remote-tracking branch 'origin/master'

zhoushihao

2025-03-03 bd21c609d3e0f325f10f20bb1f59ae24a4b35dc2

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

@@ -23,13 +23,14 @@
      class="rect"  
      @click="showDialog(rect.glassId)"  
      :style="{ position: 'absolute', 
      top: `${rect.yaxis}px`, left: `${rect.xaxis}px`, width: `${rect.edgWidth}px`, height: `${rect.edgHeight}px`,
      top: `${rect.yaxisa}px`, left: `${rect.xaxisa}px`, width: `${rect.width}px`, height: `${rect.height}px`,
      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>
@@ -152,19 +153,20 @@
    var url="/cacheGlass/taskCache/queryCutDrawingByEngineerId?engineerId="+engineerId.value+ "&patternSequence=" + 1;
    const response = await request.post(url)
    if (response.code === 200) {
      
      const rawRects = response.data.currentCutDrawing;
      rawData.value = response.data;
      totalPages.value = response.data.totalPatternSequence;
      const scaleFactor =  1621.78/6000; 
      const scaleFactory =  750/3300; 
      adjustedRects.value = rawRects.map(rect => ({  
      adjustedRects.value = rawRects.map(rect => ({
        ...rect,
        xaxis: (6000 -(rect.xaxis + rect.edgWidth)) * scaleFactor,
        yaxis: rect.yaxis * scaleFactory,
        width: rect.edgWidth * scaleFactor ,
        xaxisa: (6000 -(rect.xaxis + rect.edgWidth)) * scaleFactor * 1.1,
        yaxisa: rect.yaxis * scaleFactory * 1.1,
        width: rect.edgWidth * scaleFactor  * 1.1,
        widtha: rect.edgWidth ,
        heighta: rect.edgHeight ,
        height: rect.edgHeight * scaleFactory,
        height: rect.edgHeight * scaleFactory * 1.1,
        state: rect.state
      })); 
       currentPage.value = 1;
@@ -182,12 +184,12 @@
      const scaleFactory =  750/3300; 
      adjustedRects.value = rawRects.map(rect => ({  
        ...rect,
        xaxis: (6000 -(rect.xaxis + rect.edgWidth)) * scaleFactor,
        yaxis: rect.yaxis * scaleFactory,
        width: rect.edgWidth * scaleFactor ,
        xaxisa: (6000 -(rect.xaxis + rect.edgWidth)) * scaleFactor * 1.1,
        yaxisa: rect.yaxis * scaleFactory * 1.1,
        width: rect.edgWidth * scaleFactor  * 1.1,
        widtha: rect.edgWidth ,
        heighta: rect.edgHeight ,
        height: rect.edgHeight * scaleFactory,
        height: rect.edgHeight * scaleFactory * 1.1,
        state: rect.state
      })); 
    }
@@ -235,7 +237,7 @@
  justify-content: center;  
  align-items: center; 
  height: 100%;
  font-size: small;
  /* font-size: large; */
}
#rect {  
  position: relative; /* 确保箭头可以相对于矩形定位 */