diff --git a/src/pages/pc/word/Statistics.vue b/src/pages/pc/word/Statistics.vue
index 29566d7e..c774fd97 100644
--- a/src/pages/pc/word/Statistics.vue
+++ b/src/pages/pc/word/Statistics.vue
@@ -55,6 +55,7 @@ watch(model, (newVal) => {
total: statStore.total,
wrong: statStore.wrong,
new: statStore.newWordNumber,
+ review: statStore.reviewWordNumber + statStore.writeWordNumber
}
//这里不知为啥会卡,打开有延迟
requestIdleCallback(() => {
@@ -102,11 +103,11 @@ function options(emitType: string) {
复习数
-
{{ statStore.newWordNumber }}
+
{{ statStore.reviewWordNumber }}
默写数
-
{{ statStore.newWordNumber }}
+
{{ statStore.writeWordNumber }}
diff --git a/src/pages/pc/word/StudyWord.vue b/src/pages/pc/word/StudyWord.vue
index 14c4e261..5c1a0b41 100644
--- a/src/pages/pc/word/StudyWord.vue
+++ b/src/pages/pc/word/StudyWord.vue
@@ -116,7 +116,9 @@ watch(() => studyData, () => {
statStore.inputWordNumber = 0
statStore.wrong = 0
statStore.total = studyData.review.length + studyData.new.length + studyData.write.length
- statStore.newWordNumber = store.sdict.complete ? studyData.review.length : studyData.new.length
+ statStore.newWordNumber = studyData.new.length
+ statStore.reviewWordNumber = studyData.review.length
+ statStore.writeWordNumber = studyData.write.length
statStore.index = 0
})
diff --git a/src/pages/pc/word/WordHomePage.vue b/src/pages/pc/word/WordHomePage.vue
index 85f8c3b8..0f837687 100644
--- a/src/pages/pc/word/WordHomePage.vue
+++ b/src/pages/pc/word/WordHomePage.vue
@@ -27,6 +27,7 @@ let currentStudy = $ref({
write: []
})
+//todo 当选完词返回时,计算今日任务时,还是老的词典
onMounted(init)
watch(() => store.load, init)
diff --git a/src/stores/practice.ts b/src/stores/practice.ts
index a2651201..db2cf442 100644
--- a/src/stores/practice.ts
+++ b/src/stores/practice.ts
@@ -3,12 +3,12 @@ import {defineStore} from "pinia"
export interface PracticeState {
step: number,
startDate: number,
- //todo 删除
- speed: number,
spend: number,
total: number,
index: number,//当前输入的第几个,用于和total计算进度
newWordNumber: number,
+ reviewWordNumber: number,
+ writeWordNumber: number,
inputWordNumber: number,//当前总输入了多少个单词(不包含跳过)
wrong: number,
startIndex: number,
@@ -19,7 +19,6 @@ export const usePracticeStore = defineStore('practice', {
state: (): PracticeState => {
return {
step: 0,
- speed: 0,
spend: 0,
startDate: Date.now(),
total: 0,
@@ -27,6 +26,8 @@ export const usePracticeStore = defineStore('practice', {
startIndex: 0,
endIndex: 0,
newWordNumber: 0,
+ reviewWordNumber: 0,
+ writeWordNumber: 0,
inputWordNumber: 0,
wrong: 0,
}
diff --git a/src/types.ts b/src/types.ts
index 24fbfa14..602b165e 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -143,6 +143,7 @@ export interface Statistics {
speed?: number,//花费时间
total: number//单词数量
new: number//新学单词数量
+ review: number//复习单词数量
wrong: number//错误数
}