natasha 2 years ago
parent
commit
25a49edca0
4 changed files with 190 additions and 49 deletions
  1. 4 3
      src/components/Header.vue
  2. 171 38
      src/views/corpus/Result.vue
  3. 1 1
      src/views/corpus/seekPage.vue
  4. 14 7
      src/views/wordcard/cread.vue

+ 4 - 3
src/components/Header.vue

@@ -31,6 +31,7 @@
           width="335"
           trigger="click"
           v-model="visibleOption"
+          v-if="seekOptions"
         >
           <div class="set_corpus_dv">
             <span>选择难度</span>
@@ -76,7 +77,7 @@
         </el-popover>
     </div>
     <div class="userName">
-      <template v-if="projectShow">
+      <template v-if="seekOption">
         <el-popover
           placement="bottom"
           width="335"
@@ -123,7 +124,7 @@
             <div @click="visible = false">取消</div>
             <div @click="visible = false">确认</div>
           </div>
-          <div slot="reference" class="set_corpus" v-if="!seekOption">设置</div>
+          <div slot="reference" class="set_corpus">设置</div>
         </el-popover>
       </template>
       <template>
@@ -205,7 +206,7 @@ import { updateWordPack } from "@/utils/i18n";
 
 export default {
   name: "LayoutHeader",
-  props: ["projectShow", "seekShow", "seekOption"],
+  props: ["projectShow", "seekShow", "seekOption","seekOptions"],
   data() {
     return {
       keyword: this.$route.query.keyword?this.$route.query.keyword:'',

+ 171 - 38
src/views/corpus/Result.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="result" v-loading="loading">
-    <Header :projectShow="true" :seekShow="true" :seekOption="true" @changehzdata="changehzdata" />
+    <Header :projectShow="true" :seekShow="true" :seekOption="false" :seekOptions="true" @changehzdata="changehzdata" />
     <div class="main">
       <div
         class="hanzi_list"
@@ -208,15 +208,15 @@
                           }"
                           v-html="items.con"
                         ></div>
-                      </div>
-                    </div>
-                    <div
-                      class="shiyi"
-                      :style="{
-                        marginBottom: sizeIndex == 2 ? '0' : '5px',
-                      }"
-                    >
-                      ({{ item.shiyi }})
+                        </div>
+                            <div
+                            class="shiyi"
+                            :style="{
+                                marginBottom: sizeIndex == 2 ? '0' : '5px',
+                            }"
+                            >
+                        ({{ item.shiyi }})
+                        </div>
                     </div>
                   </div>
                   <div class="bottom">{{ item.laiyuan }}</div>
@@ -447,35 +447,35 @@ export default {
               con: "天",
             },
             {
-              pinyin: "hǎo",
+              pinyin: "",
               con: "一",
             },
             {
-              pinyin: "ma",
+              pinyin: "",
               con: "起",
             },
             {
-              pinyin: "",
+              pinyin: "",
               con: "去",
             },
             {
-              pinyin: "",
+              pinyin: "kàn",
               con: "看",
             },
             {
-              pinyin: "wéi",
+              pinyin: "diàn",
               con: "电",
             },
             {
-              pinyin: "hǎo",
+              pinyin: "yǐng",
               con: "影",
             },
             {
-              pinyin: "ma",
+              pinyin: "hǎo",
               con: "好",
             },
             {
-              pinyin: "",
+              pinyin: "ma",
               con: "吗",
             },
             {
@@ -491,83 +491,83 @@ export default {
           mp3: "",
           wordsList: [
             {
-              pinyin: "",
+              pinyin: "zhè",
               con: "这",
             },
             {
-              pinyin: "wéi",
+              pinyin: "",
               con: "里",
             },
             {
-              pinyin: "hǎo",
+              pinyin: "",
               con: "已",
             },
             {
-              pinyin: "ma",
+              pinyin: "jīng",
               con: "经",
             },
             {
-              pinyin: "",
+              pinyin: "hěn",
               con: "很",
             },
             {
-              pinyin: "",
+              pinyin: "jiǔ",
               con: "久",
             },
             {
-              pinyin: "wéi",
+              pinyin: "hěn",
               con: "很",
             },
             {
-              pinyin: "hǎo",
+              pinyin: "jiǔ",
               con: "久",
             },
             {
-              pinyin: "",
+              pinyin: "hěn",
               con: "很",
             },
             {
-              pinyin: "",
+              pinyin: "jiǔ",
               con: "久",
             },
             {
-              pinyin: "i",
+              pinyin: "i",
               con: "没",
             },
             {
-              pinyin: "hǎo",
+              pinyin: "yǒu",
               con: "有",
             },
             {
-              pinyin: "ma",
+              pinyin: "guò",
               con: "过",
             },
             {
-              pinyin: "",
+              pinyin: "zhè",
               con: "这",
             },
             {
-              pinyin: "",
+              pinyin: "me",
               con: "么",
             },
             {
-              pinyin: "wéi",
+              pinyin: "hǎo",
               con: "好",
             },
             {
-              pinyin: "hǎo",
+              pinyin: "de",
               con: "的",
             },
             {
-              pinyin: "ma",
+              pinyin: "tiān",
               con: "天",
             },
             {
-              pinyin: "",
+              pinyin: "",
               con: "气",
             },
             {
-              pinyin: "ma",
+              pinyin: "le",
               con: "了",
             },
             {
@@ -578,6 +578,138 @@ export default {
           shiyi: "good, ok",
           laiyuan: "《轻松学中文1》  Unit 1  课文一  P16",
         },
+        {
+          number: 5,
+          mp3: "",
+          wordsList: [
+            {
+              pinyin: "jīn",
+              con: "今",
+            },
+            {
+              pinyin: "tiān",
+              con: "天",
+            },
+            {
+              pinyin: "yī",
+              con: "一",
+            },
+            {
+              pinyin: "qǐ",
+              con: "起",
+            },
+            {
+              pinyin: "qù",
+              con: "去",
+            },
+            {
+              pinyin: "kàn",
+              con: "看",
+            },
+            {
+              pinyin: "diàn",
+              con: "电",
+            },
+            {
+              pinyin: "yǐng",
+              con: "影",
+            },
+            {
+              pinyin: "hǎo",
+              con: "好",
+            },
+            {
+              pinyin: "ma",
+              con: "吗",
+            },
+            {
+              pinyin: "jīn",
+              con: "今",
+            },
+            {
+              pinyin: "tiān",
+              con: "天",
+            },
+            {
+              pinyin: "yī",
+              con: "一",
+            },
+            {
+              pinyin: "qǐ",
+              con: "起",
+            },
+            {
+              pinyin: "qù",
+              con: "去",
+            },
+            {
+              pinyin: "kàn",
+              con: "看",
+            },
+            {
+              pinyin: "diàn",
+              con: "电",
+            },
+            {
+              pinyin: "yǐng",
+              con: "影",
+            },
+            {
+              pinyin: "hǎo",
+              con: "好",
+            },
+            {
+              pinyin: "ma",
+              con: "吗",
+            },
+            {
+              pinyin: "jīn",
+              con: "今",
+            },
+            {
+              pinyin: "tiān",
+              con: "天",
+            },
+            {
+              pinyin: "yī",
+              con: "一",
+            },
+            {
+              pinyin: "qǐ",
+              con: "起",
+            },
+            {
+              pinyin: "qù",
+              con: "去",
+            },
+            {
+              pinyin: "kàn",
+              con: "看",
+            },
+            {
+              pinyin: "diàn",
+              con: "电",
+            },
+            {
+              pinyin: "yǐng",
+              con: "影",
+            },
+            {
+              pinyin: "hǎo",
+              con: "好",
+            },
+            {
+              pinyin: "ma",
+              con: "吗",
+            },
+            {
+              pinyin: "",
+              con: "?",
+            },
+          ],
+          shiyi: "good, ok",
+          laiyuan: "《轻松学中文1》  Unit 1  课文一  P16",
+        },
       ],
       KWICData: [
         {
@@ -1073,6 +1205,7 @@ export default {
             .top {
               display: flex;
               align-items: flex-end;
+              flex-flow: wrap;
               .number {
                 width: 22px;
                 font-weight: 400;

+ 1 - 1
src/views/corpus/seekPage.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="corpus_seekpage">
-    <Header :projectShow="true" />
+    <Header :projectShow="true" :seekOptions="false" :seekOption="true" />
     <div class="title">
       <p>语料库词典</p>
       <p>Corpus Dictionary</p>

+ 14 - 7
src/views/wordcard/cread.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="cread" v-loading="loading">
-    <Header />
+    <Header :projectShow="true" />
     <div class="main" v-if="!isPreview">
       <div class="from">
         <div class="type">
@@ -81,6 +81,7 @@
                   style="width: 60px; text-align: center"
                   v-model="from.writeBoxNumber"
                   type="number"
+                  class="numbre-input"
                 ></el-input>
                 <span style="margin-left: 8px">{{
                   typeIndex == 0 ? "行" : "句"
@@ -92,6 +93,7 @@
                   style="width: 60px; text-align: center"
                   v-model="from.miaoRedBoxNumber"
                   type="number"
+                  class="numbre-input"
                 ></el-input>
                 <span style="margin-left: 8px">{{
                   typeIndex == 0 ? "格" : "句"
@@ -103,6 +105,7 @@
                   style="width: 60px; text-align: center"
                   v-model="from.lastNullrow"
                   type="number"
+                  class="numbre-input"
                 ></el-input>
                 <span style="margin-left: 8px">行</span>
               </div>
@@ -193,7 +196,7 @@
       <el-input placeholder="请输入" v-model="saveName"> </el-input>
       <span slot="footer" class="dialog-footer">
         <el-button @click="handleClose">取 消</el-button>
-        <el-button type="primary" @click="">确 定</el-button>
+        <el-button type="primary" @click="handleClose">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -239,6 +242,7 @@ export default {
       previewIndex: 0,
       htmlTitle: "1",
       saveShow: false,
+      writetableShow: true,
     };
   },
   //计算属性 类似于data概念
@@ -877,7 +881,7 @@ export default {
     left: 0;
     top: 64px;
     width: 100%;
-    height: 100%;
+    min-height: 100%;
     background: #f2f2f2;
     > img {
       width: 40px;
@@ -888,8 +892,8 @@ export default {
       right: 31px;
     }
     .preview_main {
-      padding-top: 100px;
-      width: 667px;
+      padding: 24px 0;
+      width: 740px;
       margin: 0 auto;
       display: flex;
       align-items: center;
@@ -974,8 +978,11 @@ export default {
     .el-switch__label.is-active {
       color: #000000;
     }
-    .el-input__inner {
-      text-align: right;
+    .numbre-input{
+        .el-input__inner {
+            padding: 0;
+            text-align: center;
+        }
     }
   }
 }