diff --git a/src/pages/training/components/BowData.vue b/src/pages/training/components/BowData.vue
index 8a5fe25..40118c2 100644
--- a/src/pages/training/components/BowData.vue
+++ b/src/pages/training/components/BowData.vue
@@ -28,6 +28,10 @@ const props = defineProps({
type: Number,
default: 0,
},
+ trainingType: {
+ type: String,
+ default: "",
+ },
});
@@ -72,6 +76,7 @@ const props = defineProps({
:rowCount="total === 12 ? 6 : 9"
:total="total"
:arrows="arrows"
+ :trainingType="trainingType"
:margin="total === 12 ? 4 : 1"
:fontSize="total === 12 ? 25 : 22"
/>
diff --git a/src/pages/training/components/ScorePanel.vue b/src/pages/training/components/ScorePanel.vue
index f62da65..9d81ab7 100644
--- a/src/pages/training/components/ScorePanel.vue
+++ b/src/pages/training/components/ScorePanel.vue
@@ -21,6 +21,10 @@ const props = defineProps({
type: Boolean,
default: true,
},
+ trainingType: {
+ type: String,
+ default: "",
+ },
});
const items = ref(new Array(props.total).fill(9));
const bgImages = [
@@ -34,7 +38,9 @@ const getDisplayText = (arrow) => {
};
const isLowScore = (arrow) => {
- if (!arrow || arrow.ringX) return false;
+ if (!arrow) return false;
+ if (props.trainingType === "rhythm") return arrow.ok !== true;
+ if (arrow.ringX) return false;
const ring = Number(arrow.ring);
return Number.isFinite(ring) && ring < 6;
};
diff --git a/src/pages/training/components/ScoreResult.vue b/src/pages/training/components/ScoreResult.vue
index a30bfac..964b62c 100644
--- a/src/pages/training/components/ScoreResult.vue
+++ b/src/pages/training/components/ScoreResult.vue
@@ -454,7 +454,7 @@ const calories = computed(
-