From 11a52fed8adabef85798510e53d423b0c6d17edf Mon Sep 17 00:00:00 2001
From: guoapeng <GuoAnPeng@163.com>
Date: Mon, 21 Apr 2025 23:20:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=80=97=E6=9D=90=E6=BB=91=E5=8A=A8?=
 =?UTF-8?q?=E6=94=B9=E5=8F=98=E9=87=8D=E6=9E=84=E4=BC=98=E5=8C=962?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Index/Regular/Consumables.vue              |  2 +-
 src/pages/Index/components/Consumables/BallGrid2.vue |  2 +-
 src/pages/Index/components/Consumables/InfoBar.vue   | 14 ++++++++++----
 src/pages/Login/index.vue                            |  2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/pages/Index/Regular/Consumables.vue b/src/pages/Index/Regular/Consumables.vue
index 5833915..2b730d2 100644
--- a/src/pages/Index/Regular/Consumables.vue
+++ b/src/pages/Index/Regular/Consumables.vue
@@ -77,7 +77,7 @@
       <!--缓冲液区域小-->
       <div class="buffer-little-title">
         <div class="line"></div>
-        <div class="content">缓冲液(小)</div>
+        <div class="content">耗材区</div>
       </div>
       <div class="ball-area">
         <MainComponent
diff --git a/src/pages/Index/components/Consumables/BallGrid2.vue b/src/pages/Index/components/Consumables/BallGrid2.vue
index 2bd9b8f..c016ce7 100644
--- a/src/pages/Index/components/Consumables/BallGrid2.vue
+++ b/src/pages/Index/components/Consumables/BallGrid2.vue
@@ -92,7 +92,7 @@ const updateSliderVal = async (empty) => {
   }
   const activated = total - empty
 
-  emit('update:TipNum', activated, props.order, false)
+  emit('update:TipNum', activated, props.order, true)
 }
 
 const updateSliderEndVal = async (hVal, vVal) => {
diff --git a/src/pages/Index/components/Consumables/InfoBar.vue b/src/pages/Index/components/Consumables/InfoBar.vue
index 29f61cc..545e19d 100644
--- a/src/pages/Index/components/Consumables/InfoBar.vue
+++ b/src/pages/Index/components/Consumables/InfoBar.vue
@@ -1,13 +1,19 @@
 <template>
   <div :style="`width:${width}`">
     <div class="status-bar" v-if="currentCount">
-      <span class="project-name">{{ projectName }}</span>
-      
-      <span class="project-name">{{ lotId }}</span>
+      <el-tooltip :content="projectName" placement="top" trigger="click">
+        <span class="project-name">{{ projectName }}</span>
+      </el-tooltip>
+      <el-tooltip :content="lotId" placement="top" trigger="click">
+        <span class="project-name">{{ lotId }}</span>
+      </el-tooltip>
+
       <span class="project-count">{{ currentCount }}/{{ maxCount }}</span>
     </div>
     <div v-else class="status-bar">
-      <span class="project-name">{{ projectName }}</span>
+      <el-tooltip :content="projectName" placement="top" trigger="click">
+        <span class="project-name">{{ projectName }}</span>
+      </el-tooltip>
       <span class="project-count"></span>
     </div>
   </div>
diff --git a/src/pages/Login/index.vue b/src/pages/Login/index.vue
index edfe3a0..afa27ba 100644
--- a/src/pages/Login/index.vue
+++ b/src/pages/Login/index.vue
@@ -117,7 +117,7 @@ const submitPin = async () => {
         >
           {{ n }}
         </div>
-        <div class="key" @click="password = ''">重输</div>
+        <div class="key" @click="password = '';errorMsg = ''">重输</div>
         <div class="key" @click="inputPin('0')">0</div>
         <div class="key" @click="submitPin">确定</div>
       </div>