Feat: bugfix & refactor

LanceZhu · Nov 24, 2019 · dc08dce · dc08dce
1 parent e375934
commit dc08dce
Show file tree

Hide file tree

Showing 11 changed files with 236 additions and 204 deletions.
diff --git a/.env.invention b/.env.invention
@@ -0,0 +1 @@
+VUE_APP_DOMAIN_NAME='invention'
diff --git a/config.js b/config.js
@@ -98,6 +98,14 @@ if (process.env.VUE_APP_DOMAIN_NAME === 'internet') {
       desc: '各个高校具有重大影响的事件'
     }
   ]
+} else if (process.env.VUE_APP_DOMAIN_NAME === 'invention') {
+  tags = [
+    {
+      value: 0,
+      label: '默认',
+      desc: '默认'
+    }
+  ]
 }
 
 const tags2tagTable = (tags, initialValue = 0) => {

diff --git a/package.json b/package.json
@@ -6,9 +6,11 @@
     "serve": "vue-cli-service serve --open",
     "serve:internet": "vue-cli-service serve --mode internet",
     "serve:education": "vue-cli-service serve --mode education",
+    "serve:invention": "vue-cli-service serve --mode invention",
     "build": "vue-cli-service build",
     "build:internet": "vue-cli-service build --mode internet",
     "build:education": "vue-cli-service build --mode education",
+    "build:invention": "vue-cli-service build --mode invention",
     "lint": "vue-cli-service lint"
   },
   "dependencies": {

diff --git a/src/components/FuzzyTimePicker.vue b/src/components/FuzzyTimePicker.vue
@@ -0,0 +1,58 @@
+<template>
+      <div class="date">
+      <div>时间格式选择</div>
+      <div class="date-format">
+        <el-cascader
+          v-model="dateValue"
+          :options="dateOptions"
+          @change="dateTypeChange"></el-cascader>
+        <div v-if="dateType === 100">
+          <el-date-picker
+            v-model="date_100"
+            format="yyyy/MM/dd"
+            value-format="yyyy/MM/dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </div>
+        <div v-if="dateType === 0">
+          <el-input v-model="date_0"></el-input>年
+        </div>
+        <div v-if="dateType === 1">
+          <el-input v-model="date_1[0]"></el-input>年
+          <el-input v-model="date_1[1]"></el-input>月
+        </div>
+        <div v-if="dateType === 10">
+          <el-input v-model="date_10[0]"></el-input>世纪
+          <el-input v-model="date_10[1]"></el-input>年代
+        </div>
+        <div v-if="dateType === 11">
+          <el-input v-model="date_11[0]"></el-input>世纪
+          <el-input v-model="date_11[1]"></el-input>年代初
+        </div>
+        <div v-if="dateType === 12">
+          <el-input v-model="date_12[0]"></el-input>世纪
+          <el-input v-model="date_12[1]"></el-input>年代中
+        </div>
+        <div v-if="dateType === 13">
+          <el-input v-model="date_13[0]"></el-input>世纪
+          <el-input v-model="date_13[1]"></el-input>年代末
+        </div>
+        <div v-if="dateType === 20">
+          <el-input v-model="date_20[0]"></el-input>年 - <el-input v-model="date_20[1]"></el-input>年
+        </div>
+        <div v-if="dateType === 30">
+          公元前<el-input v-model="date_30"></el-input>年
+        </div>
+      </div>
+    </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+
+    }
+  }
+}
+</script>
diff --git a/src/page/timeline/default.vue b/src/page/timeline/default.vue
@@ -15,7 +15,7 @@ export default {
 
 <style scoped>
 .container{
-  width: 80%;
+  width: 90%;
   margin: 0 auto;
   text-align: left;
 }

diff --git a/src/page/timeline/index.vue b/src/page/timeline/index.vue
@@ -1,26 +1,26 @@
 <template>
-    <div class="timeline">
-        <div class="sidebar">
-          <div class="title">
-             <el-tooltip content="添加时间点" popper-class="tooltip">
-                <i class="el-icon-document-add" @click="toAdd">
-                </i>
-            </el-tooltip>
-          </div>
-          <div class="scroll">
-            <div v-for="time in timeline" :key="time.id" class="time">
-                <router-link :to="'/timeline/'+time._id" tag="li">
-                  {{time.show}} {{time.title}}
-                </router-link>
-            </div>
-          </div>
+  <div class="container">
+      <div class="sidebar">
+        <div class="title">
+            <el-tooltip content="添加时间点" popper-class="tooltip">
+              <i class="el-icon-document-add" @click="toAdd">
+              </i>
+          </el-tooltip>
         </div>
-        <div class="content">
-          <transition>
-            <router-view></router-view>
-          </transition>
+        <div class="scroll">
+          <div v-for="time in timeline" :key="time.id" class="time">
+              <router-link :to="'/timeline/'+time._id" tag="li">
+                {{time.show}} {{time.title}}
+              </router-link>
+          </div>
         </div>
-    </div>
+      </div>
+      <div class="content">
+        <transition>
+          <router-view></router-view>
+        </transition>
+      </div>
+  </div>
 </template>
 
 <script>
@@ -58,7 +58,7 @@ export default {
 </script>
 
 <style scoped>
-.timeline{
+.container{
   height: 100%;
   position: relative;
   display: flex;
@@ -97,9 +97,6 @@ export default {
   -webkit-overflow-scrolling: touch;
   height: 100%;
 }
-.title-active{
-  color: black;
-}
 .router-link-active{
   color: rgb(160,192,227);
 }

diff --git a/src/page/timeline/view.vue b/src/page/timeline/view.vue
@@ -1,71 +1,61 @@
 <template>
-<div>
-  <div class="title">
-    {{title}}
-    <router-link :to="'/timepoint/edit/' + id" tag="li">
-      <el-tooltip content="编辑词条" popper-class="tooltip">
-        <i class="el-icon-edit"></i>
-      </el-tooltip>
-    </router-link>
-    <router-link :to="'/timepoint/history/' + id" tag="li">
-      <el-tooltip content="词条历史" popper-class="tooltip">
-        <i class="el-icon-time"></i>
-      </el-tooltip>
-    </router-link>
-    <!--
-    <router-link :to="'/timepoint/history/'+id" tag="li">
-      <i class="el-icon-warning"></i>
-    </router-link>
-    -->
-    <!--
-    <router-link>
-      <i class="el-icon-chat-line-round"></i>
-    </router-link>
-    -->
-  <el-divider></el-divider>
-  </div>
-  <div v-html="content" ref="content" class="content"></div>
-  <div v-if="hasTag" class="tags">
-    <el-tooltip effect="dark" :content="tag.desc">
-      <el-tag>{{ tag.label }}</el-tag>
-    </el-tooltip>
-  </div>
-  <div class="citation-added">
-  <div class="citation-list">
-    <div v-for="(citation, index) in citations" :key="index">
-      <div v-if="citation.type === 'internetResource'">
-        <div>网络资源</div>
-        <div>{{ `文章名：${citation.content.name} 网站名：${citation.content.websiteName} 发表日期：${citation.content.publishDate}`}}</div>
-      </div>
-      <div v-else-if="citation.type === 'bookResource'">
-        <div>著作资源</div>
-        <div>{{`作者：${citation.content.author} 著作名：${citation.content.paperName} 出版年${citation.content.publishYear}`}}</div>
-      </div>
-      <div v-else-if="citation.type === 'otherResource'">
-        <div>其他资源</div>
-        <div>{{`${citation.content.any}`}}</div>
-      </div>
+  <div>
+    <div class="title">
+      {{title}}
+      <router-link :to="'/timepoint/edit/' + id" tag="li">
+        <el-tooltip content="编辑词条" popper-class="tooltip">
+          <i class="el-icon-edit"></i>
+        </el-tooltip>
+      </router-link>
+      <router-link :to="'/timepoint/history/' + id" tag="li">
+        <el-tooltip content="词条历史" popper-class="tooltip">
+          <i class="el-icon-time"></i>
+        </el-tooltip>
+      </router-link>
+    <el-divider></el-divider>
     </div>
-  </div>
-</div>
-  <div v-if="lastEditedUser !== ''" class="last-edited-user">
-    编辑者：<span v-html=lastEditedUser></span>
-  </div>
-  <div class="footer">
+    <div class="content">
+      <div v-html="content" ref="content" class="article"></div>
+        <div v-if="hasTag" class="tags">
+          <el-tooltip :content="tag.desc" popper-class="tooltip">
+            <el-tag>{{ tag.label }}</el-tag>
+          </el-tooltip>
+        </div>
+        <div class="citation">
+          <div v-for="(citation, index) in citations" :key="index">
+            <div v-if="citation.type === 'internetResource'">
+              <div>网络资源</div>
+              <div>{{ `文章名：${citation.content.name} 网站名：${citation.content.websiteName} 发表日期：${citation.content.publishDate}`}}</div>
+            </div>
+            <div v-else-if="citation.type === 'bookResource'">
+              <div>著作资源</div>
+              <div>{{`作者：${citation.content.author} 著作名：${citation.content.paperName} 出版年${citation.content.publishYear}`}}</div>
+            </div>
+            <div v-else-if="citation.type === 'otherResource'">
+              <div>其他资源</div>
+              <div>{{`${citation.content.any}`}}</div>
+            </div>
+          </div>
+        </div>
+        <div class="last-edited-user">
+          编辑者：<span v-html=lastEditedUser></span>
+        </div>
+    </div>
+    <div class="footer">
       <div v-if="prev.show" class="prev">
         <router-link :to="prev.route" tag="li">
             <i class="el-icon-back"></i>
             {{prev.desc}}
         </router-link>
       </div>
-    <div v-if="next.show" class="next">
-      <router-link :to="next.route" tag="li">
-        {{next.desc}}
-        <i class="el-icon-right"></i>
-      </router-link>
+      <div v-if="next.show" class="next">
+        <router-link :to="next.route" tag="li">
+          {{next.desc}}
+          <i class="el-icon-right"></i>
+        </router-link>
+      </div>
     </div>
   </div>
-</div>
 </template>
 
 <script>
@@ -79,7 +69,7 @@ export default {
       id: '',
       tag: {}, // {label: '名称', desc: '描述'}
       hasTag: false,
-      tagTable: {}, // value -> tag
+      tagTable: config.tagTable, // value -> tag
       lastEditedUser: '', // 最后编辑用户
       prev: {
         desc: '前一页',
@@ -95,7 +85,6 @@ export default {
     }
   },
   created () {
-    this.tagTable = config.tagTable
     this.updateContent()
   },
   watch: {
@@ -149,35 +138,33 @@ export default {
 </script>
 
 <style scoped>
+li{
+  display: inline-block;
+  cursor: pointer;
+}
+.el-tooltip{
+  margin-left: 10px;
+}
 .title{
-  position: sticky;
-  top: 0;
   background-color: white;
   height: 48px;
   line-height: 48px;
 }
-.el-divider{
+.title .el-divider{
   margin: 0;
 }
 .content{
   width: 90%;
   margin: 0 auto;
   word-break: break-all;
   box-sizing: border-box;
-  padding: 15px 0;
   text-align: left;
+  padding: 15px;
 }
-.tags{
-  width: 90%;
-  float: left;
-  text-align: left
-}
-.last-edited-user{
-  width: 90%;
-  margin: 0 auto;
-  word-break: break-all;
-  box-sizing: border-box;
-  padding: 15px 0 40px 0;
+.content .article{}
+.content .tags{}
+.content .citation{}
+.content .last-edited-user{
   text-align: right;
   color: rgb(254,149,170);
 }
@@ -192,30 +179,4 @@ export default {
 .footer .next{
   float: right;
 }
-li{
-  display: inline-block;
-  cursor: pointer;
-}
-.el-tooltip{
-  margin-left: 10px;
-}
-.el-tooltip__popper[x-placement^=bottom] .popper__arrow::after {
-  border-bottom-color: rgb(160,192,227) !important;
-  opacity: 0.8;
-}
-.el-tooltip__popper[x-placement^=bottom] .popper__arrow{
-  border-bottom-color: rgb(160,192,227) !important;
-  opacity: 0.8;
-}
-.citation{
-  text-align: left;
-}
-.citation-added{
-  text-align: left;
-  width: 90%;
-  margin: 0 auto;
-}
-.citation-list{
-  text-align: left;
-}
 </style>