diff --git a/src/pages/Index/Regular/Consumables.vue b/src/pages/Index/Regular/Consumables.vue
index 9cdc35a..5e3c167 100644
--- a/src/pages/Index/Regular/Consumables.vue
+++ b/src/pages/Index/Regular/Consumables.vue
@@ -90,6 +90,7 @@
:totalBalls="25"
:activatedBalls="item.num"
:columns="5"
+ :lotId="item.lotId"
gridWidth="240px"
gridHeight="240px"
:activeColor="consumableStore.projIdColorMap[item.projId!]"
@@ -124,7 +125,7 @@ import {
unloadAllConsumable,
unloadConsumable,
ConsumableGroupNo,
-} from '@/services/Index/index'
+} from "@/services/Index/index"
import { useConsumablesStore, useEmergencyStore } from '@/store'
import { useDeviceStore } from '@/store/index'
import { eventBus } from '@/eventBus'
diff --git a/src/pages/Index/components/Consumables/InfoBar.vue b/src/pages/Index/components/Consumables/InfoBar.vue
index 3e0e93c..29f61cc 100644
--- a/src/pages/Index/components/Consumables/InfoBar.vue
+++ b/src/pages/Index/components/Consumables/InfoBar.vue
@@ -2,6 +2,8 @@
{{ projectName }}
+
+ {{ lotId }}
{{ currentCount }}/{{ maxCount }}
@@ -32,6 +34,9 @@ const props = defineProps({
type: String,
default: '120px',
},
+ lotId: {
+ type: String,
+ },
})
// 解构 props
diff --git a/src/pages/Index/components/Consumables/MainComponent.vue b/src/pages/Index/components/Consumables/MainComponent.vue
index b4313dd..9cf001f 100644
--- a/src/pages/Index/components/Consumables/MainComponent.vue
+++ b/src/pages/Index/components/Consumables/MainComponent.vue
@@ -20,6 +20,7 @@
:currentCount="currentCount"
:maxCount="maxCount"
:width="gridWidth"
+ :lotId="lotId"
/>
@@ -73,6 +74,9 @@ const props = defineProps({
type: Boolean,
default: true,
},
+ lotId:{
+ type: String,// 批次号
+ }
})
const emit = defineEmits(['updateBottleNum'])
diff --git a/src/pages/Index/components/Consumables/MoveLiquidArea.vue b/src/pages/Index/components/Consumables/MoveLiquidArea.vue
index 8d89f61..75baf8a 100644
--- a/src/pages/Index/components/Consumables/MoveLiquidArea.vue
+++ b/src/pages/Index/components/Consumables/MoveLiquidArea.vue
@@ -336,9 +336,9 @@ const changePlate = (index: number) => {
}
.load-consumables {
- margin: 0 16px 12px 10px;
+ margin: 12px 16px 12px 10px;
padding: 0;
- height: 100px;
+ height: 90px;
font-size: 40px;
border-radius: 10px;
// margin-bottom: 15px;
diff --git a/src/pages/Login/Login.vue b/src/pages/Login/Login.vue
index cb8a85f..12a26fe 100644
--- a/src/pages/Login/Login.vue
+++ b/src/pages/Login/Login.vue
@@ -132,11 +132,11 @@ const clearPin = () => {
// 点击确认验证PIN码
// 模拟后端请求验证PIN
const submitPin = async () => {
- // let resData = await isBoardParamInited()
- // if(!resData.data){//设备正在初始化
- // message.warning('设备正在初始化,请稍候...')
- // return;
- // }
+ let resData = await isBoardParamInited()
+ if(!resData.data){//设备正在初始化
+ message.warning('设备正在初始化,请稍候...')
+ return;
+ }
if (selectedUser.value === null) {
loginStatus.value = '请选择用户'
return