diff --git a/src/pages/Index/TestTube/TubeUserId.vue b/src/pages/Index/TestTube/TubeUserId.vue index ff95774..5a3726a 100644 --- a/src/pages/Index/TestTube/TubeUserId.vue +++ b/src/pages/Index/TestTube/TubeUserId.vue @@ -111,8 +111,8 @@ const tubeGroups = ref([ ]) const projectsAvailable = computed(() => { - const group = R.groupBy((p) => p.projName, consumables.plates) - const pNames = R.keys(group) + const group = R.groupBy((p) => p.projName, consumables.consumableData.reactionPlateGroup) + const pNames = R.keys(group).filter(n => n !== 'null') const projArr = pNames.map((n) => R.reduce( diff --git a/src/pages/Index/components/TestTube/Tube.vue b/src/pages/Index/components/TestTube/Tube.vue index bcd4325..f1a0f3c 100644 --- a/src/pages/Index/components/TestTube/Tube.vue +++ b/src/pages/Index/components/TestTube/Tube.vue @@ -9,14 +9,22 @@
{{ tube.projId.length === 1 - ? projIdMap[tube.projId[0]].projName + ? projIdMap[tube.projId[0]] + ? projIdMap[tube.projId[0]].projName + : '' : tube.projId.length === 2 - ? projIdMap[tube.projId[1]].projName + ? projIdMap[tube.projId[1]] + ? projIdMap[tube.projId[1]].projName + : '' : '' }} {{ bloodKeyMap[tube.bloodType]?.name }} {{ - tube.projId.length === 2 ? projIdMap[tube.projId[0]].projName : '' + tube.projId.length === 2 + ? projIdMap[tube.projId[0]] + ? projIdMap[tube.projId[0]].projName + : '' + : '' }}
@@ -82,7 +90,7 @@ watch( if (canvas.value) { const data = props.tube.projId.map((p) => ({ value: 1, - color: projIdMap.value[p].color, + color: projIdMap.value[p] ? projIdMap.value[p].color : '#FFF', })) const ctx = canvas.value.getContext('2d') drawPieChart(ctx, data)