wangfei
2025-03-17 d998753ab3d7068faa8935feb04d3856aa425f45
上片模块下方表格更改数据接口,复位按钮判断
2个文件已修改
39 ■■■■■ 已修改文件
UI-Project/src/views/Returns/upreturns.vue 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI-Project/src/views/Returns/upreturns2.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UI-Project/src/views/Returns/upreturns.vue
@@ -84,24 +84,17 @@
  if (data.LoadOneState != null) {
    cuttingMachineStatusColor.value = data.LoadOneState[0] == 1 ? 'green' : '#911005';
  }
  if (data.stationOne != null) {
    data.stationOne[0].forEach((station) => {
      if(station.patternThickness !== undefined){
        station.haspatternThickness=false;
      }else{
        station.haspatternThickness=true;
      }
      // stationInfos[station.patternThickness] = {
      //   haspatternThickness: station.patternThickness !== undefined,
      // };
    });
    console.log(data.stationOne);
    if (data.list != null) {
      tableDataa.value = data.list[0].slice(0, 2);
    } else {
      tableDataa.value = [];
    }
if (data.stationOne!=null) {
    const processedData = [...data.stationOne[0]];
 if (processedData.length > 0) {
   processedData[0] = { ...processedData[0], workstationId: 1 };
 }
 if (processedData.length > 1) {
   processedData[1] = { ...processedData[1], workstationId: 2 };
 }
  tableDataa.value = processedData;
  }else {
    tableDataa.value = []
  }
  if(data.loadTask1!=null){
  tableData.value = data.loadTask1[0]
@@ -506,7 +499,7 @@
            <el-table-column prop="number" align="center" :label="$t('basicData.quantity')" min-width="80"/>
            <el-table-column fixed="right" :label="$t('film.operate')" align="center">
            <template #default="scope">
          <el-button size="mini" :disabled="(!stationInfos[scope.row.patternThickness])" type="text" plain @click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}{{ scope.row.haspatternThickness}}</el-button>
          <el-button size="mini" :disabled="(!scope.row.patternThickness)" type="text" plain @click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}{{ scope.row.haspatternThickness}}</el-button>
            </template>
        </el-table-column>
          </el-table>
UI-Project/src/views/Returns/upreturns2.vue
@@ -73,8 +73,8 @@
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/loadGlass`;
const handleMessage = (data: any) => {
  if (data.list!=null) {
    const processedData = [...data.list[0].slice(2, 4)];
  if (data.stationTwo!=null) {
    const processedData = [...data.stationTwo[0]];
 if (processedData.length > 0) {
   processedData[0] = { ...processedData[0], workstationId: 1 };
 }
@@ -436,7 +436,7 @@
    <el-button :disabled="!canSelectProjectc" style="margin-top: 5px;margin-left: 20px;"  id="searchButton" type="warning" @click="handleBinda">{{ $t('basicData.stop') }}</el-button>
    <el-button :disabled="!canSelectProjectc" style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="danger" @click="deleteTask">{{ $t('searchOrder.deleteTask') }}</el-button>
    <el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="info" @click="handlehistorical">{{ $t('searchOrder.historicaltasks') }}</el-button>
    <el-select disabled v-model="selectValuesa[1]" clearable :placeholder="$t('Mounting.oneloadingline')"
    <el-select disabled v-model="selectValuesa[1]" clearable :placeholder="$t('Mounting.twoloadingline')"
               style="margin-top: 5px;margin-left: 20px;">
      <el-option :label="$t('Mounting.all')" value="0"></el-option>
      <el-option :label="$t('Mounting.oneloadingline')" value="1"></el-option>
@@ -494,7 +494,7 @@
            <el-table-column prop="number" align="center" :label="$t('basicData.quantity')" min-width="80"/>
            <el-table-column fixed="right" :label="$t('film.operate')" align="center">
            <template #default="scope">
          <el-button size="mini" :disabled="scope.row.number == 0 || scope.row.number == ''" type="text" plain @click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}</el-button>
          <el-button size="mini" :disabled="(!scope.row.patternThickness)" type="text" plain @click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}{{ scope.row.haspatternThickness}}</el-button>
            </template>
        </el-table-column>
          </el-table>