Merge branch 'dev_m' into 'develop'

feat: 课程新增类型选项

See merge request !50

src/api/indexOvervoew.js

@@ -5,7 +5,6 @@ import https from './confign'
 
 //概览页面考试列表请求接口
 export const boeuExamPageList = (obj) => http.post('/boeu/exam/pageList', obj)
-
 //概览页面案例列表请求接口
 export const boeuCasePageList = (obj) => http.post('/boeu/case/pageList', obj)
 // 请求组织接口
@@ -20,9 +19,7 @@ export const boeuTeachingPageList = (obj) => http.post('/boeu/teaching/pageList'
 export const boeuRoterPageList = (obj) => http.post('/boeu/router/pageList', obj)
 // 项目列表
 export const boeuProjectPageList = (obj) => http.post('/boeu/project/pageList', obj)
-
 // 学习数据列表
 export const boeuStudyDataPageList = (obj) => http.post('/boeu/studyData/pageList', obj)
-
 // 概览页面 tab头数据
 export const boeuAllTotal = (obj) => http.get('/boeu/all/total', obj)

src/views/report/Overvoew.vue

@@ -1036,6 +1036,15 @@ export default {
             align: "center",
             fixed: "left",
           },
+          {
+            title: "分类",
+            dataIndex: "type",
+            ellipsis: true,
+            key: "type",
+            width: 120,
+            align: "center",
+            fixed: "left",
+          },
           {
             title: "授课教师",
             dataIndex: "teacher",