Browse Source

fix:tabs高度改为85px

master
LiLongLong 3 months ago
parent
commit
4bc42d6866
  1. 1
      components.d.ts
  2. 34
      src/pages/Index/Index.vue
  3. 2
      src/pages/Index/components/Consumables/MoveLiquidArea.vue
  4. 1
      src/pages/Index/components/Consumables/SpttingPlates.vue
  5. 2
      src/pages/Index/components/Consumables/TabBar.vue

1
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']

34
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<ConsumablesStateMessage['data'][]>([])
// 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)
}

2
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"

1
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 })
}

2
src/pages/Index/components/Consumables/TabBar.vue

@ -67,7 +67,7 @@ const onTabClick = (index: any) => {
<style scoped lang="less">
.tab-bar {
height: 70px;
height: 85px;
display: flex;
justify-content: space-around;
background-color: #fff;

Loading…
Cancel
Save