Browse Source

fix:初次开机,未提示初始化

dev
zhangjiming 7 months ago
parent
commit
1dbdc36237
  1. 2
      src/pages/Index/Index.vue
  2. 9
      src/pages/Index/Regular/Consumables.vue

2
src/pages/Index/Index.vue

@ -373,7 +373,7 @@ onMounted(() => {
// //
const checkInit = () => { const checkInit = () => {
const hasExecutedReset = sessionStorage.getItem('deviceResetFinished'); const hasExecutedReset = sessionStorage.getItem('deviceResetFinished');
if (hasExecutedReset === "false") {
if (!hasExecutedReset || hasExecutedReset === "false") {
showModal.value = true; showModal.value = true;
} }
}; };

9
src/pages/Index/Regular/Consumables.vue

@ -163,8 +163,6 @@ interface ScanReport {
} }
const formattedReports = ref<ScanReport[]>([]) const formattedReports = ref<ScanReport[]>([])
//
const isAlreadyLoad = ref(false) //??
// //
const tempTipNum = ref<number[]>([ const tempTipNum = ref<number[]>([
...moveLiquids.value.map((liquid) => liquid.tipNum), ...moveLiquids.value.map((liquid) => liquid.tipNum),
@ -233,7 +231,6 @@ const handleConfirmScan = () => {
if (formattedReports.value.some((report) => report.isError)) { if (formattedReports.value.some((report) => report.isError)) {
isHandleScan.value = false isHandleScan.value = false
isLoadedConsumables.value = false isLoadedConsumables.value = false
isAlreadyLoad.value = false
ElMessage.warning('存在错误,请检查耗材') ElMessage.warning('存在错误,请检查耗材')
} else { } else {
isHandleScan.value = true isHandleScan.value = true
@ -257,7 +254,7 @@ const handleSensorState = (data: SensorStateMessage['data']) => {
// //
const handleConsumablesState = (data: ConsumablesStateMessage['data']) => { const handleConsumablesState = (data: ConsumablesStateMessage['data']) => {
if (isAlreadyLoad.value && isHandleScan.value) {
if (isHandleScan.value) {
consumableStore.setConsumablesData(data) consumableStore.setConsumablesData(data)
if (!isDragging.value) { if (!isDragging.value) {
moveLiquids.value = data.tips moveLiquids.value = data.tips
@ -351,7 +348,7 @@ const handleIsLoad = async () => {
} catch (error) { } catch (error) {
console.error('加载耗材失败:', error) console.error('加载耗材失败:', error)
isLoading.value = false isLoading.value = false
isAlreadyLoad.value = false
isHandleScan.value = false
ElMessage.error('加载耗材失败') ElMessage.error('加载耗材失败')
} }
} }
@ -366,7 +363,6 @@ watch(isHandleScan, (newVal) => {
bufferBig.value = consumablesData.value.larBottleGroup as BottleGroup[] bufferBig.value = consumablesData.value.larBottleGroup as BottleGroup[]
tempTipNum.value = [...moveLiquids.value.map((liquid) => liquid.tipNum)] tempTipNum.value = [...moveLiquids.value.map((liquid) => liquid.tipNum)]
isLoadedConsumables.value = true isLoadedConsumables.value = true
isAlreadyLoad.value = true
consumableStore.setConsumablesData(consumablesData.value) consumableStore.setConsumablesData(consumablesData.value)
} }
} else { } else {
@ -377,7 +373,6 @@ watch(isHandleScan, (newVal) => {
const handleIsUnload = () => { const handleIsUnload = () => {
isLoadedConsumables.value = !isLoadedConsumables.value isLoadedConsumables.value = !isLoadedConsumables.value
isLoading.value = false isLoading.value = false
isAlreadyLoad.value = false
isHandleScan.value = false isHandleScan.value = false
// moveLiquids tempTipNum // moveLiquids tempTipNum
moveLiquids.value = [ moveLiquids.value = [

Loading…
Cancel
Save