From 7ef027c5ae2f2180aa9ba121d69488c4b7a92dd2 Mon Sep 17 00:00:00 2001
From: zhangjiming <zhangjiming@costrip.cn>
Date: Sat, 11 Jan 2025 14:32:07 +0800
Subject: [PATCH 1/8] =?UTF-8?q?fix:=E6=89=AB=E6=8F=8F=E8=80=97=E6=9D=90=20?=
 =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E6=AC=A1=E7=82=B9=E5=87=BB=E6=97=B6=E6=9C=AA?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=80=97=E6=9D=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Index/Regular/Consumables.vue | 1 +
 src/router/router.ts                    | 4 ++--
 src/websocket/socket.ts                 | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/pages/Index/Regular/Consumables.vue b/src/pages/Index/Regular/Consumables.vue
index dd28196..d084f6a 100644
--- a/src/pages/Index/Regular/Consumables.vue
+++ b/src/pages/Index/Regular/Consumables.vue
@@ -378,6 +378,7 @@ const handleIsUnload = () => {
   isLoad.value = !isLoad.value
   isLoading.value = false
   isAlreadyLoad.value = false
+  isHandleScan.value = false
   socket.unsubscribe<ConsumablesStateMessage>(
     'ConsumablesStateService',
     handleConsumablesState,
diff --git a/src/router/router.ts b/src/router/router.ts
index 87b156c..251ff0a 100644
--- a/src/router/router.ts
+++ b/src/router/router.ts
@@ -127,8 +127,8 @@ router.beforeEach((to, from, next) => {
       return next({ path: '/notFound' }) // 权限不足，重定向到首页或者其他页面
     }
   }
-  // 如果没有问题，继续导航
-  next()
+
+  // next() // 删除这行，否则控制台警告
 })
 
 export default router
diff --git a/src/websocket/socket.ts b/src/websocket/socket.ts
index 6aaece1..ace1a8e 100644
--- a/src/websocket/socket.ts
+++ b/src/websocket/socket.ts
@@ -246,7 +246,7 @@ class WebSocketClient {
     messageType: T['dataType'],
     handler: MessageHandler<T>,
   ): void {
-    console.error('messageType==', messageType)
+    console.log('messageType==', messageType)
     if (!this.messageHandlers.has(messageType)) {
       console.log(
         '🚀 ~ WebSocketClient ~ subscribe ~ messageType:',

From bc675692d484bda4d48fe1c47587e2a869a80c57 Mon Sep 17 00:00:00 2001
From: zhangjiming <zhangjiming@costrip.cn>
Date: Sat, 11 Jan 2025 14:55:09 +0800
Subject: [PATCH 2/8] =?UTF-8?q?fix:=20=E8=80=97=E6=9D=90=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=8F=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Index/Regular/Consumables.vue | 4 ++--
 src/websocket/socket.ts                 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/Index/Regular/Consumables.vue b/src/pages/Index/Regular/Consumables.vue
index d084f6a..23785ec 100644
--- a/src/pages/Index/Regular/Consumables.vue
+++ b/src/pages/Index/Regular/Consumables.vue
@@ -303,7 +303,7 @@ onMounted(() => {
   startWebSocket()
   socket.subscribe<SensorStateMessage>('SensorState', handleSensorState)
   socket.subscribe<ConsumablesStateMessage>(
-    'ConsumablesStateService',
+    'ConsumablesState',
     handleConsumablesState,
   )
   // getEmergencyInfo()
@@ -316,7 +316,7 @@ onBeforeUnmount(() => {
   }
   socket.unsubscribe<SensorStateMessage>('SensorState', handleSensorState)
   socket.unsubscribe<ConsumablesStateMessage>(
-    'ConsumablesStateService',
+    'ConsumablesState',
     handleConsumablesState,
   )
 })
diff --git a/src/websocket/socket.ts b/src/websocket/socket.ts
index ace1a8e..6ab368b 100644
--- a/src/websocket/socket.ts
+++ b/src/websocket/socket.ts
@@ -199,7 +199,7 @@ interface TipInfo {
 interface ConsumablesStateMessage extends BaseMessage {
   type: 'ConsumablesState'
   messageType: 'Report'
-  dataType: 'ConsumablesStateService'
+  dataType: 'ConsumablesState'
   data: {
     scanDate: number
     tips: TipInfo[]

From c9f84c99881d6a221020cc769a277ab9514d80f6 Mon Sep 17 00:00:00 2001
From: zhangjiming <zhangjiming@costrip.cn>
Date: Sat, 11 Jan 2025 14:57:45 +0800
Subject: [PATCH 3/8] =?UTF-8?q?fix:=20=E7=9B=AE=E5=BD=95=E5=A4=A7=E5=B0=8F?=
 =?UTF-8?q?=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Index/Regular/Consumables.vue | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/pages/Index/Regular/Consumables.vue b/src/pages/Index/Regular/Consumables.vue
index 23785ec..e66cd45 100644
--- a/src/pages/Index/Regular/Consumables.vue
+++ b/src/pages/Index/Regular/Consumables.vue
@@ -95,7 +95,7 @@
 </template>
 
 <script setup lang="ts">
-import { MoveLiquidArea, SpttingPlates, MainComponent } from '../components'
+import { MoveLiquidArea, SpttingPlates, MainComponent } from '../Components'
 // import SliderAreaEx  from '../components/Consumables/SliderAreaEx.vue';
 // import DragAreaEx  from '../components/Consumables/DragAreaEx.vue';
 import { ref, onMounted, onActivated, onBeforeUnmount, watch } from 'vue'
@@ -120,13 +120,6 @@ import { ElMessage } from 'element-plus'
 const { wsUrl } = getServerInfo('/api/v1/app/ws/state')
 const socket = createWebSocket(wsUrl)
 
-// const sliderValue = ref(25); // 初始值
-// const totalVal = ref(50)
-
-// const hVal = ref(10)
-// const hTotal = ref(60)
-// const vVal = ref(10)
-// const vTotal = ref(60)
 
 const consumableStore = useConsumablesStore()
 const emergencyStore = useEmergencyStore()
@@ -380,7 +373,7 @@ const handleIsUnload = () => {
   isAlreadyLoad.value = false
   isHandleScan.value = false
   socket.unsubscribe<ConsumablesStateMessage>(
-    'ConsumablesStateService',
+    'ConsumablesState',
     handleConsumablesState,
   )
   // 重置 moveLiquids 和 tempTipNum

From 1aaf2c2bd64df9f546407c012c3d1df6133ae37e Mon Sep 17 00:00:00 2001
From: zhangjiming <zhangjiming@costrip.cn>
Date: Sat, 11 Jan 2025 15:52:27 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B0=8F=E7=93=B6isUsed?=
 =?UTF-8?q?=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/constant/index.ts                   | 42 +++++++++++++++-------------
 src/pages/Index/Regular/Consumables.vue | 49 +++++++++++++++++----------------
 2 files changed, 49 insertions(+), 42 deletions(-)

diff --git a/src/constant/index.ts b/src/constant/index.ts
index dc5f1e3..365a944 100644
--- a/src/constant/index.ts
+++ b/src/constant/index.ts
@@ -1,24 +1,28 @@
-export const DICT = {
-    
+// 开发选项
+export const devOptions = {
+  // 小瓶缓冲液对象的isUsed属性
+  enable_LittleBottle_isUsed: false,
 }
+
+export const DICT = {}
 //扫描状态
-export const SCAN_CONSUMABLES_STATE_MAP:any[] = [
-    'PASS',//通过
-    'EMPTY',//空
-    'EXPIRED',//耗材过期
-    'MISS_REACTION_PLATE',//没有反应板夹
-    'MISS_LITTSB',//缺少小缓冲液
-    'MISS_LARBS',//缺少大缓冲液
-    'MISS_IDCARD',//未找到匹配的项目ID卡
-    'LITTSB_LOTID_MISMATCH',//小缓冲液批号不匹配
-    'LARBS_LOTID_MISMATCH',//大缓冲液批号不匹配
-    'REACTION_PLATE_2D_CODE_FORMATE_ERROR',//反应板二维码格式错误
-    'CODE_ERROR_PROJINFO_IS_ERROR',//代码错误，项目信息异常
-    'UN_SUPPORT_PROJ',//不支持的项目
+export const SCAN_CONSUMABLES_STATE_MAP: any[] = [
+  'PASS', //通过
+  'EMPTY', //空
+  'EXPIRED', //耗材过期
+  'MISS_REACTION_PLATE', //没有反应板夹
+  'MISS_LITTSB', //缺少小缓冲液
+  'MISS_LARBS', //缺少大缓冲液
+  'MISS_IDCARD', //未找到匹配的项目ID卡
+  'LITTSB_LOTID_MISMATCH', //小缓冲液批号不匹配
+  'LARBS_LOTID_MISMATCH', //大缓冲液批号不匹配
+  'REACTION_PLATE_2D_CODE_FORMATE_ERROR', //反应板二维码格式错误
+  'CODE_ERROR_PROJINFO_IS_ERROR', //代码错误，项目信息异常
+  'UN_SUPPORT_PROJ', //不支持的项目
 ]
 
-let scan_consumables_state_option:any = {}
-SCAN_CONSUMABLES_STATE_MAP.map(el => {
-    scan_consumables_state_option[el] = el
+let scan_consumables_state_option: any = {}
+SCAN_CONSUMABLES_STATE_MAP.map((el) => {
+  scan_consumables_state_option[el] = el
 })
-export const  SCAN_CONSUMABLES_STATE = scan_consumables_state_option;
\ No newline at end of file
+export const SCAN_CONSUMABLES_STATE = scan_consumables_state_option
diff --git a/src/pages/Index/Regular/Consumables.vue b/src/pages/Index/Regular/Consumables.vue
index e66cd45..ff69e00 100644
--- a/src/pages/Index/Regular/Consumables.vue
+++ b/src/pages/Index/Regular/Consumables.vue
@@ -55,7 +55,7 @@
       </div>
       <div class="move-liquid-area">
         <MoveLiquidArea
-          :isLoad="isLoad"
+          :isLoad="isLoadedConsumables"
           :isLoading="isLoading"
           :moveLiquids="moveLiquids"
           :tempTipNum="tempTipNum"
@@ -99,6 +99,7 @@ import { MoveLiquidArea, SpttingPlates, MainComponent } from '../Components'
 // import SliderAreaEx  from '../components/Consumables/SliderAreaEx.vue';
 // import DragAreaEx  from '../components/Consumables/DragAreaEx.vue';
 import { ref, onMounted, onActivated, onBeforeUnmount, watch } from 'vue'
+import * as R from 'ramda'
 import {
   getInitState,
   scanConsumables,
@@ -116,11 +117,12 @@ import type {
 } from '../../../websocket/socket'
 import { getServerInfo } from '../../../utils/getServerInfo'
 import { formatScanReports } from '../../../utils/errorHandler'
+import { devOptions } from '@/constant'
 import { ElMessage } from 'element-plus'
+
 const { wsUrl } = getServerInfo('/api/v1/app/ws/state')
 const socket = createWebSocket(wsUrl)
 
-
 const consumableStore = useConsumablesStore()
 const emergencyStore = useEmergencyStore()
 const deviceStore = useDeviceStore()
@@ -128,8 +130,9 @@ const deviceStore = useDeviceStore()
 const currentTemperature = ref(40)
 // 废料区状态
 const wasteStatus = ref(false)
-// 父组件状态
-const isLoad = ref(false)
+// 是否已经加载(扫描)过耗材，界面上展示着耗材
+const isLoadedConsumables = ref(false)
+// 是否处理加载(扫描)耗材过程中
 const isLoading = ref(false)
 // 反应板夹的状态
 const plates = ref<ReactionPlate[]>([])
@@ -148,7 +151,7 @@ const moveLiquids = ref<LiquidState[]>([
     tipNum: 0,
   },
 ])
-// 新增状态
+// 是否显示扫描报告（列表弹窗）
 const showScanResults = ref(false)
 interface ScanReport {
   channel: number
@@ -159,8 +162,9 @@ interface ScanReport {
   lotId: string | null
 }
 const formattedReports = ref<ScanReport[]>([])
+
 //是否加载
-const isAlreadyLoad = ref(false)
+const isAlreadyLoad = ref(false) //??
 // 临时状态管理小球激活数量
 const tempTipNum = ref<number[]>([
   ...moveLiquids.value.map((liquid) => liquid.tipNum),
@@ -221,16 +225,18 @@ const bufferBig = ref<BottleGroup[]>(
 )
 //急诊区状态
 const emergencyInfo = ref(emergencyStore.$state.emergencyInfo || {})
-//是否处理扫描结果
-const isHandleScan = ref(false)
+//提示扫描报告后，是否进一步显示 耗材结果
+const isHandleScan = ref(false) 
 // 确认扫描结果
 const handleConfirmScan = () => {
   showScanResults.value = false
-  isHandleScan.value = true
   if (formattedReports.value.some((report) => report.isError)) {
-    isLoad.value = false
+    isHandleScan.value = false
+    isLoadedConsumables.value = false
     isAlreadyLoad.value = false
     ElMessage.warning('存在错误，请检查耗材')
+  } else {
+    isHandleScan.value = true
   }
 }
 //使用websocket保证数据的实时性
@@ -246,7 +252,6 @@ const handleSensorState = (data: SensorStateMessage['data']) => {
   // 可以添加温度异常处理逻辑
   if (currentTemperature.value > 40) {
     console.warn('温度过高警告')
-    // 可以在这里添加其他警告逻辑
   }
 }
 
@@ -258,16 +263,19 @@ const handleConsumablesState = (data: ConsumablesStateMessage['data']) => {
       moveLiquids.value = data.tips
       tempTipNum.value = [...moveLiquids.value.map((liquid) => liquid.tipNum)]
       plates.value = data.reactionPlateGroup as ReactionPlate[]
-      bufferLittles.value = data.littBottleGroup as BufferLittle[]
+      if (!devOptions.enable_LittleBottle_isUsed) {
+        //@ts-ignore
+        bufferLittles.value = R.map(R.omit(['isUsed']) ,data.littBottleGroup)
+      } else {
+        bufferLittles.value = data.littBottleGroup as BufferLittle[]
+      }
       bufferBig.value = data.larBottleGroup as BottleGroup[]
     } else {
       console.log('正在拖动，不更新耗材')
     }
-  } else {
-    return
   }
 }
-// 使用事件总线更新状态
+// 使用事件总线更新 反应板和缓冲液状态
 const updatePlatesAndBuffers = ({
   type,
   value,
@@ -299,7 +307,6 @@ onMounted(() => {
     'ConsumablesState',
     handleConsumablesState,
   )
-  // getEmergencyInfo()
 })
 onBeforeUnmount(() => {
   // 清除事件总线的监听
@@ -316,7 +323,7 @@ onBeforeUnmount(() => {
 // 在组件激活时恢复状态
 onActivated(() => {
   emergencyInfo.value = emergencyStore.$state.emergencyInfo || {}
-  if (!isLoad.value) {
+  if (!isLoadedConsumables.value) {
     console.log('组件被激活了')
   }
 })
@@ -358,7 +365,7 @@ watch(isHandleScan, (newVal) => {
         .littBottleGroup as BufferLittle[]
       bufferBig.value = consumablesData.value.larBottleGroup as BottleGroup[]
       tempTipNum.value = [...moveLiquids.value.map((liquid) => liquid.tipNum)]
-      isLoad.value = true
+      isLoadedConsumables.value = true
       isAlreadyLoad.value = true
       consumableStore.setConsumablesData(consumablesData.value)
     }
@@ -368,14 +375,10 @@ watch(isHandleScan, (newVal) => {
   }
 })
 const handleIsUnload = () => {
-  isLoad.value = !isLoad.value
+  isLoadedConsumables.value = !isLoadedConsumables.value
   isLoading.value = false
   isAlreadyLoad.value = false
   isHandleScan.value = false
-  socket.unsubscribe<ConsumablesStateMessage>(
-    'ConsumablesState',
-    handleConsumablesState,
-  )
   // 重置 moveLiquids 和 tempTipNum
   moveLiquids.value = [
     { id: 1, tipNum: 0 },

From c610f12e8146c5a243791aacd10eaeb1883fc456 Mon Sep 17 00:00:00 2001
From: LiLongLong <13717757313@163.com>
Date: Sat, 11 Jan 2025 16:03:38 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/components.d.ts b/components.d.ts
index 5124e3a..04ca081 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -14,8 +14,12 @@ declare module 'vue' {
     ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu']
     ElFooter: typeof import('element-plus/es')['ElFooter']
     ElHeader: typeof import('element-plus/es')['ElHeader']
+    ElIcon: typeof import('element-plus/es')['ElIcon']
+    ElInput: typeof import('element-plus/es')['ElInput']
     ElPopover: typeof import('element-plus/es')['ElPopover']
     ElRow: typeof import('element-plus/es')['ElRow']
+    ElTable: typeof import('element-plus/es')['ElTable']
+    ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
     ErrorModal: typeof import('./src/components/dialogs/ErrorModal.vue')['default']
     Keyboard: typeof import('./src/components/Keyboard.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
@@ -23,4 +27,7 @@ declare module 'vue' {
     SimpleKeyboard: typeof import('./src/components/SimpleKeyboard.vue')['default']
     StackInfoModal: typeof import('./src/components/dialogs/StackInfoModal.vue')['default']
   }
+  export interface ComponentCustomProperties {
+    vLoading: typeof import('element-plus/es')['ElLoadingDirective']
+  }
 }

From 1dbdc36237809514201331106fce27b4d828c301 Mon Sep 17 00:00:00 2001
From: zhangjiming <zhangjiming@costrip.cn>
Date: Sat, 11 Jan 2025 17:41:01 +0800
Subject: [PATCH 6/8] =?UTF-8?q?fix:=E5=88=9D=E6=AC=A1=E5=BC=80=E6=9C=BA?=
 =?UTF-8?q?=EF=BC=8C=E6=9C=AA=E6=8F=90=E7=A4=BA=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Index/Index.vue               | 2 +-
 src/pages/Index/Regular/Consumables.vue | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/pages/Index/Index.vue b/src/pages/Index/Index.vue
index d14e1ad..cb98a3e 100644
--- a/src/pages/Index/Index.vue
+++ b/src/pages/Index/Index.vue
@@ -373,7 +373,7 @@ onMounted(() => {
 // 开始检测
 const checkInit = () => {
   const hasExecutedReset = sessionStorage.getItem('deviceResetFinished');
-  if (hasExecutedReset === "false") {
+  if (!hasExecutedReset || hasExecutedReset === "false") {
     showModal.value = true;
   }
 };
diff --git a/src/pages/Index/Regular/Consumables.vue b/src/pages/Index/Regular/Consumables.vue
index ff69e00..91b8291 100644
--- a/src/pages/Index/Regular/Consumables.vue
+++ b/src/pages/Index/Regular/Consumables.vue
@@ -163,8 +163,6 @@ interface ScanReport {
 }
 const formattedReports = ref<ScanReport[]>([])
 
-//是否加载
-const isAlreadyLoad = ref(false) //??
 // 临时状态管理小球激活数量
 const tempTipNum = ref<number[]>([
   ...moveLiquids.value.map((liquid) => liquid.tipNum),
@@ -233,7 +231,6 @@ const handleConfirmScan = () => {
   if (formattedReports.value.some((report) => report.isError)) {
     isHandleScan.value = false
     isLoadedConsumables.value = false
-    isAlreadyLoad.value = false
     ElMessage.warning('存在错误，请检查耗材')
   } else {
     isHandleScan.value = true
@@ -257,7 +254,7 @@ const handleSensorState = (data: SensorStateMessage['data']) => {
 
 //处理耗材状态
 const handleConsumablesState = (data: ConsumablesStateMessage['data']) => {
-  if (isAlreadyLoad.value && isHandleScan.value) {
+  if (isHandleScan.value) {
     consumableStore.setConsumablesData(data)
     if (!isDragging.value) {
       moveLiquids.value = data.tips
@@ -351,7 +348,7 @@ const handleIsLoad = async () => {
   } catch (error) {
     console.error('加载耗材失败:', error)
     isLoading.value = false
-    isAlreadyLoad.value = false
+    isHandleScan.value = false
     ElMessage.error('加载耗材失败')
   }
 }
@@ -366,7 +363,6 @@ watch(isHandleScan, (newVal) => {
       bufferBig.value = consumablesData.value.larBottleGroup as BottleGroup[]
       tempTipNum.value = [...moveLiquids.value.map((liquid) => liquid.tipNum)]
       isLoadedConsumables.value = true
-      isAlreadyLoad.value = true
       consumableStore.setConsumablesData(consumablesData.value)
     }
   } else {
@@ -377,7 +373,6 @@ watch(isHandleScan, (newVal) => {
 const handleIsUnload = () => {
   isLoadedConsumables.value = !isLoadedConsumables.value
   isLoading.value = false
-  isAlreadyLoad.value = false
   isHandleScan.value = false
   // 重置 moveLiquids 和 tempTipNum
   moveLiquids.value = [

From 1ff9396b8a2ddc4706631bae86716f58330b82a5 Mon Sep 17 00:00:00 2001
From: zhangjiming <zhangjiming@costrip.cn>
Date: Sun, 12 Jan 2025 15:49:01 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E5=8F=98=E5=8A=A8=EF=BC=9AisUse->isInstall=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9tipNum=E6=97=B6=E4=B8=8D=E8=83=BD=E5=B0=8F=E4=BA=8E0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/constant/index.ts                              |  4 ++--
 src/mock/Index/Consumables.ts                      | 24 +++++++++++-----------
 src/pages/Index/Regular/Consumables.vue            | 16 ++++++---------
 .../Index/components/Consumables/BallGrid.vue      |  2 +-
 .../Index/components/Consumables/SpttingPlates.vue |  4 ++--
 src/types/Index/Consumables.ts                     |  2 +-
 src/websocket/socket.ts                            |  2 +-
 7 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/src/constant/index.ts b/src/constant/index.ts
index 365a944..1ffcea5 100644
--- a/src/constant/index.ts
+++ b/src/constant/index.ts
@@ -1,7 +1,7 @@
 // 开发选项
 export const devOptions = {
-  // 小瓶缓冲液对象的isUsed属性
-  enable_LittleBottle_isUsed: false,
+  // 小瓶缓冲液对象的isInstall属性
+//   enable_LittleBottle_isInstall: false,
 }
 
 export const DICT = {}
diff --git a/src/mock/Index/Consumables.ts b/src/mock/Index/Consumables.ts
index 2602020..da79ded 100644
--- a/src/mock/Index/Consumables.ts
+++ b/src/mock/Index/Consumables.ts
@@ -214,7 +214,7 @@ const consumablesScanResultData: ConsumablesScanResultData = Mock.mock({
         lotId: '',
         color: '',
         num: 0,
-        isUse: false,
+        isInstall: false,
       },
       {
         projId: 2,
@@ -223,13 +223,13 @@ const consumablesScanResultData: ConsumablesScanResultData = Mock.mock({
         lotId: 'FA020000',
         color: '#DC143C',
         num: 25,
-        isUse: true,
+        isInstall: true,
       },
       {
         lotId: '',
         color: '',
         num: 0,
-        isUse: false,
+        isInstall: false,
       },
       {
         projId: 4,
@@ -238,7 +238,7 @@ const consumablesScanResultData: ConsumablesScanResultData = Mock.mock({
         lotId: 'FA040000',
         color: '#FF69B4',
         num: 25,
-        isUse: true,
+        isInstall: true,
       },
       {
         projId: 5,
@@ -247,7 +247,7 @@ const consumablesScanResultData: ConsumablesScanResultData = Mock.mock({
         lotId: 'FA050000',
         color: '#FF1493',
         num: 25,
-        isUse: true,
+        isInstall: true,
       },
       {
         projId: 6,
@@ -256,7 +256,7 @@ const consumablesScanResultData: ConsumablesScanResultData = Mock.mock({
         lotId: 'FA060000',
         color: '#C71585',
         num: 25,
-        isUse: true,
+        isInstall: true,
       },
     ],
   },
@@ -405,7 +405,7 @@ const consumableOneChannelData: ConsumablesOneChannel = Mock.mock({
         lotId: '',
         color: '',
         num: 0,
-        isUse: false,
+        isInstall: false,
       },
       {
         projId: 2,
@@ -414,13 +414,13 @@ const consumableOneChannelData: ConsumablesOneChannel = Mock.mock({
         lotId: 'FA020000',
         color: '#DC143C',
         num: 25,
-        isUse: true,
+        isInstall: true,
       },
       {
         lotId: '',
         color: '',
         num: 0,
-        isUse: false,
+        isInstall: false,
       },
       {
         projId: 4,
@@ -429,7 +429,7 @@ const consumableOneChannelData: ConsumablesOneChannel = Mock.mock({
         lotId: 'FA040000',
         color: '#FF69B4',
         num: 25,
-        isUse: true,
+        isInstall: true,
       },
       {
         projId: 5,
@@ -438,7 +438,7 @@ const consumableOneChannelData: ConsumablesOneChannel = Mock.mock({
         lotId: 'FA050000',
         color: '#FF1493',
         num: 25,
-        isUse: true,
+        isInstall: true,
       },
       {
         projId: 6,
@@ -447,7 +447,7 @@ const consumableOneChannelData: ConsumablesOneChannel = Mock.mock({
         lotId: 'FA060000',
         color: '#C71585',
         num: 25,
-        isUse: true,
+        isInstall: true,
       },
     ],
   },
diff --git a/src/pages/Index/Regular/Consumables.vue b/src/pages/Index/Regular/Consumables.vue
index 91b8291..973fc07 100644
--- a/src/pages/Index/Regular/Consumables.vue
+++ b/src/pages/Index/Regular/Consumables.vue
@@ -87,7 +87,7 @@
           gridWidth="240px"
           gridHeight="240px"
           :activeColor="item.color"
-          :inUse="item.isUsed"
+          :inUse="item.isInstall"
         />
       </div>
     </div>
@@ -177,7 +177,7 @@ interface BufferLittle {
   type?: string
   projId?: number
   projName?: string
-  isUsed?: boolean
+  isInstall?: boolean
 }
 const bufferLittles = ref<BufferLittle[]>([
   {
@@ -260,12 +260,7 @@ const handleConsumablesState = (data: ConsumablesStateMessage['data']) => {
       moveLiquids.value = data.tips
       tempTipNum.value = [...moveLiquids.value.map((liquid) => liquid.tipNum)]
       plates.value = data.reactionPlateGroup as ReactionPlate[]
-      if (!devOptions.enable_LittleBottle_isUsed) {
-        //@ts-ignore
-        bufferLittles.value = R.map(R.omit(['isUsed']) ,data.littBottleGroup)
-      } else {
-        bufferLittles.value = data.littBottleGroup as BufferLittle[]
-      }
+      bufferLittles.value = data.littBottleGroup as BufferLittle[]
       bufferBig.value = data.larBottleGroup as BottleGroup[]
     } else {
       console.log('正在拖动，不更新耗材')
@@ -293,7 +288,7 @@ const updatePlatesAndBuffers = ({
     bufferLittles.value[index].num = value
   }
   if (type === 'BigBuf' && bufferBig.value && bufferBig.value[index]) {
-    bufferBig.value[index].isUse = value > 0
+    bufferBig.value[index].isInstall = value > 0
   }
 }
 onMounted(() => {
@@ -423,7 +418,7 @@ const handleIsUnload = () => {
       color: '#4caf50',
     },
   ]
-  bufferBig.value = Array.from({ length: 6 }, () => ({ num: 0, isUse: false }))
+  bufferBig.value = Array.from({ length: 6 }, () => ({ num: 0, isInstall: false }))
 }
 
 const isDragging = ref(false)
@@ -437,6 +432,7 @@ const updateTipNum = async ({
   tipNum: number
   sync: boolean
 }) => {
+  if (tipNum < 0) { return }
   if (deviceStore.status === 'IDLE') {
     tempTipNum.value[index] = tipNum
     //调用接口
diff --git a/src/pages/Index/components/Consumables/BallGrid.vue b/src/pages/Index/components/Consumables/BallGrid.vue
index 6805f96..28bc1e1 100644
--- a/src/pages/Index/components/Consumables/BallGrid.vue
+++ b/src/pages/Index/components/Consumables/BallGrid.vue
@@ -73,7 +73,7 @@ const ballStyle = (index) => {
 // 动态计算内部小球的颜色变化
 const innerCircleStyle = (index) => {
   const ball = props.data[index] || {}
-  const isActive = !!ball.isUse
+  const isActive = !!ball.isInstall
   return {
     height: `${ball.num/25.0*100}%`,
     backgroundColor: isActive ? ball.color : props.innerColor,
diff --git a/src/pages/Index/components/Consumables/SpttingPlates.vue b/src/pages/Index/components/Consumables/SpttingPlates.vue
index a71a426..cb15c64 100644
--- a/src/pages/Index/components/Consumables/SpttingPlates.vue
+++ b/src/pages/Index/components/Consumables/SpttingPlates.vue
@@ -92,7 +92,7 @@ watch(
   },
 )
 const updateSliderVal = async (plate, order) => {
-  if (deviceStore.status === 'IDLE') {
+  if (deviceStore.status === 'IDLE' && plate >= 0) {
     isDragging.value = true
     // eventBus.emit('confirm', {
     //   type: 'Plate',
@@ -107,7 +107,7 @@ const updateSliderVal = async (plate, order) => {
 
 const updateSliderEndVal = async (plate, order) => {
   isDragging.value = false
-  if (deviceStore.status === 'IDLE') {
+  if (deviceStore.status === 'IDLE' && plate >= 0) {
     try {
       const res = await updateConsumables({ group: `CG${order}`, num: plate })
       if (res.success) {
diff --git a/src/types/Index/Consumables.ts b/src/types/Index/Consumables.ts
index 768d3e5..f6671e8 100644
--- a/src/types/Index/Consumables.ts
+++ b/src/types/Index/Consumables.ts
@@ -41,7 +41,7 @@ export interface BottleGroup {
   lotId?: string
   color?: string
   num: number
-  isUse?: boolean // 仅 larBottleGroup 中存在的字段
+  isInstall?: boolean 
 }
 
 // 耗材 接口
diff --git a/src/websocket/socket.ts b/src/websocket/socket.ts
index 6ab368b..cc815a1 100644
--- a/src/websocket/socket.ts
+++ b/src/websocket/socket.ts
@@ -187,7 +187,7 @@ interface LittleBottleGroup extends ConsumableGroupBase {
 
 // 大缓冲液接口
 interface LargeBottleGroup extends ConsumableGroupBase {
-  isUse: boolean
+  isInstall: boolean
 }
 
 // Tips信息接口

From 497f9c055412396b8f8c02283fe218ca56dbe702 Mon Sep 17 00:00:00 2001
From: LiLongLong <13717757313@163.com>
Date: Mon, 13 Jan 2025 09:33:55 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Index/Index.vue           | 2 +-
 src/pages/Index/Regular/Running.vue | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/pages/Index/Index.vue b/src/pages/Index/Index.vue
index d14e1ad..a009d62 100644
--- a/src/pages/Index/Index.vue
+++ b/src/pages/Index/Index.vue
@@ -373,7 +373,7 @@ onMounted(() => {
 // 开始检测
 const checkInit = () => {
   const hasExecutedReset = sessionStorage.getItem('deviceResetFinished');
-  if (hasExecutedReset === "false") {
+  if (!hasExecutedReset || hasExecutedReset === 'false') {
     showModal.value = true;
   }
 };
diff --git a/src/pages/Index/Regular/Running.vue b/src/pages/Index/Regular/Running.vue
index d3d87b4..651cc86 100644
--- a/src/pages/Index/Regular/Running.vue
+++ b/src/pages/Index/Regular/Running.vue
@@ -1055,6 +1055,11 @@ onMounted(() => {
   startPolling()
 })
 
+onDeactivated(() => {
+  clearInterval(pollInterval)
+  stopPolling()
+})
+
 onUnmounted(() => {
   clearInterval(pollInterval)
   stopPolling()