From 32cf097d64af5c01a14bf73153a89a705373e4b2 Mon Sep 17 00:00:00 2001
From: zyronon <zyronon@163.com>
Date: Sat, 26 Aug 2023 23:29:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Modal/Modal.vue      | 11 ++++---
 src/components/Modal/Statistics.vue | 49 ++++++++++++++++++-----------
 2 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/src/components/Modal/Modal.vue b/src/components/Modal/Modal.vue
index fe4ea10b..3746859c 100644
--- a/src/components/Modal/Modal.vue
+++ b/src/components/Modal/Modal.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import {Close} from "@icon-park/vue-next"
 import {onMounted} from "vue";
+import Tooltip from "@/components/Tooltip.vue";
 
 interface IProps {
   modelValue: boolean,
@@ -37,10 +38,12 @@ onMounted(() => {
       <div class="modal-root" v-if="props.modelValue">
         <div class="modal-mask" @click="close"></div>
         <div class="modal">
-          <Close @click="close"
-                 class="close"
-                 theme="outline" size="20" fill="#929596"
-                 :strokeWidth="2"/>
+          <Tooltip title="关闭">
+            <Close @click="close"
+                   class="close"
+                   theme="outline" size="20" fill="#929596"
+                   :strokeWidth="2"/>
+          </Tooltip>
           <div class="modal-header" v-if="props.title">
             <div class="title">{{ props.title }}</div>
             <div class="sub-title" v-if="props.subTitle">{{ props.subTitle }}</div>
diff --git a/src/components/Modal/Statistics.vue b/src/components/Modal/Statistics.vue
index 79a02b78..ecb43175 100644
--- a/src/components/Modal/Statistics.vue
+++ b/src/components/Modal/Statistics.vue
@@ -6,6 +6,7 @@ import Ring from "@/components/Ring.vue";
 import Tooltip from "@/components/Tooltip.vue";
 import Fireworks from "@/components/Fireworks.vue";
 import BaseButton from "@/components/BaseButton.vue";
+import {DictType} from "@/types.js";
 
 const store = useBaseStore()
 
@@ -19,19 +20,28 @@ function repeat() {
   store.currentDict.wordIndex = 0
   store.currentWrongDict.wordList = []
   store.statModalIsOpen = false
+  store.lastStatistics.correctNumber = -1
+  store.lastStatistics.correctRate = -1
 }
 
 function next() {
   store.currentDict.chapterIndex++
   repeat()
 }
+
+function repeatWrong() {
+  store.lastDictType = store.currentDictType
+  store.currentDictType = DictType.currentWrongDict
+  store.currentWrongDict.chapterList = [store.currentWrongDict.wordList]
+  store.statModalIsOpen = false
+}
 </script>
 
 <template>
   <Modal v-model="store.statModalIsOpen" @close="next">
     <div class="statistics">
       <header>
-        <div class="title">新概念英语-2 第3章</div>
+        <div class="title">{{ store.currentDict.name }} 第{{ store.currentDict.chapterIndex + 1 }}章</div>
       </header>
       <div class="content">
         <div class="rings">
@@ -54,10 +64,11 @@ function next() {
           <div class="wrong-words-wrapper">
             <div class="wrong-words">
               <div class="word" v-for="i in store.currentWrongDict.wordList">{{ i.name }}</div>
+              <!--                          <div class="word" v-for="i in 100">{{ i }}</div>-->
             </div>
           </div>
-
-          <div class="notice">
+          <div class="notice" v-if="!store.currentWrongDict.wordList.length">
+            <!--          <div class="notice">-->
             <like theme="filled" size="20" fill="#ffffff" :strokeWidth="2"/>
             表现不错，全对了！
           </div>
@@ -76,13 +87,16 @@ function next() {
       </div>
       <div class="footer">
         <BaseButton keyboard="Ctrl + Enter" @click="write">
-          默写本章节
+          默写本章
         </BaseButton>
-        <BaseButton keyboard="Enter" @click="repeat">
-          重复本章节
+        <BaseButton keyboard="Alt + Enter" @click="repeat">
+          重复本章
+        </BaseButton>
+        <BaseButton keyboard="Enter" @click="repeatWrong">
+          重复错词
         </BaseButton>
         <BaseButton keyboard="Tab" @click="next">
-          下一章节
+          下一章
         </BaseButton>
       </div>
     </div>
@@ -93,7 +107,7 @@ function next() {
 @import "@/assets/css/style";
 
 .statistics {
-  width: 50vw;
+  width: 800rem;
   padding: $space;
   background: $dark-second-bg;
   border-radius: $card-radius;
@@ -116,23 +130,23 @@ function next() {
     margin-bottom: 15rem;
 
     .result {
-      flex: 1;
       box-sizing: border-box;
       overflow: hidden;
+      height: 310rem;
+      display: flex;
+      flex-direction: column;
+      border-radius: $card-radius;
+      background: $item-hover;
+      flex: 1;
 
       .wrong-words-wrapper {
-        border-radius: $card-radius $card-radius 0 0;
-        background: $item-hover;
-        padding-top: $space;
-
+        flex: 1;
+        overflow: auto;
+        padding: $space;
       }
 
       .wrong-words {
-        padding: $space;
-        padding-top: 0;
-        height: 30vh;
         box-sizing: border-box;
-        overflow: auto;
         display: flex;
         margin-right: 5rem;
         flex-wrap: wrap;
@@ -148,7 +162,6 @@ function next() {
       }
 
       .notice {
-        border-radius: 0 0 $card-radius $card-radius;
         background: $main;
         height: 40rem;
         display: flex;