From 255e4d9433527b305d4031cc50128cab75d0d0b5 Mon Sep 17 00:00:00 2001
From: cgd_mac <349008059@qq.com>
Date: Wed, 23 Feb 2022 14:34:04 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DbLearnCount/CourseCatalogue.vue          | 153 ++++++++++++++++++
 src/components/DbLearnCount/index.vue         |   5 +
 src/views/mycourse/courseLearn/index.vue      |   2 +-
 src/views/mycourse/index.vue                  |  13 --
 .../mycourse/mycourseList/MyCourseList.vue    |   2 +-
 src/views/myexam/index.vue                    |  19 ++-
 src/views/mypractice/index.vue                |  48 +++---
 7 files changed, 201 insertions(+), 41 deletions(-)
 create mode 100644 src/components/DbLearnCount/CourseCatalogue.vue
 delete mode 100644 src/views/mycourse/index.vue

diff --git a/src/components/DbLearnCount/CourseCatalogue.vue b/src/components/DbLearnCount/CourseCatalogue.vue
new file mode 100644
index 0000000..a2b1918
--- /dev/null
+++ b/src/components/DbLearnCount/CourseCatalogue.vue
@@ -0,0 +1,153 @@
+<template>
+  <div class="CourseCatalogue-box">
+    <ul class="list-box">
+      <li class="list-item" v-for="(item, index) in catalogueList" :key="index">
+        <div class="list-item-title">
+          <span style="margin-right: 10px;">第{{ capitalizeNumber[index] }}章</span>
+          {{ item.name }}
+        </div>
+        <ul class="sub-list">
+          <li
+            @click="handlerItem(j, item)"
+            class="sub-list-item"
+            v-for="(j, k) in item.courseList"
+            :key="`${index}-${k}`"
+          >
+            <div
+              :class="[
+                'sub-item-info',
+                { 'sub-item-info-success': j.status === 1 }
+              ]"
+            >
+              <VideoOne
+                theme="filled"
+                :fill="j.status === 1 ? '#26bd71' : '#ccc'"
+                style="margin-right: 6px;"
+                size="1.2em"
+              ></VideoOne>
+              {{ index + 1 }}.{{ k + 1 }}
+              {{ j.name }}
+            </div>
+            <!--  0-未学 1-已学 -->
+            <div v-if="j.status === 1" class="sub-item-status">
+              <span style="color: #26bd71;">已学习</span>
+              <History
+                theme="filled"
+                tyle="margin-left: 10px;"
+                size="1.2em"
+                style="margin-left: 10px;"
+                fill="#26bd71"
+              ></History>
+            </div>
+            <!-- <div v-else class="sub-item-status">
+              <Round
+                theme="filled"
+                strokeWidth="6"
+                :fill="j.status === 1 ? '#26bd71' : '#666'"
+                style="margin-left: 10px;"
+              ></Round>
+            </div> -->
+          </li>
+        </ul>
+      </li>
+    </ul>
+  </div>
+</template>
+
+<script>
+import { VideoOne, Round, History } from '@icon-park/vue'
+export default {
+  components: { VideoOne, Round, History },
+  props: {
+    catalogueList: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data () {
+    return {
+      capitalizeNumber: ['一', '二', '三', '四', '五', '六', '七', '八', '九', '十', '十一'],
+      data: []
+    }
+  },
+  mounted () {},
+  methods: {
+    handlerItem (item, pItem) {
+      this.$emit('changeVideo', { item, pItem })
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.learn-detail {
+  display: flex;
+}
+
+.learn-detail-video {
+  flex: 1;
+}
+
+.learn-detail-list {
+  flex: 220px;
+}
+
+.list-box,
+.sub-list {
+  margin: 0;
+  padding: 0;
+}
+
+.list-item-title {
+  color: 16px;
+  font-weight: bold;
+  color: #333;
+  padding: 10px 0;
+}
+
+.sub-list-item {
+  color: #666;
+  padding-bottom: 10px;
+  &:hover {
+    color: #1890ff;
+  }
+}
+
+.sub-list {
+  padding-left: 20px;
+}
+
+.sub-list-item {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  cursor: pointer;
+  .sub-item-info {
+    flex: 1;
+    display: flex;
+    line-height: 2;
+  }
+
+  .sub-item-info-active {
+    color: #1890ff !important;
+  }
+
+  .sub-item-info-success {
+    color: #26bd71;
+  }
+
+  .sub-item-status {
+    flex: 0 0 200px;
+    font-size: 12px;
+    text-align: right;
+    color: #1890ff;
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+  }
+}
+
+.list-item {
+  width: 100%;
+}
+</style>
diff --git a/src/components/DbLearnCount/index.vue b/src/components/DbLearnCount/index.vue
index 86b364f..2a12d37 100644
--- a/src/components/DbLearnCount/index.vue
+++ b/src/components/DbLearnCount/index.vue
@@ -23,12 +23,17 @@
         <span class="label">学习状态：</span>
         <span class="value">{{ data.status }}</span>
       </a-col>
+      <a-col>
+        <CourseCatalogue :catalogueList="data.details"></CourseCatalogue>
+      </a-col>
     </a-row>
   </div>
 </template>
 
 <script>
+import CourseCatalogue from './CourseCatalogue.vue'
 export default {
+  components: {CourseCatalogue},
   props: {
     data: {
       type: Object,
diff --git a/src/views/mycourse/courseLearn/index.vue b/src/views/mycourse/courseLearn/index.vue
index eab2173..4b8b5fd 100644
--- a/src/views/mycourse/courseLearn/index.vue
+++ b/src/views/mycourse/courseLearn/index.vue
@@ -110,7 +110,7 @@ export default {
         if (selected) {
           this.curVideo = selected
           this.playerOptions = {
-            height: '360',
+            height: '500',
             autoplay: false,
             muted: false,
             language: 'zh-CN',
diff --git a/src/views/mycourse/index.vue b/src/views/mycourse/index.vue
deleted file mode 100644
index 21163a5..0000000
--- a/src/views/mycourse/index.vue
+++ /dev/null
@@ -1,13 +0,0 @@
-<template>
-  
-</template>
-
-<script>
-export default {
-
-}
-</script>
-
-<style>
-
-</style>
diff --git a/src/views/mycourse/mycourseList/MyCourseList.vue b/src/views/mycourse/mycourseList/MyCourseList.vue
index 725900f..f492834 100644
--- a/src/views/mycourse/mycourseList/MyCourseList.vue
+++ b/src/views/mycourse/mycourseList/MyCourseList.vue
@@ -161,7 +161,7 @@ export default {
     },
     // 获取列表
     handleRefresh () {
-
+      this.$refs.table.refresh()
     },
     handleOk () {
       this.$refs.table.refresh()
diff --git a/src/views/myexam/index.vue b/src/views/myexam/index.vue
index beab10b..80fc4ce 100644
--- a/src/views/myexam/index.vue
+++ b/src/views/myexam/index.vue
@@ -13,7 +13,7 @@
         "></SearchCom>
     </div>
     </br>
-    <a-tabs :default-active-key="activeTab">
+    <a-tabs :default-active-key="activeTab" @change="(key)=>{activeTab = key}">
       <a-tab-pane key="1" tab="预约考试">
         <s-table
           ref="examTable"
@@ -79,6 +79,8 @@
 <script>
 import { STable, SearchCom } from '@/components'
 import { reqExamList, reqExamAttendList, reqExamSubscribe } from '@/api/myexam/exam'
+import { dictionaryDropDown } from '@/api/sys/dictionaryItem'
+import { dictToTree } from '@/utils/util'
 
 export default {
   components: { STable, SearchCom },
@@ -87,10 +89,10 @@ export default {
       loading: false,
       activeTab: '1',
       queryParam: {
-        examType: '' // 课程分类
+        examClassify: '' // 课程分类
       },
       queryOptions: [
-        { type: 'select-dic-tree', placeholder: '考试分类', key: 'examType', options: [] }
+        { type: 'select-dic-tree', placeholder: '课程分类', key: 'examClassify', options: [] }
       ],
       examColumns: [
         {
@@ -186,15 +188,24 @@ export default {
     }
   },
   mounted () {
+    this.dictionaryDropDown()
   },
   methods: {
+    dictionaryDropDown () {
+      dictionaryDropDown({ dictionaryCode: '0006' }).then((res) => {
+        const result = dictToTree(res.data, [], 0)
+        this.queryOptions[0].options = result
+				this.loading = false
+      })
+    },
     // 搜索
     handleRefresh () {
       const { activeTab } = this
+      console.log('activeTab', activeTab)
       if (activeTab === '1') {
         this.$refs.examTable.refresh()
       } else {
-        this.$refs.examDoneColumns.refresh()
+        this.$refs.examDoneTable.refresh()
       }
     },
     // 预约考试
diff --git a/src/views/mypractice/index.vue b/src/views/mypractice/index.vue
index f6dd9bb..309f035 100644
--- a/src/views/mypractice/index.vue
+++ b/src/views/mypractice/index.vue
@@ -22,28 +22,32 @@
       </div>
     </div>
     </br>
-    <a-card v-for="(item, index) in dataList" :key="index" :bordered="false" :bodyStyle="{paddingLeft: '0px !important'}" :headStyle="{paddingLeft: '0px !important'}" >
-      <template slot="title">
-        <b>{{ item.title }}</b><span class="sub-txt">共{{ item.questionCount }}题</span>
-      </template>
-      <a-row :gutter="16">
-        <a-col
-          :span="6"
-          :lg="4"
-          :md="6"
-          :sm="8"
-          :xs="12"
-          v-for="(j, k) in item.list"
-          :key="`${index}-${k}`">
-          <a-card hoverable style="width: 100%; margin-bottom: 15px;">
-            <div class="flex-center"><h4>{{ j.courseName }}</h4></div>
-            <div class="flex-center" style="margin-top: 10px;">
-              <a-button @click="handlerStart(j)" type="primary" size="small" round>开始答题</a-button>
-            </div>
-          </a-card>
-        </a-col>
-      </a-row>
-    </a-card>
+    <template v-if="dataList && dataList.length>0">
+      <a-card v-for="(item, index) in dataList" :key="index" :bordered="false" :bodyStyle="{paddingLeft: '0px !important'}" :headStyle="{paddingLeft: '0px !important'}" >
+        <template slot="title">
+          <b>{{ item.title }}</b><span class="sub-txt">共{{ item.questionCount }}题</span>
+        </template>
+        <a-row :gutter="16">
+          <a-col
+            :span="6"
+            :lg="4"
+            :md="6"
+            :sm="8"
+            :xs="12"
+            v-for="(j, k) in item.list"
+            :key="`${index}-${k}`">
+            <a-card hoverable style="width: 100%; margin-bottom: 15px;">
+              <div class="flex-center"><h4>{{ j.courseName }}</h4></div>
+              <div class="flex-center" style="margin-top: 10px;">
+                <a-button @click="handlerStart(j)" type="primary" size="small" round>开始答题</a-button>
+              </div>
+            </a-card>
+          </a-col>
+        </a-row>
+      </a-card>
+    </template>
+    <a-empty v-else />
+
   </a-card>
 </template>