Merge branch 'dev' into bluestar-dev

src/action/CourseAction.js

@@ -211,15 +211,30 @@ export default class CourseAction extends BaseACTION {
         type: 102
       })
       if (cur.course_examination) {
+        let courseExamChildren = []
+        if (data.exist_examination.length > 1) {
+          courseExamChildren = data.exist_examination.map((item, index) => {
+            const map = ['一', '二', '三']
+            return {
+              name: `第${map[index]}次考试`,
+              id: 'course_exam',
+              offset: index,
+              sid: sid,
+              cid: cid,
+              examId: cur.course_examination,
+              type: 101
+            }
+          })
+        }
         json.tabs1ChapterList.course.push({
           title: '课程考试',
           isUp: true,
-          chapters: [],
+          chapters: courseExamChildren,
           id: 'course_exam',
           sid: sid,
           cid: cid,
           examId: cur.course_examination,
-          type: 102
+          type: 101
         })
       }
       /* 课程考核 考核标准文案读取  */

src/modules/viewer/components/aside/chapter.vue

@@ -41,7 +41,7 @@ export default {
   },
   filters: {
     showName(name, data) {
-      if (data.type === 5 && data.live) {
+      if ([5, 8].includes(data.type) && data.live) {
         return `${name}(${data.live.start_time})`
       }
       return name

src/modules/viewer/components/work/examItem.vue

 <template>
   <div class="q-item">
     <div class="q-item-hd">
-      <div class="q-item-num">{{index + 1}}.</div>
+      <div class="q-item-num">{{ index + 1 }}.</div>
       <div class="q-item-title" v-html="data.content"></div>
       <div class="q-item-aside">
-        <template v-if="typeText">({{typeText}})</template>
-        <template v-if="data.hasOwnProperty('score')">({{data.score}}分)</template>
+        <template v-if="typeText">({{ typeText }})</template>
+        <template v-if="data.hasOwnProperty('score')">({{ data.score }}分)</template>
       </div>
     </div>
     <div class="q-item-bd">
       <!-- 单选 -->
       <el-radio-group v-model="currentValue.user_answer" v-if="type === 1">
         <div class="q-option-item" v-for="item in currentOptions" :key="item.id">
-          <el-radio :class="genClass(item)" :label="item.id">{{item.abc_option}}</el-radio>
+          <el-radio :class="genClass(item)" :label="item.id"><span v-html="item.abc_option"></span></el-radio>
         </div>
       </el-radio-group>
       <!-- 多选 -->
       <el-checkbox-group v-model="currentValue.user_answer" v-if="type === 2">
         <div class="q-option-item" v-for="item in currentOptions" :key="item.id">
-          <el-checkbox :class="genClass(item)" :label="item.id">{{item.abc_option}}</el-checkbox>
+          <el-checkbox :class="genClass(item)" :label="item.id"><span v-html="item.abc_option"></span></el-checkbox>
         </div>
       </el-checkbox-group>
       <!-- 简答题 -->
@@ -27,39 +27,34 @@
         <v-upload :disabled="disabled" v-model="currentValue.attachments">请上传对应的文件附件：</v-upload>
       </template>
     </div>
-    <div class="q-item-ft" v-if="disabled">
+    <div class="q-item-ft" v-if="disabled && showResult">
       <template v-if="type === 3">
         <p v-if="data.check_comment">
           <span>评语：</span>
-          <span>{{data.check_comment}}</span>
+          <span>{{ data.check_comment }}</span>
         </p>
       </template>
       <template v-else>
         <div class="result">
           <p>
             <span>学生答案：</span>
-            <span :class="isCorrect ? 'is-success' : 'is-error'">{{submitAnswerText}}</span>
+            <span :class="isCorrect ? 'is-success' : 'is-error'">{{ submitAnswerText }}</span>
           </p>
           <p>
             <span>正确答案：</span>
-            <span>{{correctAnswerText}}</span>
+            <span>{{ correctAnswerText }}</span>
           </p>
         </div>
       </template>
       <p v-if="data.hasOwnProperty('get_score')">
         <span>评分：</span>
-        <span>{{data.get_score}}分</span>
+        <span>{{ data.get_score }}分</span>
       </p>
       <div class="analyze" v-if="data.analysis">
         <span>解析：</span>
         <div class="analyze-main">
-          <span style="color:blue;cursor:pointer;" @click="showAnalyze = !showAnalyze">查看解析</span>
-          <div
-            v-html="data.analysis"
-            v-if="data.analysis"
-            v-show="showAnalyze"
-            class="analyze-content"
-          ></div>
+          <span style="color: blue; cursor: pointer" @click="showAnalyze = !showAnalyze">查看解析</span>
+          <div v-html="data.analysis" v-if="data.analysis" v-show="showAnalyze" class="analyze-content"></div>
         </div>
       </div>
     </div>
@@ -94,7 +89,8 @@ export default {
       }
     },
     // 是否禁用，提交过的是禁用状态
-    disabled: { type: Boolean, default: false }
+    disabled: { type: Boolean, default: false },
+    showResult: { type: Boolean, default: true }
   },
   data() {
     return {
@@ -135,16 +131,12 @@ export default {
         item.abc_option = `${this.A_Z[index]}. ${item.option}`
         // 提交时的选中状态
         const value = this.value.user_answer || ''
-        item.selected = Array.isArray(value)
-          ? value.includes(item.id)
-          : value === item.id
+        item.selected = Array.isArray(value) ? value.includes(item.id) : value === item.id
         // 处理正确的选中状态
         const hasChecked = Object.prototype.hasOwnProperty.call(item, 'checked')
         const rightAnswer = this.data.right_answer || ''
         if (!hasChecked && rightAnswer) {
-          item.checked = Array.isArray(rightAnswer)
-            ? rightAnswer.includes(item.id)
-            : rightAnswer === item.id
+          item.checked = Array.isArray(rightAnswer) ? rightAnswer.includes(item.id) : rightAnswer === item.id
         }
         return item
       })
@@ -179,7 +171,7 @@ export default {
   methods: {
     // 生成class
     genClass(item) {
-      if (!this.disabled) {
+      if (!this.disabled || !this.showResult) {
         return null
       }
       return {

src/modules/viewer/components/work/index.vue

 <template>
-  <component
-    :is="currentCompoent"
-    :chapter="chapter"
-    :data="data"
-    v-bind="$attrs"
-    v-on="$listeners"
-    v-if="chapter"
-  />
+  <component :is="currentCompoent" :chapter="chapter" :data="data" v-bind="$attrs" v-on="$listeners" v-if="chapter" />
 </template>
 
 <script>

src/modules/viewer/index.vue

@@ -35,6 +35,7 @@
           :key="pid"
           @pptupdate="handlePPTupdate"
           @change-ppt="handleChangePPT(...arguments, false)"
+          @update="getCourse"
         />
       </div>
     </div>

src/pages/learn/courseDetail.vue

@@ -542,7 +542,7 @@ export default {
         window.open(data.live.record_url || data.live.join_url)
         return
       }
-      this.$router.push({ name: 'viewerCourseChapter', params: { sid, cid, id: data.id } })
+      this.$router.push({ name: 'viewerCourseChapter', params: { sid, cid, id: data.id }, query: { offset: data.offset } })
     },
     /**
      * 开始学习或继续学习 - 跳转到对应音视频播放页

src/pages/mobile/list.vue

@@ -26,7 +26,7 @@
             <div class="live-item-content">
               <div class="live-item-content__title">{{ subitem.topic }}</div>
               <div class="live-item-content__time">{{ subitem.start_time }}</div>
-              <div class="live-item-content__status">{{ calcTimeText(subitem.start_time, subitem.live_status) }}</div>
+              <div class="live-item-content__status">{{ calcTimeText(subitem) }}</div>
             </div>
           </div>
         </div>
@@ -178,7 +178,8 @@ export default {
       url && window.open(url, '_blank')
     },
     // 计算日期
-    calcTimeText(liveTime, liveStatus) {
+    calcTimeText(data) {
+      let { start_time: liveTime, live_status: liveStatus } = data
       const map = {
         1: this.$t('live.notStarted'),
         2: this.$t('live.liveStreaming'),
@@ -208,6 +209,9 @@ export default {
           })
         }
       }
+      if (liveStatus === 3 && data.enable_record && data.record_url) {
+        result = this.$t('live.watchReplay')
+      }
       return result
     }
   },

src/pages/other/message.vue

@@ -6,7 +6,7 @@
         <template v-for="(item, index) in msgList">
           <el-collapse-item v-bind:key="index" :name="index">
             <template slot="title">
-              <el-badge :is-dot="!item.isShow" class="item">系统通知</el-badge>
+              <el-badge :is-dot="!item.isShow" class="item">{{ item.title }}</el-badge>
             </template>
             <div v-html="item.text"></div>
           </el-collapse-item>
@@ -21,7 +21,7 @@
         :total="page.total"
         :hide-on-single-page="true"
         @current-change="handleCurrentChange"
-        style="margin:0 auto;padding:40px 0;text-align:center;"
+        style="margin: 0 auto; padding: 40px 0; text-align: center"
       ></el-pagination>
     </div>
   </div>