From da30bfc3795305f0bbd400d196bcf4c30612c37f Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 10 十二月 2025 17:01:33 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject

---
 UI-Project/src/views/hollow/hollowequipment.vue |   33 ++++++++++++++++++++++++---------
 1 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/UI-Project/src/views/hollow/hollowequipment.vue b/UI-Project/src/views/hollow/hollowequipment.vue
index 5f8e785..7f4dd08 100644
--- a/UI-Project/src/views/hollow/hollowequipment.vue
+++ b/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">
@@ -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;">
@@ -992,9 +992,8 @@
 </template>
 <script setup>
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { onBeforeUnmount, onMounted, onUnmounted, ref, reactive, watch, computed, getCurrentInstance  } from "vue";
+import { onBeforeUnmount, onMounted, onUnmounted, ref, reactive, watch, computed, getCurrentInstance ,toRaw } from "vue";
 import request from "@/utils/request"
-import { host, WebSocketHost } from '@/utils/constants'
 import { closeWebSocket, initializeWebSocket } from '@/utils/WebSocketService';
 import { useI18n } from 'vue-i18n'
 const { t } = useI18n()
@@ -1084,7 +1083,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);
@@ -1094,16 +1093,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();  
 
@@ -1465,6 +1468,9 @@
 function nestedTableRowClassName(parentRow, row) {
   if (parentRow.isThroughSlot == true) {
     return 'row-red-background';
+  }
+  if (row.row?.sumCount !== undefined && row.row?.pairCount !== undefined && row.row.sumCount !== row.row.pairCount) {
+    return 'sum-equal-pair-row' // 杩斿洖鑷畾涔夌被鍚�
   }
   return '';
 }
@@ -1881,7 +1887,9 @@
 const blinde = ref(false)
 const labelPrint = ref(false);
 const handleBinde = (flowCard) => {
-  const summary = flowCard.reduce((map, item) => {
+  const summary = flowCard
+        .filter(item => item.isPair !== 0) 
+        .reduce((map, item) => {
         const key = `${item.hollowSequence}`;
         if (!map[key]) {
           map[key] = {
@@ -1894,6 +1902,7 @@
         return map;
       }, {});
       listFlow.value = Object.values(summary);
+      console.log(listFlow.value)
   blinde.value = true;
   getTags();
   hiprint.init();
@@ -1945,6 +1954,7 @@
   value: null,
   size: null
 })
+
 </script>
 <style scoped>
 #dt {
@@ -2007,4 +2017,9 @@
 .el-loading-mask {
   z-index: 2000 !important;
 }
+/* 鏍稿績3锛氭坊鍔犺鍙樿壊鏍峰紡锛岄�氳繃:deep绌块�弒coped */
+:deep(.sum-equal-pair-row) {
+  background-color: #fdf2e8 !important; /* 娴呮搴曡壊锛屽彲鑷淇敼 */
+  color: #e64340 !important; /* 鏂囧瓧鑹诧紝鍙�� */
+}
 </style>
\ No newline at end of file

--
Gitblit v1.8.0