Browse Source

检验防止找不到属性

dev
zhangjiming 7 months ago
parent
commit
9cd73e4d15
  1. 4
      src/pages/Index/TestTube/TubeUserId.vue
  2. 12
      src/pages/Index/components/TestTube/Tube.vue

4
src/pages/Index/TestTube/TubeUserId.vue

@ -111,8 +111,8 @@ const tubeGroups = ref([
]) ])
const projectsAvailable = computed(() => { 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) => const projArr = pNames.map((n) =>
R.reduce( R.reduce(

12
src/pages/Index/components/TestTube/Tube.vue

@ -9,14 +9,22 @@
<div class="text-layer"> <div class="text-layer">
<span>{{ <span>{{
tube.projId.length === 1 tube.projId.length === 1
? projIdMap[tube.projId[0]]
? projIdMap[tube.projId[0]].projName ? projIdMap[tube.projId[0]].projName
: ''
: tube.projId.length === 2 : tube.projId.length === 2
? projIdMap[tube.projId[1]]
? projIdMap[tube.projId[1]].projName ? projIdMap[tube.projId[1]].projName
: '' : ''
: ''
}}</span> }}</span>
<span class="blood-text">{{ bloodKeyMap[tube.bloodType]?.name }}</span> <span class="blood-text">{{ bloodKeyMap[tube.bloodType]?.name }}</span>
<span>{{ <span>{{
tube.projId.length === 2 ? projIdMap[tube.projId[0]].projName : ''
tube.projId.length === 2
? projIdMap[tube.projId[0]]
? projIdMap[tube.projId[0]].projName
: ''
: ''
}}</span> }}</span>
</div> </div>
</div> </div>
@ -82,7 +90,7 @@ watch(
if (canvas.value) { if (canvas.value) {
const data = props.tube.projId.map((p) => ({ const data = props.tube.projId.map((p) => ({
value: 1, value: 1,
color: projIdMap.value[p].color,
color: projIdMap.value[p] ? projIdMap.value[p].color : '#FFF',
})) }))
const ctx = canvas.value.getContext('2d') const ctx = canvas.value.getContext('2d')
drawPieChart(ctx, data) drawPieChart(ctx, data)

Loading…
Cancel
Save