大理片笼指定工程入参，掰片/识别模块样式更改

wangfei

2024-12-31 a6be747fb2d15cbb8aad9490bacc374a055ed63f

大理片笼指定工程入参，掰片/识别模块样式更改

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

@@ -9,7 +9,7 @@
              class="rect"
              @click="showDialog(rect.glassId)"
              :style="{ position: 'absolute',
              top: `${rect.yAxis}px`, left: `${rect.xAxis}px`, width: `${rect.width}px`, height: `${rect.height}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">
@@ -140,12 +140,12 @@
          if (existingRect) {
            return {
              ...existingRect,
              xAxis: (6000 - (rect.xAxis + rect.width)) * scaleFactor,
              yAxis: rect.yAxis * scaleFactory,
              width: rect.width * scaleFactor,
              height: rect.height * scaleFactory,
              widtha: rect.width,
              heighta: rect.height,
              xAxisa: (6000 - (rect.xAxis + rect.width)) * scaleFactor,
              yAxisa: rect.yAxis * scaleFactory,
              width: rect.edgWidth * scaleFactor,
              height: rect.edgHeight * scaleFactory,
              widtha: rect.edgWidth,
              heighta: rect.edgHeight,
              state: rect.state,
              // 保持 isActive 状态不变
            };
@@ -153,12 +153,12 @@
            // 如果不存在，则添加新矩形，默认 isActive 为 false
            return {
              ...rect,
              xAxis: (6000 - (rect.xAxis + rect.width)) * scaleFactor,
              yAxis: rect.yAxis * scaleFactory,
              width: rect.width * scaleFactor,
              height: rect.height * scaleFactory,
              widtha: rect.width,
              heighta: rect.height,
              xAxisa: (6000 - (rect.xAxis + rect.width)) * scaleFactor,
              yAxisa: rect.yAxis * scaleFactory,
              width: rect.edgWidth * scaleFactor,
              height: rect.edgHeight * scaleFactory,
              widtha: rect.edgWidth,
              heighta: rect.edgHeight,
              state: rect.state,
              isActive: false,
              glassId: rect.glassId,

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

@@ -9,7 +9,7 @@
              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">
@@ -58,10 +58,10 @@
          if (existingRect) {
            return {
              ...existingRect,
              xAxis: (6000 - (rect.xAxis + rect.edgWidth)) * scaleFactor,
              yAxis: rect.yAxis * scaleFactory,
              edgWidth: rect.edgWidth * scaleFactor,
              edgHeight: rect.edgHeight * scaleFactory,
              xAxisa: (6000 - (rect.xAxis + rect.width)) * scaleFactor,
              yAxisa: rect.yAxis * scaleFactory,
              width: rect.edgWidth * scaleFactor,
              height: rect.edgHeight * scaleFactory,
              widtha: rect.edgWidth,
              heighta: rect.edgHeight,
              state: rect.state,
@@ -71,10 +71,10 @@
            // 如果不存在，则添加新矩形，默认 isActive 为 false
            return {
              ...rect,
              xAxis: (6000 - (rect.xAxis + rect.edgWidth)) * scaleFactor,
              yAxis: rect.yAxis * scaleFactory,
              edgWidth: rect.edgWidth * scaleFactor,
              edgHeight: rect.edgHeight * scaleFactory,
              xAxisa: (6000 - (rect.xAxis + rect.width)) * scaleFactor,
              yAxisa: rect.yAxis * scaleFactory,
              width: rect.edgWidth * scaleFactor,
              height: rect.edgHeight * scaleFactory,
              widtha: rect.edgWidth,
              heighta: rect.edgHeight,
              state: rect.state,

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

@@ -23,7 +23,7 @@
      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)
       }"  
    >
@@ -152,6 +152,7 @@
    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;
@@ -159,8 +160,8 @@
      const scaleFactory =  750/3300; 
      adjustedRects.value = rawRects.map(rect => ({  
        ...rect,
        xaxis: (6000 -(rect.xaxis + rect.edgWidth)) * scaleFactor,
        yaxis: rect.yaxis * scaleFactory,
        xaxisa: (6000 -(rect.xaxis + rect.edgWidth)) * scaleFactor,
        yaxisa: rect.yaxis * scaleFactory,
        width: rect.edgWidth * scaleFactor ,
        widtha: rect.edgWidth ,
        heighta: rect.edgHeight ,
@@ -182,8 +183,8 @@
      const scaleFactory =  750/3300; 
      adjustedRects.value = rawRects.map(rect => ({  
        ...rect,
        xaxis: (6000 -(rect.xaxis + rect.edgWidth)) * scaleFactor,
        yaxis: rect.yaxis * scaleFactory,
        xaxisa: (6000 -(rect.xaxis + rect.edgWidth)) * scaleFactor,
        yaxisa: rect.yaxis * scaleFactory,
        width: rect.edgWidth * scaleFactor ,
        widtha: rect.edgWidth ,
        heighta: rect.edgHeight ,

 UI-Project/src/views/Slicecage/slicecage.vue

@@ -377,7 +377,7 @@
    ); 
    if (confirmResult === 'confirm') {  
      const response = await request.post("/cacheVerticalGlass/bigStorageCageDetails/appointTemperingEngineerId",{
        engineerId: row.engineer_id
        engineerId: row.engineerId
    });
    if (response.code === 200) {
      ElMessage.success(response.message);
@@ -389,7 +389,7 @@
    console.error('发生错误:', error);  
  }  
}; 
// 指定工程
// 取消指定
const broked = async() => {  
  try {
    const confirmResult = await ElMessageBox.confirm(