From a0e7bdd8b9819099901e34bcc2dae0d61562a865 Mon Sep 17 00:00:00 2001
From: pan <1029559041@qq.com>
Date: Mon, 27 Jul 2020 23:06:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E6=96=87=E6=A1=A3-=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=9B=B4=E6=96=B0=20=E7=AC=94=E8=AE=B0?=
 =?UTF-8?q?=E5=88=97=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nuxt.config.js           |  6 ++++++
 pages/index/document.vue | 18 ++++++-----------
 pages/index/note.vue     | 43 +++++++++++++++++++++++++++++++++++-----
 3 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/nuxt.config.js b/nuxt.config.js
index 540f947..f49b0b0 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -105,6 +105,7 @@ export default {
             "del": "删除",
             "edit": "编辑",
             "ok": "确定",
+            "query": "查询",
             "rating": "提交评分",
             "submit": "提交"
           },
@@ -143,6 +144,7 @@ export default {
             },
             "form": {
               "author": "作者",
+              "content": "正文内容",
               "end_year": "结束年份",
               "keyword": "关键词",
               "school": "学校",
@@ -169,6 +171,7 @@ export default {
           "more_query": "更多查询",
           "note": {
             "table": {
+              "note_content": "笔记内容",
               "note_name": "笔记名称",
               "paper_name": "论文标题"
             },
@@ -240,6 +243,7 @@ export default {
             "del": "",
             "edit": "",
             "ok": "",
+            "query": "",
             "rating": "",
             "submit": ""
           },
@@ -278,6 +282,7 @@ export default {
             },
             "form": {
               "author": "",
+              "content": "",
               "end_year": "",
               "keyword": "",
               "school": "",
@@ -304,6 +309,7 @@ export default {
           "more_query": "",
           "note": {
             "table": {
+              "note_content": "",
               "note_name": "",
               "paper_name": ""
             },
diff --git a/pages/index/document.vue b/pages/index/document.vue
index 637b225..399f305 100644
--- a/pages/index/document.vue
+++ b/pages/index/document.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
       <el-form-item :label="$t('document.form.title')" prop="title">
         <el-col :span="4">
           <el-input v-model="form.title" :placeholder="$t('input_please',{keyword:$t('document.form.title')})"/>
@@ -23,16 +23,6 @@
       </el-form-item>
       <el-collapse v-model="activeNames">
         <el-collapse-item :title="activeNames[0]==='1'?$t('hide_more_query'):$t('more_query')" name="1">
-          <el-form-item :label="$t('document.form.school')" prop="school">
-            <el-col :span="4">
-              <el-input v-model="form.school" :placeholder="$t('input_please',{keyword:$t('document.form.school')})"/>
-            </el-col>
-          </el-form-item>
-          <el-form-item :label="$t('document.form.tutor')" prop="tutor">
-            <el-col :span="4">
-              <el-input v-model="form.tutor" :placeholder="$t('input_please',{keyword:$t('document.form.tutor')})"/>
-            </el-col>
-          </el-form-item>
           <el-form-item :label="$t('document.form.start_year')" prop="start_year">
             <el-col :span="4">
               <el-input v-model="form.start_year"
@@ -46,6 +36,9 @@
             </el-col>
           </el-form-item>
         </el-collapse-item>
+        <el-form-item class="mt1">
+          <el-button>{{$t('button.query')}}</el-button>
+        </el-form-item>
       </el-collapse>
     </el-form>
     <el-row class="mt3">
@@ -112,7 +105,8 @@
           school: '',
           tutor: '',
           start_year: '',
-          end_year: ''
+          end_year: '',
+          content:'',
         },
         rules: {},
         activeNames: [],
diff --git a/pages/index/note.vue b/pages/index/note.vue
index b48895f..fba9049 100644
--- a/pages/index/note.vue
+++ b/pages/index/note.vue
@@ -1,10 +1,26 @@
 <template>
-  <el-col :span="10">
+  <div>
+    <el-row type="flex" justify="center">
+      <el-col :span="5">
+         <el-form ref="form" :model="form"  label-width="80px">
+           <el-form-item :label="$t('read.tip.form.note_title')" prop="note_title">
+             <el-input v-model="form.note_title" :placeholder="$t('input_please', { keyword: this.$t('read.tip.form.note_title') })"></el-input>
+           </el-form-item>
+           <el-form-item :label="$t('read.tip.form.note_content')" prop="note_content">
+             <el-input type="textarea" v-model="form.note_content" :placeholder="$t('input_please', { keyword: this.$t('read.tip.form.note_content') })"></el-input>
+           </el-form-item>
+           <el-form-item class="center">
+             <el-button>{{$t('button.query')}}</el-button>
+           </el-form-item>
+         </el-form>
+      </el-col>
+    </el-row>
      <el-table :data="tableData" border>
        <el-table-column align="center" prop="note_name" :label="$t('note.table.note_name')" />
+       <el-table-column align="center" prop="note_content" :label="$t('note.table.note_content')" />
        <el-table-column align="center" prop="paper_name" :label="$t('note.table.paper_name')" />
-       <el-table-column align="center" :label="$t('action')">
-         <template slot-scope="scope">
+       <el-table-column align="center" :label="$t('action')" >
+         <template slot-scope="scope" >
            <el-button>{{$t('button.edit')}}</el-button>
            <el-button type="danger" @click="del">{{$t('button.del')}}</el-button>
          </template>
@@ -17,7 +33,7 @@
         :total="1000">
       </el-pagination>
     </div>
-  </el-col>
+  </div>
 </template>
 
 <script lang="ts">
@@ -29,8 +45,25 @@
       return {
         tableData:[{
             note_name:'笔记',
+            note_content:'笔记内容',
             paper_name: '《论文》'
-        }]
+        }],
+        form:{
+          note_name:'',
+          note_content:''
+        },
+        rules:{
+          note_title:[{
+            required: true,
+            message: this.$t('input_please', { keyword: this.$t('read.tip.form.note_title') }),
+            trigger: 'blur'
+          }],
+          note_content:[{
+            required: true,
+            message: this.$t('input_please', { keyword: this.$t('read.tip.form.note_content') }),
+            trigger: 'blur'
+          }]
+        }
       }
     },
     methods:{