diff --git a/src/pages/Index/History.vue b/src/pages/Index/History.vue index e5c11c4..5e848a6 100644 --- a/src/pages/Index/History.vue +++ b/src/pages/Index/History.vue @@ -132,14 +132,14 @@ @@ -548,11 +565,12 @@ const updateTipNum = async ({ .ball-area { display: flex; - justify-self: space-between; flex-wrap: wrap; - + column-gap: 20px; + row-gap: 12px; + padding: 0 24px ; .ball-grid { - margin: 0 15px 5px 15px; + overflow: hidden; } } } diff --git a/src/pages/Index/Regular/Running.vue b/src/pages/Index/Regular/Running.vue index 30e66b8..16a9ee2 100644 --- a/src/pages/Index/Regular/Running.vue +++ b/src/pages/Index/Regular/Running.vue @@ -116,14 +116,14 @@ import { ref, onMounted, onUnmounted, watch, onActivated, onDeactivated } from 'vue' import { useRouter, useRoute } from 'vue-router' import { useTestTubeStore, useConsumablesStore } from '../../../store' -import { getBloodTypeLabel, processTubeSettings } from '../utils' +import { getBloodTypeLabel, processTubeSettings } from '../Utils' import { SampleDisplay, PlateDisplay, LittleBufferDisplay, BallGrid, EmergencyResultDialog, -} from '../components' +} from '../Components' import { wasteArea, getTubeRackState } from '../../../services/index' import type { Subtank, TubeRackInfo } from '../../../types/Index' import { getRunningList } from '../../../services/Index/running/running' diff --git a/src/pages/Index/Regular/TestTube.vue b/src/pages/Index/Regular/TestTube.vue index 26bc4f0..74cf70d 100644 --- a/src/pages/Index/Regular/TestTube.vue +++ b/src/pages/Index/Regular/TestTube.vue @@ -27,7 +27,7 @@ + + diff --git a/src/pages/Index/components/Consumables/DragAreaEx.vue b/src/pages/Index/components/Consumables/DragAreaEx.vue index df93773..7f27659 100644 --- a/src/pages/Index/components/Consumables/DragAreaEx.vue +++ b/src/pages/Index/components/Consumables/DragAreaEx.vue @@ -5,16 +5,16 @@ @touchstart.prevent="handleStart" >
@@ -41,7 +41,7 @@ const props = defineProps({ }, }) -const emit = defineEmits(['update:hVal','update:vVal']) +const emit = defineEmits(['update:sliderValue','update:sliderEndValue']) const hValue = ref(props.hVal) const hTotalVal = ref(props.hTotal) @@ -57,10 +57,10 @@ const sliderTrack = useTemplateRef('sliderTrack') watch( [() => props.hVal, () => props.vVal], - (newX, newY) => { + (newVal) => { if (!isDragging.value) { - hValue.value = newX - vValue.value = newY + hValue.value = newVal[0] + vValue.value = newVal[1] } }, ) @@ -72,7 +72,7 @@ function handleStart(event) { const rect = sliderTrack.value.getBoundingClientRect() startXValue.value = (hValue.value / hTotalVal.value) * rect.width startYValue.value = (vValue.value / vTotalVal.value) * rect.height - + isDragging.value = true document.addEventListener('mousemove', handleDrag) document.addEventListener('touchmove', handleDrag, { passive: false }) @@ -92,12 +92,12 @@ function handleDrag(event) { hValue.value = Math.min(1, Math.max(0, percentX)) * hTotalVal.value vValue.value = Math.min(1, Math.max(0, percentY)) * vTotalVal.value - // console.log(percent, sliderValue.value) - emit('update:hVal', hValue.value) - emit('update:vVal', vValue.value) + + emit('update:sliderValue', hValue.value.toFixed(), vValue.value.toFixed()) } function handleEnd() { + emit('update:sliderEndValue', hValue.value.toFixed(), vValue.value.toFixed()) isDragging.value = false document.removeEventListener('mousemove', handleDrag) document.removeEventListener('touchmove', handleDrag) @@ -108,16 +108,14 @@ function handleEnd() { diff --git a/src/pages/Index/components/Consumables/MoveLiquidArea.vue b/src/pages/Index/components/Consumables/MoveLiquidArea.vue index 5c3172a..3cab0e8 100644 --- a/src/pages/Index/components/Consumables/MoveLiquidArea.vue +++ b/src/pages/Index/components/Consumables/MoveLiquidArea.vue @@ -28,48 +28,51 @@ class="controller" v-for="(controller, index) in tempTipNum" :key="index" - :class="{ 'selected-controller': currentPlate === index }" + :class="{ 'selected-controller': activeTab === index }" @click="changePlate(index)" > -