Merge remote-tracking branch 'origin/vite' into vite

src/components/CourseListItem.vue

@@ -2,7 +2,7 @@
   <div class="course-item" @click="$emit('on-click', data)">
     <img class="course-item-pic" :src="data.curriculum.curriculum_picture" />
     <div class="course-item-content">
-      <div class="course-item__title">{{ data.course_name }}</div>
+      <div class="course-item__title">{{ data.curriculum.curriculum_name }}</div>
       <div class="course-item__tools">
         <div class="course-item__progress">
           <span>视频观看进度</span>

src/modules/teacher/data/exam/components/ExamInfo.vue

@@ -26,7 +26,7 @@
         <div class="title">考试总时长</div>
         <div>
           <span class="num">{{ dataInfo.paper_info.times }}</span
-          ><span class="fen">小时</span>
+          ><span class="fen">分钟</span>
         </div>
       </el-col>
     </el-row>

src/modules/teacher/data/exam/components/QuestionType.vue

@@ -103,8 +103,10 @@ export default {
       const type = { 1: '单选', 2: '多选', 3: '问答', 5: '案例', 6: '判断', 7: '实操', 8: '情景' }
       const data = this.dataInfo.questions_info.reduce(
         (prev, cur) => {
-          prev.x.push(type[cur.type])
-          prev.y.push(cur.rate)
+          if ([1, 2, 6].includes(cur.type)) {
+            prev.x.push(type[cur.type])
+            prev.y.push(cur.rate)
+          }
           return prev
         },
         { x: [], y: [] }

src/modules/teacher/data/exam/components/ScoreRange.vue

@@ -91,7 +91,7 @@ export default {
   },
   methods: {
     scoreRangeChange(data = {}) {
-      const { datas = [{ a: 0, b: 100 }], tags = [0, 100] } = data
+      const { datas = [{ a: 0, b: 20 }, { a: 20, b: 40 }, { a: 40, b: 60 }, { a: 60, b: 80 }, { a: 80, b: 100 }], tags = [0, 20, 40, 60, 80, 100] } = data
       // all考试成绩
       const regionInfo = this.dataInfo.region_info
       // echart 颜色

src/modules/teacher/data/exam/views/TopicData.vue

@@ -3,7 +3,7 @@
     <question-details class="exam" :data="examData" v-if="examData.type != 3"></question-details>
     <div class="flex-box">
       <topic-data-info :data="topicInfo" class="flex"></topic-data-info>
-      <topic-data-chart :data="examData" class="flex"></topic-data-chart>
+      <topic-data-chart :data="examData" class="flex" v-if="examData.type != 3"></topic-data-chart>
     </div>
     <el-card>
       <div slot="header" style="display: flex; align-items: center">
@@ -53,7 +53,8 @@ export default {
           { label: '选择答案', prop: 'answer', align: 'center' },
           { label: '本题得分', prop: 'score', align: 'center' }
         ],
-        data: []
+        data: [],
+        hasPagination: false
       }
     }
   },
@@ -83,7 +84,7 @@ export default {
             const findOpt = opt.find(d => d.id === item)
             findOpt && answer.push(findOpt.option)
           })
-          b.answer = answer.join(',')
+          b.answer = answer.length ? answer.join(',') : '-'
           a.push(b)
           return a
         }, [])

src/modules/teacher/data/test/index.js

@@ -7,7 +7,7 @@ const routes = [
       { path: '/teacher/data/test/classList', component: () => import('../exam/views/ClassList.vue') },
       { path: '/teacher/data/test/PersonalList', component: () => import('../exam/views/PersonalList.vue') },
       { path: '/teacher/data/test/testData', component: () => import('../exam/views/ExamData.vue') },
-      { path: '/teacher/data/test/examData/classDetail', component: () => import('../exam/views/classDetail.vue') },
+      { path: '/teacher/data/test/examData/classDetail', component: () => import('../exam/views/ClassDetail.vue') },
       { path: '/teacher/data/test/examData/topicData', component: () => import('../exam/views/TopicData.vue') }
     ]
   }