merge...

.config.dev.js

@@ -4,7 +4,7 @@ module.exports = {
   apiBaseURL: 'https://learn-api2.ezijing.com',
   others: {
     url: '/app/learn/course',
-    loginUrl: 'https://login2.ezijing.com/sofia/login/index',
+    loginUrl: 'https://login2.ezijing.com/bluestar/login/index',
     messageBaseURL: 'https://test-microservices-message-service-api.ezijing.com'
   },
   webpack: {

.config.pro.js

@@ -5,7 +5,7 @@ module.exports = {
   // apiBaseURL: '/',
   others: {
     url: '/app/learn/course',
-    loginUrl: 'https://login.ezijing.com/sofia/login/index',
+    loginUrl: 'https://login.ezijing.com/bluestar/login/index',
     messageBaseURL: ''
   },
   webpack: {

.config.test.js

@@ -5,7 +5,7 @@ module.exports = {
   // apiBaseURL: '/',
   others: {
     url: '/app/learn/course',
-    loginUrl: 'https://login2.ezijing.com/sofia/login/index',
+    loginUrl: 'https://login2.ezijing.com/bluestar/login/index',
     messageBaseURL: 'https://test-microservices-message-service-api.ezijing.com'
   },
   isUploadStatic: false,

package.json

@@ -36,6 +36,7 @@
     "@babel/plugin-transform-runtime": "^7.11.5",
     "@babel/preset-env": "^7.11.5",
     "@babel/runtime-corejs3": "^7.11.2",
+    "@vue/composition-api": "^1.0.0-rc.5",
     "acorn": "^7.1.1",
     "ali-oss": "^6.11.2",
     "autoprefixer": "^9.8.6",
@@ -72,18 +73,21 @@
     "webpack-merge": "^4.2.2"
   },
   "dependencies": {
-    "@ckeditor/ckeditor5-build-classic": "^25.0.0",
+    "@ckeditor/ckeditor5-build-classic": "^27.0.0",
+    "@ckeditor/ckeditor5-build-decoupled-document": "^27.0.0",
     "@ckeditor/ckeditor5-vue2": "^1.0.5",
     "@ezijing/web-message-sdk": "^0.2.1",
     "axios": "^0.21.1",
     "core-js": "^3.9.0",
     "cross-env": "^7.0.3",
+    "echarts": "^5.0.2",
     "element-ui": "^2.15.1",
     "js-cookie": "^2.2.1",
     "lodash": "^4.17.21",
     "qrcode.vue": "^1.7.0",
     "qs": "^6.9.6",
     "vue": "^2.6.12",
+    "vue-echarts": "^6.0.0-rc.3",
     "vue-i18n": "^8.22.2",
     "vue-loader": "^15.9.5",
     "vue-meta": "^2.4.0",

src/action/CourseAction.js

@@ -74,6 +74,7 @@ export default class CourseAction extends BaseACTION {
         : (_type === 2 ? _vIn.$t('action.courseAction.changeLearn')
           : (_type === 3 ? _vIn.$t('action.courseAction.repeatLearn') : ''))
       const json = {
+        course_check_type: cur.course_check_type,
         headerInfo: {
           isStart: !!cur.selected, // 是否为开始学习按钮 或者 选课按钮
           id: cur.course_id,
@@ -183,7 +184,7 @@ export default class CourseAction extends BaseACTION {
           }
         })
       }
-      json.tabs1ChapterList.course.push({
+      cur.curriculum.curriculum_essay && json.tabs1ChapterList.course.push({
         title: _vIn.$t('action.courseAction.courseWork'),
         isUp: true,
         chapters: [],
@@ -287,6 +288,7 @@ export default class CourseAction extends BaseACTION {
         })
       }
       const json = {
+        raw: cur,
         score: cur.course_score,
         duration: tool.convertTime.durationToTimeString(cur.course_duration || 0),
         progress: cur.course_progress,

src/action/GradeAction.js

@@ -9,26 +9,7 @@ import { Grade } from '@api'
 
 export default class GradeAction extends BaseACTION {
   /* 获取我的学分信息 */
-  getCredit () {
-    return Grade.getCredit().then(res => {
-      const _data = res
-      const json = {
-        total: _data.total_credits,
-        myTotal: _data.my_total_credits,
-        myTotalStr: (_data.total_credits && ((_data.my_total_credits * 1.0 / _data.total_credits * 100).toFixed(1) + '%')) || '0%',
-        must: _data.required_credits,
-        myMust: _data.my_required_credits,
-        myMustStr: (_data.required_credits && ((_data.my_required_credits * 1.0 / _data.required_credits * 100).toFixed(1) + '%')) || '0%',
-        unmust: _data.optional_credits,
-        myUnmust: _data.my_optional_credits,
-        myUnmustStr: (_data.optional_credits && ((_data.my_optional_credits * 1.0 / _data.optional_credits * 100).toFixed(1) + '%')) || '0%',
-        list: _data.lists
-      }
-      // callback(json) // 可以不使用callback 因为使用then
-      return json
-    })
-  }
-
+  getCredit () { return Grade.getCredit() }
   /* 提交重修 */
   rebuildSubmit (obj) { return Grade.submitRebuild(obj).then(res => res) }
   /* 意见反馈列表 */

src/api/course.js

+import BaseAPI from '@/api/base_api'
+
+const httpRequest = new BaseAPI(webConf)
+
+/**
+ * 获取课程详情
+ * @param {string} semesterId 学期ID
+ * @param {string} courseId 课程ID
+ */
+export function getCourse(semesterId, courseId) {
+  return httpRequest.get(`/api/lms/v2/education/courses/${semesterId}/${courseId}`)
+}
+
+/**
+ * 课程考核
+ * @param {string} semesterId 学期ID
+ * @param {string} courseId 课程ID
+ */
+export function getCourseAssess(semesterId, courseId) {
+  return httpRequest.get(`/api/lms/v2/analytics/courses/${semesterId}/${courseId}/evaluation`).then(res => {
+    // 视频数据组装
+    let videoList = Object.values(res.video_evaluation)
+    videoList = videoList.map(item => {
+      item.sections = Object.values(item.sections)
+      return item
+    })
+    res.video_evaluation = videoList
+    // 作业数据组装
+    let homeworkList = Object.values(res.homework_evaluation)
+    homeworkList = homeworkList.map(item => {
+      item.sections = Object.values(item.sections)
+      return item
+    })
+    res.homework_evaluation = homeworkList
+    return res
+  })
+}