Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject

wangfei

2025-11-12 ae1459d90f53ac81177e75790d859c6a12e7ed54

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

@@ -8,9 +8,9 @@
        <el-button id="searchButton" type="primary" @click="handlezhiban">
          {{ $t('hellow.createtask') }}
        </el-button>
        <el-button type="primary" @click="selectproject">
        <!-- <el-button type="primary" @click="selectproject">
          {{ $t('hellow.reviewproject') }}
        </el-button>
        </el-button> -->
        <el-button style="margin-left: 10px;" id="searchButton" type="primary" @click="handlehistorical">{{
          $t('searchOrder.historicaltasks') }}</el-button>
        <el-button style="margin-left: 10px;" id="searchButton" type="success" @click="handleBinda">
@@ -719,7 +719,7 @@
    </div>
    <template #footer>
      <div id="dialog-footer">
        <el-button type="primary" @click="finisha">
        <el-button type="primary" @click="finisha" :disabled="isSubmitting">
          {{ $t('reportWork.sure') }}
        </el-button>
        <el-button @click="dialogFormVisiblec = false">{{ $t('reportWork.cancel') }}</el-button>
@@ -780,7 +780,7 @@
      <el-table-column prop="workingProcedure" align="center" :label="$t('reportmanage.process')" min-width="80" />
      <el-table-column fixed="right" :label="$t('searchOrder.operate')" align="center">
            <template #default="scope">
              <el-button type="text" plain  @click="handleBroke(scope.row)">{{ $t('order.dilapidation') }}</el-button>
              <el-button type="text" plain :disabled="scope.row.glassId==null"  @click="handleBroke(scope.row)">{{ $t('order.dilapidation') }}{{  }}</el-button>
            </template>
      </el-table-column>
      <div style="float: right;margin-bottom: 5px;">
@@ -1057,6 +1057,7 @@
const dialogFormVisiblec = ref(false)
const dialogFormVisibled = ref(false)
const dialogFormVisiblee = ref(false)
const isSubmitting = ref(false)
const add = ref(false)
const adda = ref(false)
const currentRow = reactive({});
@@ -1083,7 +1084,7 @@
  }
]
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/hollowGlass/api/talk/HollowGlassOne`;
const socketUrl = `ws://${window.ipConfig.serverUrl}/api/hollowGlass/api/talk/HollowGlassOne`;
const currentPage = ref(parseInt(window.localStorage.getItem('currentPage')) || 1);
watch(() => currentPage.value, (newVal) => {
  window.localStorage.setItem('currentPage', newVal);
@@ -1093,16 +1094,20 @@
  currentPage.value = newPage;
};
const handleMessage = (data) => {
  if (data.queueInfo != null) {
  if (data.queueInfo[0] != null) {
  const rawData = data.queueInfo[0]
  const formattedData = Object.entries(rawData).map(([key, data]) => ({  
    title: key,  
    tableDataa: Array.isArray(data) ? data : [data]  
  }));  
  tabList.value = formattedData;  
}
}else{
      tabList.value = [];
  }
  if (tabList.value.length > 0) {  
    activeTab.value = tabList.value[0].title;  
  }else {
      activeTab.value = '';
  }
  internalInstance.ctx.$forceUpdate();  

@@ -1394,6 +1399,7 @@
const handletake = (row) => {
  window.localStorage.setItem('flowCardId', row.flowCardId)
  dialogFormVisiblec.value = true;
  isSubmitting.value = false
  fetchmulan()
};
// 强制出片
@@ -1823,9 +1829,13 @@
      cell.value = '';
      formulaName.value = '';
      totalPairQuantity.value = '';
      isSubmitting.value = true
    } else {
      ElMessage.error(response.message);
      isSubmitting.value = true
    }
  } catch (error) {
      ElMessage.error(response.message);
  }
}
// 强制出片