From d732b80b39310c2b247d7471aed03b29edc94355 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <zhaozhengyi1b@126.com>
Date: Thu, 16 Jan 2025 10:40:24 +0800
Subject: [PATCH] 116

---
 src/views/PBL/TVScreen/index.vue       | 23 ++++++++++++-----------
 src/views/PBL/TVScreen/preparation.vue |  8 ++++----
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/views/PBL/TVScreen/index.vue b/src/views/PBL/TVScreen/index.vue
index 89945ee..5dc4c3b 100644
--- a/src/views/PBL/TVScreen/index.vue
+++ b/src/views/PBL/TVScreen/index.vue
@@ -90,6 +90,7 @@ function initSignalR() {
   }
 
   try {
+    console.log('初始化 SignalR PBL_bom_except消息……')
     proxy.signalr.SR.on('PBL_bom_except', handler)
   } catch (error) {
     console.error('初始化 SignalR 连接失败:', error)
@@ -207,17 +208,17 @@ function mqttMessage() {
   }
 }
 
-onMounted(() => {
-  mqttCreate()
-  setTimeout(() => {
-    mqttMessage()
-  }, 1000)
-  console.log('mqtt组件已挂载')
-})
-onUnmounted(() => {
-  mqttClose()
-  console.log('mqtt组件已卸载')
-})
+// onMounted(() => {
+//   mqttCreate()
+//   setTimeout(() => {
+//     mqttMessage()
+//   }, 1000)
+//   console.log('mqtt组件已挂载')
+// })
+// onUnmounted(() => {
+//   mqttClose()
+//   console.log('mqtt组件已卸载')
+// })
 /// ==================================================================
 /// ======================= 自动刷新 ========================
 // 自动获取数据
diff --git a/src/views/PBL/TVScreen/preparation.vue b/src/views/PBL/TVScreen/preparation.vue
index 35145c3..eb024a0 100644
--- a/src/views/PBL/TVScreen/preparation.vue
+++ b/src/views/PBL/TVScreen/preparation.vue
@@ -12,7 +12,7 @@
       <el-row>
         <el-col :span="6" v-for="(item, index) in dataList" :key="index">
           <div class="item-box">
-            <el-card :class="`card `">
+            <el-card :class="`card ${getStatusClass(item)}`">
               <div :class="`card-header`">
                 <span>料架号: {{ item.rackCode }}</span>
               </div>
@@ -24,7 +24,7 @@
                     <div class="card-left-text">{{ item2.layerNum === 1 ? '上层' : '中层' }}</div>
                   </el-col>
                   <!-- 右侧物料 -->
-                  <el-col :span="20" :class="`border ${getStatusClass(item)}`">
+                  <el-col :span="20" :class="`border `">
                     <el-row>
                       <el-col :span="6" v-for="(item3, index3) in item2.maxCapacity" :key="index2">
                         <div :class="`box ${boxSelectClass(item2.packageNum, index3)}`"></div>
@@ -152,9 +152,9 @@ function closeLight(item) {
   }
 }
 
-// 灯状态
+// 灯状态(报警)
 function getStatusClass(item) {
-  return item.isLight ? 'light' : ''
+  return item.isFeedingMaterial ? 'light' : ''
 }
 function boxSelectClass(num, index) {
   let _index = index + 1