Merge remote-tracking branch 'origin/master'

zhoushihao

2024-12-31 b71ae6310a48763ca79216db617e36c99d7b9ef7

Merge remote-tracking branch 'origin/master'

 UI-Project/src/views/Caching/cachingbefore.vue

@@ -149,7 +149,7 @@
const handleptask = async() => { 
  try {
    const confirmResult = await ElMessageBox.confirm(  
      t('workOrder.partasks'), 
      t('searchOrder.partasks'), 
      t('workOrder.prompt'),  
      {  
        confirmButtonText: t('workOrder.yes'), 
@@ -325,7 +325,7 @@
    <template #default="props">
      <el-table 
      :header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }"
      :data="props.row.details" style="width: 100%;height: 200px;">
      :data="props.row.details" style="width: 100%;height: 100px;">
        <el-table-column prop="engineerId" align="center" :label="$t('searchOrder.projectnumber')" min-width="80" />
          <el-table-column prop="flowCardId" align="center" :label="$t('hellow.flowCardId')" min-width="80" />
          <el-table-column prop="glassId" align="center" :label="$t('searchOrder.glassID')" min-width="80" />

 UI-Project/src/views/Caching/cachingun.vue

@@ -148,7 +148,7 @@
const handleptask = async() => { 
  try {
    const confirmResult = await ElMessageBox.confirm(  
      t('workOrder.partasks'), 
      t('searchOrder.partasks'), 
      t('workOrder.prompt'),  
      {  
        confirmButtonText: t('workOrder.yes'), 
@@ -324,7 +324,7 @@
    <template #default="props">
      <el-table 
      :header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }"
      :data="props.row.details" style="width: 100%;height: 200px;">
      :data="props.row.details" style="width: 100%;height: 100px;">
        <el-table-column prop="engineerId" align="center" :label="$t('searchOrder.projectnumber')" min-width="80" />
          <el-table-column prop="flowCardId" align="center" :label="$t('hellow.flowCardId')" min-width="80" />
          <el-table-column prop="glassId" align="center" :label="$t('searchOrder.glassID')" min-width="80" />

 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(  

 UI-Project/src/views/hollow/hollowequipment.vue

@@ -718,7 +718,7 @@
  </el-dialog>
  <!-- 中空配方 -->
  <el-dialog v-model="mulan" top="15vh" width="80%" :title="$t('hellow.hollowformula')">
    <el-button id="searchButton" type="primary"  @click="add = true">
    <el-button id="searchButton" type="primary"  @click="openAddDialog">
          {{ $t('basicData.add') }}
        </el-button>
      <el-table ref="table" style="margin-top: 20px;height: 400px;"
@@ -950,6 +950,27 @@
    sealInsert.value = row.sealInsert;
    adda.value = true;
} 
function openAddDialog() {  
    formulaName.value = '';
    filmRemove.value = '';
    bottomRemove.value = '';
    leftRemove.value = '';
    rightRemove.value = '';
    topRemove.value = '';
    casFour.value = '';
    casOne.value = '';
    casThree.value = '';
    casTwo.value = '';
    frameFour.value = '';
    frameOne.value = '';
    frameThree.value = '';
    frameTwo.value = '';
    intervalFrameHeight.value = '';
    intervalFrameType.value = '';
    intervalFrameWidth.value = '';
    sealInsert.value = '';
    add.value = true;
}
const handlezhiban = () => {
  dialogFormVisiblea.value = true;
  fetchFlowCardId();

 UI-Project/src/views/hollow/hollowequipmenttwo.vue

@@ -483,7 +483,7 @@
  </el-dialog>
  <!-- 中空配方 -->
  <el-dialog v-model="mulan" top="15vh" width="70%" :title="$t('hellow.hollowformula')">
    <el-button id="searchButton" type="primary"  @click="add = true">
    <el-button id="searchButton" type="primary"  @click="openAddDialog">
          {{ $t('basicData.add') }}
        </el-button>
      <el-table ref="table" style="margin-top: 20px;height: 400px;"
@@ -633,6 +633,15 @@
    topRemove.value = row.topRemove;
    adda.value = true;
} 
function openAddDialog() {  
    formulaName.value = '';
    filmRemove.value = '';
    bottomRemove.value = '';
    leftRemove.value = '';
    rightRemove.value = '';
    topRemove.value = '';
    add.value = true;
}
const handlezhiban = () => {
  dialogFormVisiblea.value = true;
  fetchFlowCardId();