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" >
-
-
- {{ `${hValue.toFixed()}, ${vValue.toFixed()}` }} -
+ {{ `${hValue.toFixed()}; ${vValue.toFixed()}` }} + -->
@@ -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)" > -
移液区{{ index + 1 }}
+
移液头区{{ index + 1 }}
{{ controller }}/120
- - -
@@ -161,6 +164,7 @@ @@ -359,10 +354,11 @@ const changePlate = (index: number) => { } .controller-number { - font-size: 32px; + font-size: 30px; font-weight: 600; border-radius: 10px; border: 3px solid #54a4e8; + padding: 0 4px; } } diff --git a/src/pages/Index/components/Consumables/Plate.vue b/src/pages/Index/components/Consumables/Plate.vue index 39d2e90..7c638a3 100644 --- a/src/pages/Index/components/Consumables/Plate.vue +++ b/src/pages/Index/components/Consumables/Plate.vue @@ -32,19 +32,18 @@ defineProps({ diff --git a/src/pages/Index/components/Consumables/SliderAreaEx.vue b/src/pages/Index/components/Consumables/SliderAreaEx.vue index fa1bca1..04fe999 100644 --- a/src/pages/Index/components/Consumables/SliderAreaEx.vue +++ b/src/pages/Index/components/Consumables/SliderAreaEx.vue @@ -5,7 +5,7 @@ @touchstart.prevent="handleStart" >
-
{{ sliderValue.toFixed() }} -
+
--> @@ -36,8 +36,8 @@ const props = defineProps({ }, order: { type: Number, - default: 0 - } + default: 0, + }, }) const sliderValue = ref(props.currValue) @@ -47,7 +47,7 @@ const startX = ref(0) const startValue = ref(0) const sliderTrack = useTemplateRef('sliderTrack') -const emit = defineEmits(['update:sliderValue']) +const emit = defineEmits(['update:sliderValue', 'update:sliderEndValue']) watch( () => props.currValue, @@ -62,7 +62,8 @@ function handleStart(event) { const touchEvent = event.touches ? event.touches[0] : event startX.value = touchEvent.clientX const rect = sliderTrack.value.getBoundingClientRect() - startValue.value = (sliderValue.value / totalVal.value) * rect.width + startValue.value = + rect.width - (sliderValue.value / totalVal.value) * rect.width // console.log(sliderValue.value, totalVal.value) // console.log(startValue.value, rect.width) isDragging.value = true @@ -80,14 +81,14 @@ function handleDrag(event) { const rect = sliderTrack.value.getBoundingClientRect() let percent = (deltaX + startValue.value) / rect.width - sliderValue.value = Math.min(1, Math.max(0, percent)) * totalVal.value + sliderValue.value = + totalVal.value - Math.min(1, Math.max(0, percent)) * totalVal.value // console.log(percent, sliderValue.value) - // emit('update:modelValue', sliderValue.value) - + emit('update:sliderValue', sliderValue.value.toFixed(), props.order) } function handleEnd() { - emit('update:sliderValue', sliderValue.value, props.order) + emit('update:sliderEndValue', sliderValue.value.toFixed(), props.order) isDragging.value = false document.removeEventListener('mousemove', handleDrag) document.removeEventListener('touchmove', handleDrag) @@ -110,6 +111,7 @@ function handleEnd() { .slider-fill { position: absolute; + right: 0; height: 100%; background-color: rgba(255, 255, 255, 0.2); } @@ -119,12 +121,10 @@ function handleEnd() { top: 50%; left: 50%; transform: translateX(-50%) translateY(-50%); - font-size: 40px; + font-size: 36px; font-weight: 600; - color: #FFF; + color: #fff; + -webkit-text-stroke: 2px #000; } -.slider-thumb:active { - cursor: grabbing; -} diff --git a/src/pages/Index/components/Consumables/SpttingPlates.vue b/src/pages/Index/components/Consumables/SpttingPlates.vue index 3e13081..a71a426 100644 --- a/src/pages/Index/components/Consumables/SpttingPlates.vue +++ b/src/pages/Index/components/Consumables/SpttingPlates.vue @@ -15,36 +15,41 @@
+
+ + {{ platesValue[i - 1]?.projShortName }} + {{ platesValue[i - 1]?.num }}/25 +
+
+ + + +
+
- +
-
- - {{ plates[i - 1]?.projShortName }} - {{ plates[i - 1]?.num }}/25 -
-
- - - -
@@ -54,7 +59,7 @@