diff --git a/components.d.ts b/components.d.ts index 6d22984..055f503 100644 --- a/components.d.ts +++ b/components.d.ts @@ -8,6 +8,7 @@ export {} declare module 'vue' { export interface GlobalComponents { Confirm: typeof import('./src/components/Confirm.vue')['default'] + ElAvatar: typeof import('element-plus/es')['ElAvatar'] ElButton: typeof import('element-plus/es')['ElButton'] ElCol: typeof import('element-plus/es')['ElCol'] ElDropdown: typeof import('element-plus/es')['ElDropdown'] diff --git a/src/pages/Index/Index.vue b/src/pages/Index/Index.vue index 5aedb0d..2ab392c 100644 --- a/src/pages/Index/Index.vue +++ b/src/pages/Index/Index.vue @@ -550,12 +550,14 @@ const handleAppEvent = (data: AppEventMessage['data']) => { //注销用户 const router = useRouter() const onLogout = () => { - logout().then(() => { - router.push({ - path: '/login', - }) - sessionStorage.setItem('token', '') - isLoading.value = false; + logout().then((res) => { + if(res.success){ + router.push({ + path: '/login', + }) + sessionStorage.setItem('token', '') + isLoading.value = false; + } }) } @@ -674,10 +676,30 @@ const handleIncubationPlateStateMessage = ( runningStore.setSubTanks(data.subtanks) } +// const dataCache = ref([]) +// let timer = 0; const handleConsumablesState = (data: ConsumablesStateMessage['data']) => { + //未测试,先注释 + // if(data){ + // dataCache.value.push(data); + // timer = setInterval(onHandleCacheDataToStore, 100); + // }else{ + // clearInterval(timer) + // } consumableStore.setConsumablesData(data) } +//未测试,先注释 +// const onHandleCacheDataToStore = () => { +// if (dataCache.value.length > 0) { +// dataCache.value.forEach(item => { +// consumableStore.setConsumablesData(item) +// }) +// // 处理缓存中的数据并将其存储到 store 中 +// dataCache.value = []; // 清空缓存 +// } +// } + const handleEmergencyPosState = (data: EmergencyPosStateMessage['data']) => { emergencyStore.setInfo(data.tube) } diff --git a/src/pages/Index/components/Consumables/MoveLiquidArea.vue b/src/pages/Index/components/Consumables/MoveLiquidArea.vue index c68a13b..ac7d3f7 100644 --- a/src/pages/Index/components/Consumables/MoveLiquidArea.vue +++ b/src/pages/Index/components/Consumables/MoveLiquidArea.vue @@ -34,7 +34,7 @@ v-if="activeTab === 0" :order="1" :total="120" - :activated="moveLiquids[activeTab]?.tipNum" + :activated="moveLiquids![activeTab]?.tipNum" width="346px" height="310px" :columns="12" diff --git a/src/pages/Index/components/Consumables/SpttingPlates.vue b/src/pages/Index/components/Consumables/SpttingPlates.vue index 8b03eaa..fcca324 100644 --- a/src/pages/Index/components/Consumables/SpttingPlates.vue +++ b/src/pages/Index/components/Consumables/SpttingPlates.vue @@ -95,6 +95,7 @@ const onPlateLongPress = (order) => { } const updateSliderVal = async (plateNum, order) => { + console.log('order------', order) emits('updateReactionPlateNum', { index: order - 1, plateNum, sync: false }) } diff --git a/src/pages/Index/components/Consumables/TabBar.vue b/src/pages/Index/components/Consumables/TabBar.vue index 09d1486..f7d812f 100644 --- a/src/pages/Index/components/Consumables/TabBar.vue +++ b/src/pages/Index/components/Consumables/TabBar.vue @@ -67,7 +67,7 @@ const onTabClick = (index: any) => {