系统配置页面修改bug，上片新增页面

wangfei

2025-04-23 1d3f8dc16ca98b14a40da8c70a405793295faa78

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

@@ -1,6 +1,6 @@
<template>
  <div style="height: 600px;">
    <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;" v-loading="loading">
    <el-card style="flex: 1;margin-left: 10px;margin-top: 10px;" >
      <div style="display: flex; flex-direction: row; align-items: center; margin-bottom: 10px;">
        <el-button id="searchButton" type="primary" @click="handleormulan">
          {{ $t('hellow.hollowformula') }}
@@ -23,7 +23,6 @@
            $t('hellow.stopproject')
          }}
        </el-button>
    <el-switch style="margin-top: 7px;margin-left: 10px;" v-model="ganghua" class="mb-2" :inactive-text="$t('hellow.schedulingswitch')" @change="handleChange" />
  </div>
     
    <div id="dotClass">
@@ -74,13 +73,16 @@
    ref="table"
    style="margin-top: 20px; height: 700px;"
    :data="tableDatab"
    :row-class-name="tableRowClassName"
    :header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }"
    row-key="projectNumber"
  >
    <!-- <el-table-column type="expand"> -->
    <el-table-column>
    <template #default="props">
      <el-table :data="props.row.records" style="width: 100%">
      <el-table :data="props.row.flowCardGlassInfoDTOList" style="width: 100%"
      :row-class-name="(row) => nestedTableRowClassName(props.row, row)" 
      >
      <el-table-column prop="layer" fixed align="center" :label="$t('hellow.layernumber')" min-width="80"/>
      <el-table-column prop="thickness" align="center" :label="$t('hellow.thickness')" min-width="80"/>
      <el-table-column prop="filmsId" align="center" :label="$t('hellow.coatingtypes')" min-width="80"/>
@@ -91,15 +93,16 @@
      </el-table>
      </template>
    </el-table-column>
    <el-table-column prop="projectNumber" fixed align="center" :label="$t('hellow.cardnumber')" min-width="20"/>
    <el-table-column prop="flowCardId" fixed align="center" :label="$t('hellow.cardnumber')" min-width="20"/>
    <el-table-column prop="productName" fixed align="center" :label="$t('large.productname')" min-width="20"/>
    <el-table-column fixed="right" :label="$t('hellow.operate')" align="center" width="270">
        <template #default="scope">
          <el-button size="mini" type="text" plain @click="handletake(scope.row)">{{ $t('hellow.claimquest') }}</el-button>
          <el-button size="mini" type="text" plain @click="handleBindRack(scope.row)">{{
          <el-button type="text" :disabled="scope.row.isThroughSlot" plain @click="handletake(scope.row)">{{ $t('hellow.claimquest') }}</el-button>
          <el-button type="text" plain @click="handleBindRack(scope.row)">{{
              $t('hellow.missingfilms')
            }}
          </el-button>
          <el-button size="mini" type="text" plain @click="handleout(scope.row)">{{
          <el-button type="text" plain @click="handleout(scope.row)">{{
              $t('hellow.forcedfilming')
            }}
          </el-button>
@@ -110,21 +113,21 @@
<!-- 中空配方添加 -->
<el-dialog v-model="add" top="23vh" width="55%" :title="$t('hellow.hollowformula')" >
    <div style="margin-left: 50px;margin-top: 10px;margin-bottom: 10px;">
     <el-form  size="mini" label-width="150px">
      <el-form label-width="150px" label-position="right">
     <el-form  label-width="200px">
      <el-form label-width="200px" label-position="right">
        <el-row style="margin-top: 10px;">
          <el-col :span="6">
              <div id="dt" style="font-size: 15px;">
        <div>
              <el-form-item :label="$t('hellow.formulaName')" :required="true" style="width: 16vw;">
              <el-form-item :label="$t('hellow.formulaName')" :required="true" style="width: 20vw;">
                <el-input :placeholder="$t('hellow.formulaNamea')" v-model="formulaName" autocomplete="off" />
              </el-form-item></div></div>
          </el-col>
          <el-col :span="9">
            <div id="dta" style="font-size: 15px;">
        <div>
          <el-form-item :label="$t('Mounting.removalmethoda')" :required="true" style="width: 16vw;">
            <el-select v-model="filmRemove" clearable  style="width: 220px" :placeholder="$t('Mounting.removalmethod')">
          <el-form-item :label="$t('Mounting.removalmethoda')" :required="true" style="width: 20vw;">
            <el-select v-model="filmRemove" clearable  style="width: 270px" :placeholder="$t('Mounting.removalmethod')">
        <el-option :label="$t('Mounting.removal')" value="1"></el-option>
        <el-option :label="$t('Mounting.noremoval')" value="0"></el-option>
      </el-select>
@@ -133,35 +136,35 @@
              </div>
          </el-col>
        </el-row>
        <el-row style="margin-top: 10px;">
        <el-row style="margin-top: 30px;">
          <el-col :span="6">
              <div id="dt" style="font-size: 15px;">
        <div>
          <el-form-item :label="$t('hellow.bottomRemove')" :required="true" style="width: 16vw;">
          <el-form-item :label="$t('hellow.bottomRemove')" :required="true" style="width: 20vw;">
                <el-input :placeholder="$t('hellow.bottomRemovea')" v-model="bottomRemove" autocomplete="off" />
              </el-form-item></div></div>
          </el-col>
          <el-col :span="9">
            <div id="dta" style="font-size: 15px;">
        <div>
          <el-form-item :label="$t('hellow.topRemove')" :required="true" style="width: 16vw;">
          <el-form-item :label="$t('hellow.topRemove')" :required="true" style="width: 20vw;">
                <el-input :placeholder="$t('hellow.topRemovea')" v-model="topRemove" autocomplete="off" />
           </el-form-item>
            </div></div>
          </el-col>
        </el-row>
        <el-row style="margin-top: 10px;">
        <el-row style="margin-top: 30px;">
          <el-col :span="6">
              <div id="dt" style="font-size: 15px;">
        <div>
          <el-form-item :label="$t('hellow.leftRemove')" :required="true" style="width: 16vw;">
          <el-form-item :label="$t('hellow.leftRemove')" :required="true" style="width: 20vw;">
                <el-input :placeholder="$t('hellow.leftRemovea')" v-model="leftRemove" autocomplete="off" />
              </el-form-item></div></div>
          </el-col>
          <el-col :span="9">
            <div id="dta" style="font-size: 15px;">
        <div>
          <el-form-item :label="$t('hellow.rightRemove')" :required="true" style="width: 16vw;">
          <el-form-item :label="$t('hellow.rightRemove')" :required="true" style="width: 20vw;">
            <el-input :placeholder="$t('hellow.rightRemovea')" v-model="rightRemove" autocomplete="off" />
              </el-form-item>
            </div></div>
@@ -182,21 +185,21 @@
<!-- 中空配方修改 -->
<el-dialog v-model="adda" top="23vh" width="55%" :title="$t('hellow.edithollowformula')" >
    <div style="margin-left: 50px;margin-top: 10px;margin-bottom: 10px;">
     <el-form  size="mini" label-width="150px">
      <el-form label-width="150px" label-position="right">
     <el-form  label-width="200px">
      <el-form label-width="200px" label-position="right">
        <el-row style="margin-top: 10px;">
          <el-col :span="6">
              <div id="dt" style="font-size: 15px;">
        <div>
              <el-form-item :label="$t('hellow.formulaName')" :required="true" style="width: 16vw;">
              <el-form-item :label="$t('hellow.formulaName')" :required="true" style="width: 20vw;">
                <el-input :placeholder="$t('hellow.formulaNamea')" v-model="formulaName" autocomplete="off" />
              </el-form-item></div></div>
          </el-col>
          <el-col :span="9">
            <div id="dta" style="font-size: 15px;">
        <div>
          <el-form-item :label="$t('Mounting.removalmethoda')" :required="true" style="width: 16vw;">
            <el-select v-model="filmRemove" clearable  style="width: 220px" :placeholder="$t('Mounting.removalmethod')">
          <el-form-item :label="$t('Mounting.removalmethoda')" :required="true" style="width: 20vw;">
            <el-select v-model="filmRemove" clearable  style="width: 270px" :placeholder="$t('Mounting.removalmethod')">
        <el-option :label="$t('Mounting.removal')" value="1"></el-option>
        <el-option :label="$t('Mounting.noremoval')" value="0"></el-option>
      </el-select>
@@ -205,35 +208,35 @@
              </div>
          </el-col>
        </el-row>
        <el-row style="margin-top: 10px;">
        <el-row style="margin-top: 30px;">
          <el-col :span="6">
              <div id="dt" style="font-size: 15px;">
        <div>
          <el-form-item :label="$t('hellow.bottomRemove')" :required="true" style="width: 16vw;">
          <el-form-item :label="$t('hellow.bottomRemove')" :required="true" style="width: 20vw;">
                <el-input :placeholder="$t('hellow.bottomRemovea')" v-model="bottomRemove" autocomplete="off" />
              </el-form-item></div></div>
          </el-col>
          <el-col :span="9">
            <div id="dta" style="font-size: 15px;">
        <div>
          <el-form-item :label="$t('hellow.topRemove')" :required="true" style="width: 16vw;">
          <el-form-item :label="$t('hellow.topRemove')" :required="true" style="width: 20vw;">
                <el-input :placeholder="$t('hellow.topRemovea')" v-model="topRemove" autocomplete="off" />
           </el-form-item>
            </div></div>
          </el-col>
        </el-row>
        <el-row style="margin-top: 10px;">
        <el-row style="margin-top: 30px;">
          <el-col :span="6">
              <div id="dt" style="font-size: 15px;">
        <div>
          <el-form-item :label="$t('hellow.leftRemove')" :required="true" style="width: 16vw;">
          <el-form-item :label="$t('hellow.leftRemove')" :required="true" style="width: 20vw;">
                <el-input :placeholder="$t('hellow.leftRemovea')" v-model="leftRemove" autocomplete="off" />
              </el-form-item></div></div>
          </el-col>
          <el-col :span="9">
            <div id="dta" style="font-size: 15px;">
        <div>
          <el-form-item :label="$t('hellow.rightRemove')" :required="true" style="width: 16vw;">
          <el-form-item :label="$t('hellow.rightRemove')" :required="true" style="width: 20vw;">
            <el-input :placeholder="$t('hellow.rightRemovea')" v-model="rightRemove" autocomplete="off" />
              </el-form-item>
            </div></div>
@@ -254,9 +257,9 @@
  <!-- 领取任务 -->
  <el-dialog v-model="dialogFormVisiblec" top="21vh" width="40%" :title="$t('hellow.claimquest')">
    <div style="margin-left: 20px;margin-top: 10px;margin-bottom: 10px;">
      <el-form size="mini" label-width="100px">
      <el-form label-width="100px">
        <el-form label-width="210px" label-position="right">
          <el-form-item :label="$t('hellow.pairQuantity')" :required="true" style="width: 25vw">
          <el-form-item :label="$t('hellow.ptotalpairQuantity')" :required="true" style="width: 25vw">
            <el-input :placeholder="$t('hellow.cpairQuantity')" v-model="totalPairQuantity" autocomplete="off" />
          </el-form-item>
          <el-form-item :label="$t('hellow.route')" :required="true" style="width: 25vw;">
@@ -305,9 +308,9 @@
  <!-- 强制出片 -->
  <el-dialog v-model="dialogFormVisibled" top="21vh" width="40%" :title="$t('hellow.forcedfilming')">
    <div style="margin-left: 20px;margin-top: 10px;margin-bottom: 10px;">
      <el-form size="mini" label-width="100px">
      <el-form label-width="100px">
        <el-form label-width="210px" label-position="right">
          <el-form-item :label="$t('hellow.pairQuantity')" :required="true" style="width: 25vw">
          <el-form-item :label="$t('hellow.ptotalpairQuantity')" :required="true" style="width: 25vw">
            <el-input :placeholder="$t('hellow.cpairQuantity')" v-model="totalPairQuantitya" autocomplete="off" />
          </el-form-item>
          <el-form-item :label="$t('hellow.route')" :required="true" style="width: 25vw;">
@@ -357,7 +360,7 @@
  <el-dialog v-model="dialogFormVisibleb" top="7vh" width="70%" height="500">
    <div style="margin-top: -20px;text-align: center;margin-left: 400px;">
      <el-form-item :label="$t('hellow.cardnumbera')" style="width: 14vw">
        {{ currentRow.projectNumber }}
        {{ currentRow.flowCardId }}
      </el-form-item>
    </div>
    <el-table ref="table" style="margin-top: 20px;height: 400px;"
@@ -427,7 +430,6 @@
            clearable
            :placeholder="$t('basicData.plselectproject')"
            style="width: 260px"
            @input="handleInputChange"
        >
          <el-option
              v-for="item in titleSelectJson.processType"
@@ -468,8 +470,8 @@
        <el-table-column prop="rightRemove" align="center" :label="$t('hellow.rightRemovep')"> </el-table-column>
        <el-table-column fixed="right" :label="$t('productStock.operate')" align="center" width="270">
            <template #default="scope">
              <el-button size="mini" type="text" plain @click="handleEdit(scope.row)">{{ $t('productStock.exit') }}</el-button>
              <el-button size="mini" type="text" plain @click="opena(scope.row)">{{ $t('productStock.delete') }}</el-button>
              <el-button type="text" plain @click="handleEdit(scope.row)">{{ $t('productStock.exit') }}</el-button>
              <el-button type="text" plain @click="opena(scope.row)">{{ $t('productStock.delete') }}</el-button>
            </template>
        </el-table-column>
        </el-table>
@@ -480,7 +482,7 @@
    </template>
</el-dialog>
 <!-- 历史任务 -->
 <el-dialog v-model="blindb" top="5vh" width="71%">
 <el-dialog v-model="blindb" top="5vh" width="95%" @close="iframeUrl=''">
     <iframe 
     :src="iframeUrl" 
     marginwidth="2000px"
@@ -511,7 +513,6 @@
const cell = ref('')
const cella = ref('')
const selectedProjectNo = ref('');
const ganghua = ref(true)
const totalPairQuantity = ref('')
const totalPairQuantitya = ref('')
const bottomRemove = ref('')
@@ -555,7 +556,7 @@
  }
]
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/hollowGlass/api/talk/HollowGlass`;
const socketUrl = `ws://${WebSocketHost}:${host}/api/hollowGlass/api/talk/HollowGlassTwo`;
const currentPage = ref(parseInt(window.localStorage.getItem('currentPage')) || 1);
watch(() => currentPage.value, (newVal) => {
  window.localStorage.setItem('currentPage', newVal);
@@ -563,21 +564,19 @@
const currentPageKey = computed(() => `93${currentPage.value - 1}`);
const handlePageChange1 = (newPage) => {
  currentPage.value = newPage;
  console.log(currentPage.value);
};
const handlePageChange2 = (newPage) => {
  currentPage2.value = newPage;
  console.log(currentPage2.value);
  fetchFlowBind(currentRow.projectNumber, currentRow.layer, currentPage2.value);
  fetchFlowBind(currentRow.flowCardId, currentPage2.value);
};
const handleMessage = (data) => {
  try {
    tableDataa.value = data[931][0];
    tableDataa.value = data.queueInfo[0];
    const allPageData = data;
    const currentPageKeyValue = currentPageKey.value;
    const currentPageData = allPageData[currentPageKeyValue];
    if (data.freeTwoRequestEntity != null) {
    freetwo.value = data.freeTwoRequestEntity[0] == true ? 'green' : '#911005';
    if (data.freeRequest != null) {
      freetwo.value = data.freeRequest[0] == true ? 'green' : '#911005';
  }
    // if (currentPageData && Array.isArray(currentPageData) && currentPageData.length > 0) {
    //   tableDataa.value = currentPageData[0];
@@ -585,7 +584,6 @@
    //   console.warn('No data for the current page key:', currentPageKeyValue);
    // }
  } catch (error) {
    console.error('Error parsing WebSocket message:', error);
  }
};
onMounted(() => {
@@ -668,20 +666,20 @@
// 缺片详情
const handleBindRack = (row) => {
  currentPage2.value = 1;
  const { projectNumber, layer } = row;
  currentRow.projectNumber  = row.projectNumber;
  const { flowCardId } = row;
  currentRow.flowCardId  = row.flowCardId;
  dialogFormVisibleb.value = true;
  fetchFlowBind(projectNumber, layer,currentPage2.value);
  fetchFlowBind(flowCardId,currentPage2.value);
};
// 领取任务
const handletake = (row) => {
  window.localStorage.setItem('flowCardId', row.projectNumber)
  window.localStorage.setItem('flowCardId', row.flowCardId)
  dialogFormVisiblec.value = true;
  fetchmulan()
};
// 强制出片
const handleout = (row) => {
  window.localStorage.setItem('flowCardId', row.projectNumber)
  window.localStorage.setItem('flowCardId', row.flowCardId)
  dialogFormVisibled.value = true;
  fetchmulan()
};
@@ -689,14 +687,14 @@
const fetchFlowCardId = async () => {
  try {
    const response = await request.post('/hollowGlass/hollowGlassRelationInfo/queryHollowAllFlowCard',{
      deviceId: 0,
      filmsId: '',
      flowCardId: '',
      thickness: '',
      thickness: 0,
    });
    if (response.code == 200) {
      ElMessage.success(response.message);
      const newData = parseData(response.data);
      tableDatab.value = newData;
      tableDatab.value = response.data;
    } else {
      ElMessage.error('Failed to fetch data');
    }
@@ -704,6 +702,18 @@
    ElMessage.error('Error fetching data');
  }
};
function tableRowClassName({ row }) {
  if (row.isThroughSlot == true) {
    return 'row-red-background';
  }
  return '';
}
function nestedTableRowClassName(parentRow, row) {
  if (parentRow.isThroughSlot == true) {
    return 'row-red-background';
  }
  return '';
}
const fetchFlowCardsearch = async () => {
  try {
    const response = await request.post('/hollowGlass/hollowGlassRelationInfo/queryHollowAllFlowCard',{
@@ -713,8 +723,7 @@
    });
    if (response.code == 200) {
      ElMessage.success(response.message);
      const newData = parseData(response.data);
      tableDatab.value = newData;
      tableDatab.value = response.data;
    } else {
      ElMessage.error('Failed to fetch data');
    }
@@ -825,7 +834,6 @@
      }  
    }  
  } catch (error) {
    console.error('发生错误:', error);  
  }  
};
// 工程号
@@ -866,14 +874,20 @@
  }
};
const parseData = (rawData) => {
  return Object.keys(rawData).map(projectNumber => ({
    projectNumber,
    records: rawData[projectNumber]
  }));
  return Object.entries(rawData).map(([compositeKey, records]) => {
    const [projectNumber, productName] = compositeKey.split(':');
    return {
      projectNumber,
      productname: productName,
      records: records.map(record => ({
        ...record,
      }))
    };
  });
};
const fetchFlowBind = async (flowCardId, layer, page) => {
const fetchFlowBind = async (flowCardId, page) => {
  try {
    var url="/hollowGlass/hollowGlassRelationInfo/queryLackByFlowCard?flowCardId="+flowCardId + "&layer=" + layer;
    var url="/hollowGlass/hollowGlassRelationInfo/queryLackByFlowCard?flowCardId="+flowCardId + "&layer=" + 1;
    const response = await request.post(url)
    if (response.code == 200) {
      tableDatac.value = response.data[page];
@@ -882,7 +896,6 @@
      ElMessage.error(response.message);
    }
  } catch (error) {
    console.error(error);
  }
}
// 开始任务
@@ -905,7 +918,6 @@
      })
    }
  } catch (error) {
    console.error(error);
  }
}
// 暂停任务
@@ -928,7 +940,6 @@
      })
    }
  } catch (error) {
    console.error(error);
  }
}
// 删除任务
@@ -951,7 +962,6 @@
      })
    }
  } catch (error) {
    console.error(error);
  }
}
// 领取任务
@@ -971,7 +981,6 @@
          ElMessage.error(response.message);
        }
      } catch (error) {
        console.error(error);
      }
    }
// 强制出片
@@ -990,40 +999,19 @@
          ElMessage.error(response.message);
        }
      } catch (error) {
        console.error(error);
      }
    }
// 调度
const handleChange = async () => {
  try  {
    const body = {  
      flag: ganghua.value,
    }; 
    
  var url="/hollowGlass/hollowGlassOutRelationInfo/dispatchHollowSwitch?flag="+ganghua.value;
  const response = await request.post(url)
    if (response.code == 200) {
      ElMessage.success(response.message);
      ganghua.value = response.data
    }else {  
      ElMessage.error(response.message);
      }  
}
catch (error) {
    console.error(error);
  }
}

onBeforeUnmount(() => {
  console.log("关闭了")
  closeWebSocket();
});
</script>
<style scoped>
#dt { display:block; float:left;line-height: 20px;margin-left: 100px;}
#dta { display:block; float:left;line-height: 20px;margin-left: 80%;}
#dt { display:block; float:left;line-height: 20px;margin-left: 10px;}
#dta { display:block; float:left;line-height: 20px;margin-left: 70%;}
#dialog-footer {
  text-align: center;
  margin-top: -15px;
  margin-top: -5px;
}
#dotClass {
  display: flex;
@@ -1032,4 +1020,7 @@
  margin-top: 20px;
  margin-bottom: 10px;
}
::v-deep(.row-red-background) {
  background-color: rgb(224.6, 242.8, 215.6) !important;
}
</style>