From 6135e5ac526ff016dbd4e0120763f9521e96ce30 Mon Sep 17 00:00:00 2001
From: cgd_mac <349008059@qq.com>
Date: Fri, 25 Feb 2022 18:20:53 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Charts/ChartCard.vue              | 4 +---
 src/views/mycollection/index.vue                 | 4 ++--
 src/views/mycourse/mycourseList/MyCourseList.vue | 7 ++++---
 src/views/myexam/index.vue                       | 6 +++---
 src/views/myexamCount/index.vue                  | 2 +-
 src/views/myexamDetail/index.vue                 | 4 ++--
 6 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/components/Charts/ChartCard.vue b/src/components/Charts/ChartCard.vue
index fc1f425..b72d378 100644
--- a/src/components/Charts/ChartCard.vue
+++ b/src/components/Charts/ChartCard.vue
@@ -12,9 +12,7 @@
         </span>
       </div>
       <div class="total">
-        <slot name="total">
-          <span>{{ typeof total === 'function' && total() || total }}</span>
-        </slot>
+        <span>{{ typeof total === 'function' && total() || total }}</span>
       </div>
     </div>
     <div class="chart-card-content">
diff --git a/src/views/mycollection/index.vue b/src/views/mycollection/index.vue
index d58b10e..d0db6f2 100644
--- a/src/views/mycollection/index.vue
+++ b/src/views/mycollection/index.vue
@@ -1,6 +1,6 @@
 <template>
   <a-card :bordered="false">
-    <a-tabs v-if="activeTab" v-model="activeTab">
+    <a-tabs v-model="activeTab">
       <a-tab-pane key="1" tab="我的收藏">
         <a-card
           :title="`我的收藏题目(共${collectionInfo.total}题)`"
@@ -139,7 +139,7 @@ export default {
     }
   },
   mounted () {
-    this.activeTab = this.$route.query.type || '1'
+    this.activeTab = String(this.$route.query.type) || '1'
     console.log('>>>>>>>>>.', this.activeTab)
     this.initData()
   },
diff --git a/src/views/mycourse/mycourseList/MyCourseList.vue b/src/views/mycourse/mycourseList/MyCourseList.vue
index b63fdd3..3dbd740 100644
--- a/src/views/mycourse/mycourseList/MyCourseList.vue
+++ b/src/views/mycourse/mycourseList/MyCourseList.vue
@@ -61,6 +61,7 @@
 <script>
 import moment from 'moment'
 import { reqMyCourseList } from '@/api/mycourse/index'
+import { dictGet } from '@/api/project/project'
 import { dictionaryDropDown } from '@/api/sys/dictionaryItem'
 import { dictToTree } from '@/utils/util'
 import { STable, SearchCom } from '@/components'
@@ -82,7 +83,7 @@ export default {
       },
       queryOptions: [
         { type: 'input', placeholder: '课程名称', key: 'name' },
-        { type: 'select-dic-tree', placeholder: '课程类别', key: 'trainWay', options: [] },
+        { type: 'select', placeholder: '课程类别', key: 'trainWay', options: [] },
         {
           type: 'select',
           placeholder: '课程状态',
@@ -167,8 +168,8 @@ export default {
     },
     // 获取数据词典
     dictionaryDropDown () {
-      dictionaryDropDown({ dictionaryCode: '0009' }).then(res => {
-        this.queryOptions[1].options = dictToTree(res.data, [], 0)
+      dictGet({ type: 1 }).then(res => {
+        this.queryOptions[1].options = res.data
         this.loading = false
       })
     },
diff --git a/src/views/myexam/index.vue b/src/views/myexam/index.vue
index e64276d..ba028b8 100644
--- a/src/views/myexam/index.vue
+++ b/src/views/myexam/index.vue
@@ -76,6 +76,7 @@ import { STable, SearchCom } from '@/components'
 import { reqExamList, reqExamAttendList, reqExamSubscribe } from '@/api/myexam/exam'
 import { dictionaryDropDown } from '@/api/sys/dictionaryItem'
 import { dictToTree } from '@/utils/util'
+import { dictGet } from '@/api/project/project'
 
 export default {
   components: { STable, SearchCom },
@@ -187,9 +188,8 @@ export default {
   },
   methods: {
     dictionaryDropDown () {
-      dictionaryDropDown({ dictionaryCode: '0009' }).then((res) => {
-        const result = dictToTree(res.data, [], 0)
-        this.queryOptions[0].options = result
+      dictGet({ type: 1 }).then((res) => {
+        this.queryOptions[0].options = res.data
 				this.loading = false
       })
     },
diff --git a/src/views/myexamCount/index.vue b/src/views/myexamCount/index.vue
index cd357a9..1b91a6f 100644
--- a/src/views/myexamCount/index.vue
+++ b/src/views/myexamCount/index.vue
@@ -198,7 +198,7 @@ export default {
       }
     },
     handlerDetail (row) {
-      this.$router.push({ path: '/mycourse/courseLearn', query: { courseId: row.courseId } })
+      this.$router.push({ path: '/mycourse/courseLearn', query: { courseId: row.id } })
     }
   }
 }
diff --git a/src/views/myexamDetail/index.vue b/src/views/myexamDetail/index.vue
index 0b5994c..0093a49 100644
--- a/src/views/myexamDetail/index.vue
+++ b/src/views/myexamDetail/index.vue
@@ -85,10 +85,10 @@ export default {
     // 提交
     handlerSubmit (result) {
       const { type } = this.query
-      if (type === 'practice') {
+      if (type === 'practice' || type === 'operation') {
         this.submitPractice(result)
       }
-      if (type === 'exam' || type === 'test' || type === 'operation') {
+      if (type === 'exam' || type === 'test') {
         this.submitExam(result)
       }
       // if (type === 'operation') {