save

src/pages/pc/index.vue

@@ -121,7 +121,7 @@ let show = $ref(false)
 }
 
 .aside {
-  background: white;
+  background: var(--color-second-bg);
   position: fixed;
   z-index: 999;
   top: 0;

src/pages/pc/practice/Statistics.vue

@@ -21,14 +21,20 @@ let open = $ref(false)
 
 onMounted(() => {
   emitter.on(EventKey.openStatModal, () => {
+    let data = {
+      startIndex: store.sword.lastLearnIndex,
+      endIndex: store.sword.lastLearnIndex + store.sword.perDayStudyNumber,
+      speed: statStore.speed,
+      startDate: statStore.startDate,
+    }
+    store.sword.lastLearnIndex = data.endIndex
+    store.currentStudyWordDict.statistics.push(data as any)
+    store.currentStudyWordDict.statistics.sort((a, b) => a.startDate - b.startDate)
+
+    console.log('staa', JSON.parse(JSON.stringify(store.currentStudyWordDict.statistics)))
     open = true
   })
 
-  let data = cloneDeep(statStore)
-  delete data.step
-  delete data.correctRate
-  store.currentStudyWordDict.statistics.push(data as any)
-
   const close = () => {
     open = false
   }

src/pages/pc/practice/practice-word/TypingWord.vue

@@ -24,6 +24,7 @@ interface IProps {
   data: {
     new: any[],
     review: any[],
+    write: any[],
   }
 }
 
@@ -31,6 +32,7 @@ const props = withDefaults(defineProps<IProps>(), {
   data: {
     new: [],
     review: [],
+    write: [],
   }
 })
 
@@ -43,7 +45,7 @@ const emit = defineEmits<{
 const typingRef: any = $ref()
 const store = useBaseStore()
 const runtimeStore = useRuntimeStore()
-const statisticsStore = usePracticeStore()
+const statStore = usePracticeStore()
 const settingStore = useSettingStore()
 
 const {
@@ -69,14 +71,14 @@ watch(() => props.data, () => {
   current.wrongWords = []
   allWrongWords = []
 
-  statisticsStore.step = 0
-  statisticsStore.startDate = Date.now()
-  statisticsStore.correctRate = -1
-  statisticsStore.inputWordNumber = 0
-  statisticsStore.wrongWordNumber = 0
-  statisticsStore.total = props.data.review.concat(props.data.new).length
-  statisticsStore.newWordNumber = props.data.new.length
-  statisticsStore.index = 0
+  statStore.step = 0
+  statStore.startDate = Date.now()
+  statStore.correctRate = -1
+  statStore.inputWordNumber = 0
+  statStore.wrongWordNumber = 0
+  statStore.total = props.data.review.concat(props.data.new).length
+  statStore.newWordNumber = props.data.new.length
+  statStore.index = 0
 }, {immediate: true, deep: true})
 
 const word = $computed(() => {
@@ -99,23 +101,37 @@ function next(isTyping: boolean = true) {
       current.index = 0
       current.wrongWords = []
     } else {
-      console.log('学完了，没错词', statisticsStore.total)
-      isTyping && statisticsStore.inputWordNumber++
-      statisticsStore.speed = Date.now() - statisticsStore.startDate
-      if (statisticsStore.step) {
+      console.log('学完了，没错词', statStore.total, statStore.step,current.index,current.words)
+      isTyping && statStore.inputWordNumber++
+      statStore.speed = Date.now() - statStore.startDate
+
+      if (statStore.step === 2) {
         emitter.emit(EventKey.openStatModal, {})
         // emit('complete', {})
-      } else {
+      }
+
+      if (statStore.step === 1) {
         settingStore.dictation = true
-        statisticsStore.step++
-        current.words = shuffle(props.data.review.concat(props.data.new))
+        current.words = props.data.write.concat(props.data.new).concat(props.data.review)
+        statStore.step++
         current.index = 0
       }
+
+      if (statStore.step === 0) {
+        statStore.step++
+        if (props.data.review.length) {
+          current.words = props.data.review
+          settingStore.dictation = false
+          current.index = 0
+        } else {
+          next()
+        }
+      }
     }
   } else {
     current.index++
-    isTyping && statisticsStore.inputWordNumber++
-    console.log('这个词完了')
+    isTyping && statStore.inputWordNumber++
+    // console.log('这个词完了')
   }
 }
 
@@ -128,7 +144,7 @@ function wordWrong() {
   }
   if (!allWrongWords.find((v: Word) => v.word.toLowerCase() === word.word.toLowerCase())) {
     allWrongWords.push(word)
-    statisticsStore.wrongWordNumber++
+    statStore.wrongWordNumber++
   }
 }
 
@@ -264,8 +280,10 @@ onUnmounted(() => {
             >
               <div class="list-header">
                 <div>
-                  {{ statisticsStore.step ? '复习' : '学习'}}
-                  {{ current.words.length }}个单词</div>
+                  {{ statStore.step }}
+                  {{ statStore.step ? '复习' : '学习' }}
+                  {{ current.words.length }}个单词
+                </div>
                 <div style="position:relative;"
                      @click.stop="null">
                   <BaseIcon

src/pages/pc/word/StudyWord.vue

@@ -18,24 +18,23 @@ import TypingWord from "@/pages/pc/practice/practice-word/TypingWord.vue";
 import {getCurrentStudyWord, syncMyDictList} from "@/hooks/dict.ts";
 import {cloneDeep, shuffle} from "lodash-es";
 
-const statisticsStore = usePracticeStore()
+const statStore = usePracticeStore()
 const store = useBaseStore()
 const settingStore = useSettingStore()
 const runtimeStore = useRuntimeStore()
 const {toggleTheme} = useTheme()
 
-watch(statisticsStore, () => {
-  if (statisticsStore.inputWordNumber < 1) {
-    return statisticsStore.correctRate = -1
+watch(statStore, () => {
+  if (statStore.inputWordNumber < 1) {
+    return statStore.correctRate = -1
   }
-  if (statisticsStore.wrongWordNumber > statisticsStore.inputWordNumber) {
-    return statisticsStore.correctRate = 0
+  if (statStore.wrongWordNumber > statStore.inputWordNumber) {
+    return statStore.correctRate = 0
   }
-  statisticsStore.correctRate = 100 - Math.trunc(((statisticsStore.wrongWordNumber) / (statisticsStore.inputWordNumber)) * 100)
+  statStore.correctRate = 100 - Math.trunc(((statStore.wrongWordNumber) / (statStore.inputWordNumber)) * 100)
 })
 
 function next() {
-  store.currentStudy.word.lastLearnIndex = store.currentStudy.word.lastLearnIndex + store.currentStudy.word.perDayStudyNumber
   emitter.emit(EventKey.resetWord)
   getCurrentPractice()
 }
@@ -104,7 +103,9 @@ onUnmounted(() => {
 
 onMounted(() => {
   settingStore.dictation = false
-  data = runtimeStore.routeData
+  if (runtimeStore.routeData) {
+    data = runtimeStore.routeData
+  }
   emitter.on(EventKey.changeDict, getCurrentPractice)
 })
 

src/pages/pc/word/WordHome.vue

@@ -10,8 +10,11 @@ import BasePage from "@/pages/pc/components/BasePage.vue";
 import {getDefaultDict} from "@/types.ts";
 import {onMounted} from "vue";
 import {getCurrentStudyWord} from "@/hooks/dict.ts";
+import {c} from "vite/dist/node/types.d-aGj9QkWt";
+import {usePracticeStore} from "@/stores/practice.ts";
 
 const store = useBaseStore()
+const statStore = usePracticeStore()
 const router = useRouter()
 const {nav} = useNav()
 
@@ -28,13 +31,18 @@ const otherWordDictList = $computed(() => {
 
 let currentStudy = $ref({
   new: [],
-  review: []
+  review: [],
+  write: []
 })
 
 onMounted(() => {
   currentStudy = getCurrentStudyWord()
 })
 
+function study(){
+  nav('study-word',{},currentStudy)
+}
+
 </script>
 
 <template>
@@ -92,11 +100,17 @@ onMounted(() => {
             <div class="text-4xl font-bold">{{ currentStudy.review.length }}</div>
             <div class="text">复习数</div>
           </div>
+          <div class="flex-1 flex flex-col items-center">
+            <div class="text-4xl font-bold">{{
+                currentStudy.new.length + currentStudy.review.length + currentStudy.write.length
+              }}</div>
+            <div class="text">默写数</div>
+          </div>
         </div>
       </div>
       <div class="">
         <div class="rounded-xl bg-slate-800 flex items-center gap-2 py-3 px-5 text-white cursor-pointer"
-             @click="nav('study-word',{},currentStudy)">
+             @click="study">
           <span>开始学习</span>
           <Icon icon="icons8:right-round" class="text-2xl"/>
         </div>
@@ -178,7 +192,8 @@ onMounted(() => {
 
 <style scoped lang="scss">
 .card {
-  @apply rounded-xl bg-white p-4 mt-5;
+  @apply rounded-xl p-4 mt-5;
+  background: var(--color-second-bg);
 }
 
 .center {