From 30ccb6edd59199b9038a196861d51517eb09782b Mon Sep 17 00:00:00 2001
From: zhl <zhl010101@gmail.com>
Date: Thu, 22 Apr 2021 20:52:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A2=98=E7=9B=AE=E7=9A=84?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/question.ts            |  48 ++++++++++++
 src/api/questionPre.ts         |  44 -----------
 src/api/types.d.ts             |  27 -------
 src/router/modules/question.ts |   2 +-
 src/views/question/editor.vue  | 112 ++++++++++++++-------------
 src/views/question/list.vue    | 137 ++++++++++++++++++++++++++-------
 6 files changed, 216 insertions(+), 154 deletions(-)
 create mode 100644 src/api/question.ts
 delete mode 100644 src/api/questionPre.ts

diff --git a/src/api/question.ts b/src/api/question.ts
new file mode 100644
index 0000000..2b43408
--- /dev/null
+++ b/src/api/question.ts
@@ -0,0 +1,48 @@
+import request from '@/utils/request'
+
+export interface IQuestionData {
+  _id?: string,
+  question: string,
+  a1: string,
+  a2?: string,
+  a3?: string,
+  a4?: string,
+  group?: string,
+  tag?: string,
+  quality: number
+}
+
+
+export const defaultQuestionData: IQuestionData = {
+  quality: 3,
+  a1: '', question: ''
+
+}
+
+export const getQuestions = (params: any) =>
+  request({
+    url: '/puzzles',
+    method: 'post',
+    params
+  })
+
+export const getQuestion = (id: string, params: any) =>
+  request({
+    url: `/puzzle/${id}`,
+    method: 'get',
+    params
+  })
+
+
+export const saveQuestion = (data: any) =>
+  request({
+    url: `/puzzle/save`,
+    method: 'post',
+    data
+  })
+
+export const deleteQuestion = (id: string) =>
+  request({
+    url: `/puzzle/${id}/delete`,
+    method: 'post'
+  })
diff --git a/src/api/questionPre.ts b/src/api/questionPre.ts
deleted file mode 100644
index 59f3d17..0000000
--- a/src/api/questionPre.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import axios from 'axios'
-import {IQuestionData } from '@/api/types'
-export const defaultQuestionData: IQuestionData = {
-  option: [],
-  answer: '', attachment: '', parts: [], stars: 0, status: 0, type: 0,
-  id: '',
-  title: '',
-  tags: []
-}
-/**
- * 随机获取一个未处理的题目
- * @return {Promise<void>}
- */
-export async function randomOne() {
-  let url = ''
-  return axios.get(url, {})
-    .then(res => {
-      return res.data
-    })
-}
-
-/**
- * 更新一条记录
- * @param data
- * @return {Promise<void>}
- */
-export async function updateOne(data: any) {
-  let url = ''
-  return axios.post(url, data)
-    .then(res => {
-      return res.data
-    })
-}
-
-/**
- * 获取一个相关的列表
- */
-export async function queryList(str: string) {
-  let url = ''
-  return axios.post(url, {key: str})
-    .then(res => {
-      return res.data
-    })
-}
diff --git a/src/api/types.d.ts b/src/api/types.d.ts
index d8f6f29..34c3097 100644
--- a/src/api/types.d.ts
+++ b/src/api/types.d.ts
@@ -14,33 +14,6 @@ export interface IArticleData {
   attachments: []
 }
 
-export interface IQuestionData {
-  id: string,
-  title: string,
-  /**
-   * 自动拆分的分词
-   */
-  parts?: string[],
-  tags: string[],
-  answer: string,
-  /**
-   * 混淆的答案
-   */
-  option: string[],
-  /**
-   * 题目类型
-   * 0: 文字题
-   * 1: 图文
-   */
-  type: number,
-  attachment?: string,
-  /**
-   * 评分
-   */
-  stars: number,
-  status: number,
-}
-
 export interface IShopData {
   _id?: string,
   name: string,
diff --git a/src/router/modules/question.ts b/src/router/modules/question.ts
index 72584f7..604cfac 100644
--- a/src/router/modules/question.ts
+++ b/src/router/modules/question.ts
@@ -21,7 +21,7 @@ const questionRoutes: RouteConfig = {
       }
     },
     {
-      path: 'edit/:id(\\d+)',
+      path: 'edit/:id',
       component: () => import('@/views/question/editor.vue'),
       name: 'QuestionEditor',
       meta: {
diff --git a/src/views/question/editor.vue b/src/views/question/editor.vue
index d5b1b28..2e92deb 100644
--- a/src/views/question/editor.vue
+++ b/src/views/question/editor.vue
@@ -8,23 +8,20 @@
     >
       <sticky
           :z-index="10"
-          :class-name="'sub-navbar '+postForm.status"
+          class-name="sub-navbar"
       >
+        <el-button @click="onCancel">
+          取消
+        </el-button>
         <el-button
             v-loading="loading"
             style="margin-left: 10px;"
             type="success"
             @click="submitForm"
         >
-          Publish
-        </el-button>
-        <el-button
-            v-loading="loading"
-            type="warning"
-            @click="draftForm"
-        >
-          Draft
+          保存
         </el-button>
+
       </sticky>
 
       <div class="createPost-main-container">
@@ -35,7 +32,7 @@
                 prop="title"
             >
               <material-input
-                  v-model="postForm.title"
+                  v-model="postForm.question"
                   :maxlength="100"
                   name="name"
                   required
@@ -53,9 +50,10 @@
                 label="答案:"
             >
               <el-input
-                  v-model="postForm.answer"
+                  v-model="postForm.a1"
                   :rows="1"
                   placeholder="输入答案"
+                  required
               />
             </el-form-item>
           </el-col>
@@ -66,11 +64,11 @@
                 class="postInfo-container-item"
             >
               <el-rate
-                  v-model="postForm.stars"
-                  :max="5"
+                  v-model="postForm.quality"
+                  :max="3"
                   :colors="['#99A9BF', '#F7BA2A', '#ff5900']"
                   :low-threshold="1"
-                  :high-threshold="5"
+                  :high-threshold="3"
                   style="display:inline-block"
               />
             </el-form-item>
@@ -84,7 +82,7 @@
                 label="混淆答案1:"
             >
               <el-input
-                  v-model="postForm.answer"
+                  v-model="postForm.a2"
                   :rows="1"
                   placeholder="输入答案"
               />
@@ -97,7 +95,7 @@
                 label="混淆答案2:"
             >
               <el-input
-                  v-model="postForm.answer"
+                  v-model="postForm.a3"
                   :rows="1"
                   placeholder="输入答案"
               />
@@ -110,7 +108,7 @@
                 label="混淆答案3:"
             >
               <el-input
-                  v-model="postForm.answer"
+                  v-model="postForm.a4"
                   :rows="1"
                   placeholder="输入答案"
               />
@@ -124,7 +122,6 @@
 
 <script lang="ts">
 import { Component, Prop, Vue } from 'vue-property-decorator'
-import { getArticle } from '@/api/articles'
 import { AppModule } from '@/store/modules/app'
 import { TagsViewModule, ITagView } from '@/store/modules/tags-view'
 import MaterialInput from '@/components/MaterialInput/index.vue'
@@ -132,7 +129,13 @@ import Sticky from '@/components/Sticky/index.vue'
 import Tinymce from '@/components/Tinymce/index.vue'
 import UploadImage from '@/components/UploadImage/index.vue'
 import { Form } from 'element-ui'
-import { defaultQuestionData } from '@/api/questionPre'
+import {
+  defaultQuestionData,
+  getQuestion,
+  getQuestions,
+  saveQuestion
+} from '@/api/question'
+import { saveCoupon } from '@/api/coupon'
 
 @Component({
   name: 'QuestionPrepare',
@@ -144,7 +147,6 @@ import { defaultQuestionData } from '@/api/questionPre'
   }
 })
 export default class extends Vue {
-  @Prop({ default: false }) private isEdit!: boolean
 
   private validateRequire = (rule: any, value: string, callback: Function) => {
     if (value === '') {
@@ -181,9 +183,9 @@ export default class extends Vue {
 
 
   created() {
-    if (this.isEdit) {
-      const id = this.$route.params && this.$route.params.id
-      this.fetchData(parseInt(id))
+    const id = this.$route.params && this.$route.params.id
+    if (id) {
+      this.fetchData(id)
     }
     // Why need to make a copy of this.$route here?
     // Because if you enter this page and quickly switch tag, may be in the execution of this.setTagsViewTitle function, this.$route is no longer pointing to the current page
@@ -199,11 +201,11 @@ export default class extends Vue {
 
   private async fetchData(id: number) {
     try {
-      const { data } = await getArticle(id, { /* Your params here */ })
-      this.postForm = data.article
+      const { data } = await getQuestion(id, { /* Your params here */ })
+      this.postForm = data
       // Just for test
-      this.postForm.title += `   Article Id:${this.postForm.id}`
-      const title = this.lang === 'zh' ? '编辑文章' : 'Edit Article'
+      this.postForm.title += `   Question Id:${this.postForm.id}`
+      const title = this.lang === 'zh' ? '编辑题目' : 'Edit Question'
       // Set tagsview title
       this.setTagsViewTitle(title)
       // Set page title
@@ -225,34 +227,38 @@ export default class extends Vue {
     document.title = `${title} - ${this.postForm.id}`
   }
 
-  private submitForm() {
-    (this.$refs.postForm as Form).validate(valid => {
-      if (valid) {
-        this.loading = true
-        this.$notify({
-          title: 'Success',
-          message: 'The post published successfully',
-          type: 'success',
-          duration: 2000
-        })
-        // Just to simulate the time of the request
-        setTimeout(() => {
-          this.loading = false
-        }, 0.5 * 1000)
-      } else {
-        console.error('Submit Error!')
-        return false
-      }
-    })
+  private async submitForm() {
+    const form = <Form>this.$refs.postForm
+    try {
+      await form.validate()
+      this.loading = true
+      const {data} = await saveQuestion(this.postForm)
+      this.postForm = data
+      this.loading = false
+      this.$notify({
+        title: 'Success',
+        message: '题目保存成功',
+        type: 'success',
+        duration: 2000
+      })
+    } catch (err) {
+      console.error('Submit Error!')
+      return false
+    }
   }
+  private async onCancel() {
+    try {
+      await this.$confirm('确认不保存当前记录?', 'Warning', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+      this.$store.dispatch("delView", this.$route)
+      this.$router.go(-1)
+    } catch(e) {
+
+    }
 
-  private draftForm() {
-    this.$message({
-      message: 'The draft saved successfully',
-      type: 'success',
-      showClose: true,
-      duration: 1000
-    })
   }
 
 }
diff --git a/src/views/question/list.vue b/src/views/question/list.vue
index fad9776..6251783 100644
--- a/src/views/question/list.vue
+++ b/src/views/question/list.vue
@@ -1,5 +1,16 @@
 <template>
   <div class="app-container">
+    <!-- filter -->
+    <el-form ref="filterForm" :inline="true" :model="filterForm" class="filter">
+      <el-form-item label="关键字" prop="key">
+        <el-input v-model="filterForm.key" placeholder="关键字"/>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button type="primary" @click="search">查询</el-button>
+        <el-button @click="resetFilterForm">重置</el-button>
+      </el-form-item>
+    </el-form>
     <router-link to="/question/create">
       <el-button
           type="primary"
@@ -16,53 +27,67 @@
         highlight-current-row
         style="width: 100%;margin-top:30px;"
     >
-
       <el-table-column
           width="180px"
           align="center"
-          label="时间"
+          label="添加时间"
       >
         <template slot-scope="{row}">
-          <span>{{ row.displayTime | parseTime }}</span>
+          <span>{{ row.createtime | parseTime }}</span>
         </template>
       </el-table-column>
       <el-table-column
-          width="180px"
-          label="类型"
-      >
-        <template slot-scope="{row}">
-          <span>{{ row.type }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-          min-width="300px"
-          label="标题"
+          min-width="200px"
+          label="名称"
       >
         <template slot-scope="{row}">
           <router-link
               :to="'/question/edit/'+row._id"
               class="link-type"
           >
-            <span>{{ row.title }}</span>
+            <span>{{ row.question }}</span>
           </router-link>
         </template>
       </el-table-column>
 
+      <el-table-column
+          label="答案"
+      >
+        <template slot-scope="{row}">
+            <span>{{ row.a1 }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column
+          label="混淆答案"
+      >
+        <template slot-scope="{row}">
+          <span>{{ row.a2 || '' }} {{ row.a3 || '' }} {{ row.a4 || '' }}</span>
+        </template>
+      </el-table-column>
+
       <el-table-column
           align="center"
           label="操作"
-          width="120"
       >
-        <template slot-scope="{row}">
-          <router-link :to="'/question/edit/'+row.id">
+        <template slot-scope="scope">
+          <router-link :to="'/question/edit/'+scope.row._id">
             <el-button
                 type="primary"
                 size="small"
                 icon="el-icon-edit"
             >
-             编辑
+              编辑
             </el-button>
           </router-link>
+          <el-button
+              type="danger"
+              size="small"
+              style="margin-left: 10px"
+              @click="handleDelete(scope)"
+          >
+            {{ $t('permission.delete') }}
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -79,9 +104,12 @@
 
 <script lang="ts">
 import { Component, Vue } from 'vue-property-decorator'
-import { getArticles } from '@/api/articles'
-import { IArticleData } from '@/api/types'
+import { IShopData } from '@/api/types'
 import Pagination from '@/components/Pagination/index.vue'
+import { deleteShop, getShops } from '@/api/shop'
+import { parseTime } from '@/utils'
+import { Form } from 'element-ui'
+import { deleteQuestion, getQuestions, IQuestionData } from '@/api/question'
 
 @Component({
   name: 'QuestionList',
@@ -90,34 +118,85 @@ import Pagination from '@/components/Pagination/index.vue'
   },
   filters: {
     parseTime: (timestamp: string) => {
-      return new Date(timestamp).toISOString()
+      return parseTime(timestamp)
+    },
+    parseDate: (timestamp: string) => {
+      if (!timestamp) {
+        return '-'
+      }
+      return parseTime(timestamp, '{y}-{m}-{d}')
+    },
+    formatCount: (count: string) => {
+      if (!count) {
+        return 0
+      }
+      return count
     }
   }
 })
 
 export default class extends Vue {
   private total = 0
-  private list: IArticleData[] = []
+  private list: IQuestionData[] = []
   private listLoading = true
+  private allDepts = []
   private listQuery = {
     page: 1,
-    limit: 20
+    limit: 20,
+    key: ''
+  }
+  private filterForm = {
+    key: ''
   }
 
   created() {
     this.getList()
   }
 
+
   private async getList() {
     this.listLoading = true
-    const { data } = await getArticles(this.listQuery)
-    this.list = data.items
+    const { data } = await getQuestions(this.listQuery)
+    this.listLoading = false
+    this.list = data.records
     this.total = data.total
-    // Just to simulate the time of the request
-    setTimeout(() => {
-      this.listLoading = false
-    }, 0.5 * 1000)
   }
+
+  private async handleDelete(scope: any) {
+    const { $index, row } = scope
+    await this.$confirm('确认删除该记录?', 'Warning', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    })
+    await deleteQuestion(row._id)
+    this.list.splice($index, 1)
+    this.$message({
+      type: 'success',
+      message: '删除成功!'
+    })
+  }
+
+  private search() {
+    this.filterData()
+  }
+
+  private filterData() {
+    this.listQuery.key = this.filterForm.key
+    this.listQuery.page = 1
+    this.getList()
+  }
+
+  private resetFilterForm() {
+    const ref = <Form>this.$refs.filterForm
+    ref.resetFields()
+  }
+  private async getRemoteDeptList(name: string) {
+    const { data } = await getShops({ key: name })
+    if (!data.records) return
+    this.allDepts = data.records
+  }
+
 }
 </script>