每次加载pdf前，清空路径

# Conflicts:
#	src/views/Login.vue

.env.development

@@ -41,6 +41,7 @@ VUE_APP_PUBLIC_PATH='/pc'
 VUE_APP_MANAGER_PATH='/manage'
 VUE_APP_STUDENT_PATH='/fe-student'
 VUE_APP_MANAGER_API_PATH='/manageApi'
+VUE_APP_GROWTH_API_PATH=''
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

.env.preview

@@ -37,6 +37,7 @@ VUE_APP_PUBLIC_PATH='/pc-release'
 VUE_APP_MANAGER_PATH='/manage-release'
 VUE_APP_STUDENT_PATH='/fe-student-release'
 VUE_APP_MANAGER_API_PATH='/manageApi-release'
+VUE_APP_GROWTH_API_PATH='/growth'
 
 # 登录地址
 VUE_APP_LOGIN_URL='https://u.boe.com/web-release/'

.env.production

@@ -37,6 +37,7 @@ VUE_APP_PUBLIC_PATH='/pc'
 VUE_APP_MANAGER_PATH='/manage'
 VUE_APP_STUDENT_PATH='/fe-student'
 VUE_APP_MANAGER_API_PATH='/manageApi'
+VUE_APP_GROWTH_API_PATH='/growth'
 
 # 登录地址
 VUE_APP_LOGIN_URL='https://u.boe.com/web/'

.env.testing

@@ -36,6 +36,7 @@ VUE_APP_PUBLIC_PATH='/pc'
 VUE_APP_MANAGER_PATH='/manage'
 VUE_APP_STUDENT_PATH='/fe-student'
 VUE_APP_MANAGER_API_PATH='/manageApi'
+VUE_APP_GROWTH_API_PATH='/growth'
 
 # 登录地址
 VUE_APP_LOGIN_URL='https://u-pre.boe.com/web/'

public/index.html

@@ -16,9 +16,9 @@
     <meta name="referrer" content="strict-origin-when-cross-origin"/>
     <link rel="icon" href="<%= BASE_URL %>logo/favicon.ico">
     <title>京东方大学堂</title>
-    
+
     <script>
-      
+
       // if(window.top != window.self){
       //    window.top.location=window.self.location;
       // }

src/api/boe/courseRecord.js

@@ -1,5 +1,6 @@
 /**我的授课记录*/
 import ajax from '@/api/boe/boeApiAjax.js'
+import ajax2 from '@/api/unionAjax.js'
 import axios from 'axios'
 import { getToken } from '@/utils/token'
 const baseURL = process.env.VUE_APP_BOE_BASE_API;
@@ -60,12 +61,15 @@ const exportStudentOfTearcher = function(userId) {
 const courseRecordList = function(data) {
     return ajax.postJson('/b1/system/teacher/teacher-course-list',data);
 }
-
+const getListByToken = function(data) {
+  return ajax2.get('/manageApi',`/admin/teacherRecord/getListByToken?courseName=${data.courseName}&page=${data.page}&pageSize=${data.pageSize}`);
+}
 
 
 export default {
     courseRecordExport,
     courseRecordList,
+    getListByToken,
     exportStudentOfCourse,
     exportStudentOfTearcher
 

src/api/growth/growthpath.js

@@ -0,0 +1,8 @@
+// import ajax from '@/utils/xajax.js'
+import ajax from '../ajax';
+// const baseURL = process.env.VUE_APP_GROWTH_API_PATH;
+const baseURL = '/growth';
+// 查询专业力必修列表
+export const listData = (obj) => ajax.get(baseURL, '/professional/student/studentGrowthList', { params: obj })
+// 查询专业力统计
+export const getTotalGrowthTaskDetail = (obj) => ajax.get(baseURL, '/professional/student/getTotalGrowthTaskDetail', { params: obj })

src/api/modules/cases.js

@@ -1,6 +1,6 @@
 /* 案例模块的相关处理*/
 import ajax from '@/utils/xajax.js'
-
+import ajaxs from '@/api/ajax.js'
 /**首页查询
  * pageSize
  * orderField
@@ -88,6 +88,12 @@ const usernameList = function (pageSize) {
 const queryPraises = function (pageSize) {
   return ajax.get(`/xboe/m/boe/cases/query-praises?pageSize=${pageSize}`);
 }
+const queryPraisesNew = function (pageSize,rankType) {
+  return ajax.get(`/xboe/m/boe/cases/queryPopularity?pageSize=${pageSize}&rankType=${rankType}`);
+}
+const queryRecommendRank = function (pageSize) {
+  return ajax.get(`/xboe/m/boe/cases/queryRecommendRank?pageSize=${pageSize}`);
+}
 /*
 好评榜
 @param pageSize 长度
@@ -95,6 +101,9 @@ const queryPraises = function (pageSize) {
 const queryComments = function (pageSize) {
   return ajax.get(`/xboe/m/boe/cases/query-comments?pageSize=${pageSize}`);
 }
+const queryCommentsNew = function (pageSize,rankType) {
+  return ajax.get(`/xboe/m/boe/cases/queryHighOpinion?pageSize=${pageSize}&rankType=${rankType}`);
+}
 
 /**
  * 专业分类
@@ -186,11 +195,36 @@ const endReadTimer =  (data)=> ajax.postJson('/xboe/m/boe/cases/recommend/record
 const caseYears = function (query = {}) {
   return ajax.post('/xboe/m/boe/cases/caseYears', query);
 }
-
-
-
-
+//案例推荐榜单
+const getQueryRecommendRank = function (params) {
+  return ajax.get(`/xboe/m/boe/cases/queryRecommendRank?pageSize=${params.pageSize}`)
+}
+//案例上榜
+const riseIntoRank = (data) => ajax.post(`/xboe/m/boe/cases/riseIntoRank?caseId=${data.caseId}`)
+//取消上榜
+const cancelRiseIntoRank = (data) => ajax.post(`/xboe/m/boe/cases/cancelRiseIntoRank?caseId=${data.caseId}`)
+//调整榜单
+const adjustRank = (data) => ajax.post(`/xboe/m/boe/cases/adjustRank?caseIds=${data.caseIds}`)
+//收藏案例
+const queryFavoriteCaseOfIndex = (params) => ajax.get(`/xboe/m/boe/cases/queryFavoriteCaseOfIndex?pageIndex=${params.pageIndex}&pageSize=${params.pageSize}&orderField=${params.orderField}&orderAsc=${params.orderAsc}`)
+//浏览记录
+const queryViewRecord = (data) => ajaxs.post(`/statApi/xboe/m/stat/userdynamic/list?pageIndex=${data.pageIndex}&pageSize=${data.pageSize}&contentType=${data.contentType}&aid=${data.aid}&hidden=${data.hidden}&eventKey=${data.eventKey}`)
+//浏览量TOP榜单
+const queryPopularityOfMajor = (params) => ajax.get(`/xboe/m/boe/cases/queryPopularityOfMajor?pageSize=${params.pageSize}&rankMonth=${params.rankMonth}&majorId=${params.majorId}`)
+//浏览记录新
+const browsingHistory = (params) => ajax.get(`/xboe/m/boe/cases/browsingHistory?pageIndex=${params.pageIndex}&pageSize=5`)
+//获取所有的专业月份
+const queryAllTimePopularityOfMajor = () => ajax.get('/xboe/m/boe/cases/queryAllTimePopularityOfMajor')
 export default {
+  queryAllTimePopularityOfMajor,
+  getQueryRecommendRank,
+  queryPopularityOfMajor,
+  browsingHistory,
+  queryViewRecord,
+  queryFavoriteCaseOfIndex,
+  riseIntoRank,
+  cancelRiseIntoRank,
+  adjustRank,
   indexList,
   queryList,
   queryListV2,
@@ -202,7 +236,10 @@ export default {
   query,
   usernameList,
   queryPraises,
+  queryPraisesNew,
+  queryRecommendRank,
   queryComments,
+  queryCommentsNew,
   majorTypes,
   details,
   ids,

src/api/modules/courseFile.js

@@ -3,7 +3,6 @@
  * 下载课件，一期是直接在新的窗口打开文件的地址就可以了。不采用流的方式下载
  */
 import ajax from '@/utils/xajax.js'
-import ajax2 from '@/utils/xajax2.js'
 
 /**
  * 分页查询，课件的管理列表
@@ -50,9 +49,6 @@ const findList = function(data) {
 const saveUpload = function(data) {
     return ajax.post('/xboe/m/course/file/upload/save', data);
 }
-const saveUpload2 = function(data) {
-    return ajax2.post('/xboe/m/course/file/upload/save', data);
-}
 
 /**
  * 批量更新，上传时，一个一个上传，下面的列表的保存，使用此方法
@@ -89,7 +85,6 @@ const detail = function(id) {
 export default {
     pageList,
     saveUpload,
-    saveUpload2,
     batchUpdate,
     detail,
     delFile

src/api/modules/courseStudy.js

@@ -10,7 +10,7 @@ import ajax from '@/utils/xajax.js'
  * 返回 检查报名状态
  */
 const hasSignup = function(courseId) {
-    return ajax.get('/xboe/school/study/signup/has?cid='+courseId);
+  return ajax.get('/xboe/school/study/signup/has?cid='+courseId);
 }
 
 /**
@@ -25,7 +25,7 @@ const hasSignup = function(courseId) {
  }
  */
 const signup = function(data) {
-    return ajax.post('/xboe/school/study/signup/self', data);
+  return ajax.post('/xboe/school/study/signup/self', data);
 }
 
 /**
@@ -38,7 +38,7 @@ const signup = function(data) {
  }
  */
 const findSignup = function(data) {
-    return ajax.post('/xboe/school/study/signup/pagelist', data);
+  return ajax.post('/xboe/school/study/signup/pagelist', data);
 }
 
 /**
@@ -46,7 +46,7 @@ const findSignup = function(data) {
  * @param {Object} id 报名的id
  */
 const deleteSignup = function(id) {
-    return ajax.post('/xboe/school/study/signup/delete?id='+id);
+  return ajax.post('/xboe/school/study/signup/delete?id='+id);
 }
 
 /**
@@ -55,7 +55,7 @@ const deleteSignup = function(id) {
  * Signup 对象集合， list
  */
 const importSignup = function(data) {
-    return ajax.post('/xboe/school/study/signup/import',data);
+  return ajax.post('/xboe/school/study/signup/import',data);
 }
 
 /**
@@ -63,11 +63,11 @@ const importSignup = function(data) {
  * @param {Object} courseId 课程 的id
  */
 const countSignup = function(courseId) {
-    return ajax.post('/xboe/school/study/signup/count-by-course',{courseId});
+  return ajax.post('/xboe/school/study/signup/count-by-course',{courseId});
 }
 
 const studyIndex = function(courseId) {
-    return ajax.get('/xboe/school/study/course/studyIndex?cid='+courseId+'&addView=true');
+  return ajax.get('/xboe/school/study/course/studyIndex?cid='+courseId+'&addView=true');
 }
 /**
  *
@@ -80,7 +80,7 @@ const studyIndex = function(courseId) {
  * @returns
  */
 const studyIndexPost = function(data) {
-    return ajax.post('/xboe/school/study/course/studyIndex',data);
+  return ajax.post('/xboe/school/study/course/studyIndex',data);
 }
 
 /**
@@ -88,7 +88,7 @@ const studyIndexPost = function(data) {
  * @param {Object} courseId
  */
 const studyInfo = function(courseId) {
-    return ajax.get('/xboe/school/study/course/info?cid='+courseId);
+  return ajax.get('/xboe/school/study/course/info?cid='+courseId);
 }
 
 
@@ -98,7 +98,7 @@ const studyInfo = function(courseId) {
  * @param {Object} contentId
  */
 const getStudyContentItem = function(studyId,contentId) {
-    return ajax.post('/xboe/school/study/course/study-course-content',{studyId,contentId});
+  return ajax.post('/xboe/school/study/course/study-course-content',{studyId,contentId});
 }
 
 /**
@@ -111,7 +111,7 @@ const getStudyContentItem = function(studyId,contentId) {
  * @returns
  */
 const studyVideoTime = function(data) {
-    return ajax.post('/xboe/school/study/course/study-video-time',data);
+  return ajax.post('/xboe/school/study/course/study-video-time',data);
 }
 
 /**
@@ -119,7 +119,7 @@ const studyVideoTime = function(data) {
  * @returns
  */
 const lastStudy = function() {
-    return ajax.get('/xboe/school/study/course/last-study');
+  return ajax.get('/xboe/school/study/course/last-study');
 }
 
 /**
@@ -136,7 +136,7 @@ const lastStudy = function() {
  *
  */
 const studyContent = function(data) {
-    return ajax.postJson('/xboe/school/study/course/study',data);
+  return ajax.postJson('/xboe/school/study/course/study',data);
 }
 
 /**
@@ -150,7 +150,7 @@ const studyContent = function(data) {
  *
  */
 const appendStudyTime = function(data) {
-    return ajax.post('/xboe/school/study/course/appendtime',data);
+  return ajax.post('/xboe/school/study/course/appendtime',data);
 }
 
 /**
@@ -161,7 +161,7 @@ const appendStudyTime = function(data) {
  * name: 学习人的姓名
  */
 const studyRecords = function(data) {
-    return ajax.post('/xboe/school/study/course/pagelist',data);
+  return ajax.post('/xboe/school/study/course/pagelist',data);
 }
 
 /**
@@ -173,7 +173,7 @@ const studyRecords = function(data) {
  * name: 学习人的姓名
  */
 const studyContentRecords = function(data) {
-    return ajax.post('/xboe/school/study/course/contents',data);
+  return ajax.post('/xboe/school/study/course/contents',data);
 }
 
 /**
@@ -185,7 +185,7 @@ const studyContentRecords = function(data) {
  }
  */
 const studyExport = function(data) {
-    return ajax.post('/xboe/school/study/course/export',data);
+  return ajax.post('/xboe/school/study/course/export',data);
 }
 
 /**
@@ -200,7 +200,7 @@ const studyExport = function(data) {
  }
  */
 const myStudyList = function(query) {
-    return ajax.post('/xboe/school/study/course/mylist',query);
+  return ajax.post('/xboe/school/study/course/mylist',query);
 }
 /**
  * 当前课程学习记录
@@ -216,7 +216,7 @@ const myStudyList = function(query) {
  }
  */
 const myCourseStudy = function(query) {
-    return ajax.post('/xboe/school/study/course/course-users',query);
+  return ajax.post('/xboe/school/study/course/course-users',query);
 }
 
 
@@ -241,7 +241,7 @@ const myCourseStudy = function(query) {
  * answerJson
  */
 const saveExam = function(data) {
-    return ajax.postJson('/xboe/school/study/exam/save',data);
+  return ajax.postJson('/xboe/school/study/exam/save',data);
 }
 
 /**
@@ -261,7 +261,7 @@ const saveExam = function(data) {
  * hwAnswer： 文本提交的信息
  */
 const saveHomework = function(data) {
-    return ajax.postJson('/xboe/school/study/homework/save',data);
+  return ajax.postJson('/xboe/school/study/homework/save',data);
 }
 
 /**
@@ -279,7 +279,7 @@ const saveHomework = function(data) {
  * asScore：评估得分
  */
 const saveAssess = function(data) {
-    return ajax.postJson('/xboe/school/study/assess/save',data);
+  return ajax.postJson('/xboe/school/study/assess/save',data);
 }
 
 /**
@@ -288,7 +288,7 @@ const saveAssess = function(data) {
  * id:记录的id
  */
 const myHomework = function(id) {
-    return ajax.post('/xboe/school/study/homework/detail?id='+id);
+  return ajax.post('/xboe/school/study/homework/detail?id='+id);
 }
 
 /**
@@ -297,7 +297,7 @@ const myHomework = function(id) {
  * id:记录的id
  */
 const myExamPaper = function(id) {
-    return ajax.get('/xboe/school/study/exam/detail?id='+id);
+  return ajax.get('/xboe/school/study/exam/detail?id='+id);
 }
 
 /**
@@ -306,7 +306,7 @@ const myExamPaper = function(id) {
  * id:记录的id
  */
 const myAssess = function(id) {
-    return ajax.get('/xboe/school/study/assess/detail?id='+id);
+  return ajax.get('/xboe/school/study/assess/detail?id='+id);
 }
 
 /**
@@ -318,7 +318,7 @@ const myAssess = function(id) {
  }
  */
 const myHomeworkList = function(data) {
-    return ajax.post('/xboe/school/study/homework/list-study',data);
+  return ajax.post('/xboe/school/study/homework/list-study',data);
 }
 
 /**
@@ -327,7 +327,7 @@ const myHomeworkList = function(data) {
  * 对应的提交记录的id，
  */
 const myExamList = function(itemId) {
-    return ajax.post('/xboe/school/study/exam/list',{itemId});
+  return ajax.post('/xboe/school/study/exam/list',{itemId});
 }
 
 /**
@@ -338,8 +338,8 @@ const myExamList = function(itemId) {
    contentId:''
  }
  */
- const myExamList2 = function(data) {
-    return ajax.post('/xboe/school/study/exam/list-study',data);
+const myExamList2 = function(data) {
+  return ajax.post('/xboe/school/study/exam/list-study',data);
 }
 
 /**
@@ -351,7 +351,7 @@ const myExamList = function(itemId) {
  }
  */
 const myAssessList = function(data) {
-    return ajax.post('/xboe/school/study/assess/list-study',data);
+  return ajax.post('/xboe/school/study/assess/list-study',data);
 }
 
 /*
@@ -360,7 +360,7 @@ const myAssessList = function(data) {
 @param courseId 课程id 用于删除课程报名信息和修改课程学习人数
  */
 const deleteSignUp=function(id,courseId){
-	return ajax.post(`/xboe/school/study/course/delete-signup?id=${id}&couserId=${courseId}`);
+  return ajax.post(`/xboe/school/study/course/delete-signup?id=${id}&couserId=${courseId}`);
 }
 
 /**
@@ -389,44 +389,48 @@ const followIds=function (data){
 const myStudysFromES=function (data){
   return ajax.post('/xboe/school/study/es/search',data);
 }
-
+//导出作业
+const homeworkExport=function (data){
+  return ajax.get(`/xboe/m/course/portal/export?contentId=${data.contentId}&courseName=${data.courseName}`);
+}
 /**根据id集合查询，传入的是id数组*/
 const findByIds=function (ids){
   return ajax.postJson('/xboe/school/study/es/list-by-ids',ids);
 }
 
 export default {
-    hasSignup,
-    signup,
-    findSignup,
-    deleteSignup,
-    importSignup,
-    countSignup,
-    studyIndex,
-    studyInfo,
-    studyVideoTime,
-    lastStudy,
-    studyContent,
-    appendStudyTime,
-    studyRecords,
-    studyContentRecords,
-    getStudyContentItem,
-    studyExport,
-    myStudyList,
-    saveHomework,
-    saveExam,
-    saveAssess,
-    myHomework,
-    myExamPaper,
-    myAssess,
-    myHomeworkList,
-    myExamList,
-    myAssessList,
-    myExamList2,
-	myCourseStudy,
+  hasSignup,
+  signup,
+  findSignup,
+  deleteSignup,
+  importSignup,
+  countSignup,
+  studyIndex,
+  studyInfo,
+  studyVideoTime,
+  lastStudy,
+  studyContent,
+  appendStudyTime,
+  studyRecords,
+  studyContentRecords,
+  getStudyContentItem,
+  studyExport,
+  myStudyList,
+  saveHomework,
+  saveExam,
+  saveAssess,
+  myHomework,
+  myExamPaper,
+  myAssess,
+  myHomeworkList,
+  myExamList,
+  myAssessList,
+  myExamList2,
+  myCourseStudy,
   myStudysFromES,
+  homeworkExport,
   findByIds,
-	deleteSignUp,
+  deleteSignUp,
   ids,
   followIds,
   studyIndexPost

src/api/modules/paper.js

@@ -72,6 +72,9 @@ const querypaper = function(data) {
 const getPaperContent = function(id) {
     return ajax.get('/xboe/m/exam/paper/paper-content?id=' + id);
 }
+const newPaperContent = function(id){
+    return ajax.get('/xboe/m/course/content/exam/paper-content?courseExamId='+id);
+}
 export default {
     detail,
     update,
@@ -80,6 +83,7 @@ export default {
     querylist,
     querypaper,
     getPaperContent,
+    newPaperContent,
     batchImportCount,
     batchImportData
 }

src/api/modules/teacher.js

@@ -1,5 +1,5 @@
 import ajax from '@/utils/xajax.js'
-
+import ajax2 from '../unionAjax.js';
 
 /**
  * 按名称查询
@@ -9,7 +9,9 @@ const findByName = function(name) {
     return ajax.get('/xboe/teacher/name?name=' + name);
 }
 
-
+const findByNameNew = function(name) {
+    return ajax2.get('/manageApi/admin/teacher/selectTeacher?name=' + name);
+}
 const updateTeacher=function(data){
     return ajax.postJson('/xboe/teacher/update-teacher',data);
 }
@@ -217,7 +219,7 @@ export default {
     update,
     del,
     detail,
-    findByName,
+    findByNameNew,
     updateSysId,
 	has,
 	start,

src/components/AlertPopup.vue

@@ -1,7 +1,7 @@
 <template>
   <!--弹出窗口设置-->
   <div>
-    <div v-for="pop in popupList" :key="pop.id">wwww
+    <div v-for="pop in popupList" :key="pop.id">
       <el-dialog :close-on-press-escape="false" :close-on-click-modal="false"  class="medalbox"  :visible.sync="pop.show"  :append-to-body="true" >
         <div style="text-align: center;position: relative;">
           <!-- <span style="float: right;" @click="pop.show = false"><i style="font-size: 28px;color: #000000;" class="el-icon-close"></i></span> -->

src/components/Case/collectList.vue

@@ -8,7 +8,10 @@
 
           </div>
           <div class="article-info-date">
-            <el-button @click="delItem(item)" type="text" style="color: #8590A6;font-size:14px" icon="el-icon-star-on">取消收藏</el-button>
+            <div class="box">
+              <div class="image"></div>
+              <el-button @click="delItem(item)" type="text" style="color: #8590A6;font-size:14px">取消收藏</el-button>
+            </div>
           </div>
         </div>
         <div class="article-info-tools">
@@ -161,6 +164,26 @@
         line-height: 40px;
         font-weight: 200;
         color: #999999;
+        display: flex;
+        justify-content: end;
+        .box{
+          display: flex;
+          justify-content: end;
+          align-items: center;
+          .image{
+            width: 14px;
+            height: 14px;
+            background: url('../../assets/images/case/Frame(5).png') no-repeat;
+            background-size: 100%;
+            margin-right: 10px;
+          }
+          &:hover{
+            .image{
+              background: url('../../assets/images/case/Frame(12).png') no-repeat;
+              background-size: 100%;
+            }
+          }
+        }
         i {
           margin-right: 5px;
         }

src/components/Course/auditCourse1.vue

@@ -637,7 +637,9 @@ export default {
           }
           this.teacherList = rs.result.teachers;
           this.teacherName = rs.result.teachers;
-          this.teacher = rs.result.teachers.map(res => res.teacherName);
+          this.teacher = rs.result.teachers.map(item => {
+            return `${item.teacherName}(${item.userNo})`
+          });
           this.totalContent = rs.result.contents.length; //计算总内容数
           if (this.courseInfo.tags != "") {
             this.showTags = this.courseInfo.tags.split(",");

src/components/Course/auditCourse2.vue

@@ -681,7 +681,9 @@ export default {
           }
           this.teacherList = rs.result.teachers;
           this.teacherName = rs.result.teachers;
-          this.teacher = rs.result.teachers.map(item => item.teacherName);
+          this.teacher = rs.result.teachers.map(item => {
+            return `${item.teacherName}(${item.userNo})`
+          });
           this.showTags = this.courseInfo.tags.split(",");
           if (rs.result.course.resOwner3 == "") {
             this.resOwnerArray = [

src/components/Course/choice.vue

@@ -13,7 +13,7 @@
         </el-input>
         <div class="choice-box" v-if="teacherDownList.length>0">
            <ul>
-            <li v-for="te in teacherDownList" :key="te.key" @click="changeTeachers(te)">{{te.teacherName + te.teacherCode}}</li>
+            <li v-for="te in teacherDownList" :key="te.key" @click="changeTeachers(te)">{{te.teacherName + '(' + te.teacherCode + ')'}}</li>
            </ul>
         </div>
      <!-- <el-select
@@ -88,15 +88,15 @@
           if (this.teacherValues !== '') {
             this.loading = true;
             try {
-            const { result, message, status } = await apiTeacher.findByName(this.teacherValues);
+            const { data, message, code } = await apiTeacher.findByNameNew(this.teacherValues);
             this.loading = false;
-            if (status === 200) {
+            if (code === 200) {
                 let list = [];
-                result.forEach(item => {
+                data.forEach(item => {
                 list.push({
                     teacherId: item.id,
                     teacherName: item.name,
-                    teacherCode: item.code
+                    teacherCode: item.mobile
                 });
                 });
                 this.teacherDownList = list;

src/components/Course/courseExam.vue

@@ -85,6 +85,28 @@
             <el-form-item label="考试说明">
                <el-input type="textarea" show-word-limit v-model="examInfo.info" placeholder="关于考试的说明(限255字以内)" maxlength="255"></el-input>
             </el-form-item>
+            <el-form-item  label="随机模式">
+              <el-col :span="4">
+                <el-radio-group v-model="examInfo.randomMode">
+                  <el-radio :label="true">是</el-radio>
+                  <el-radio :label="false">否</el-radio>
+                </el-radio-group>
+              </el-col>
+              <el-col :span="20" v-if="examInfo.randomMode&&examInfo.paperType==1">
+                <el-form-item label="数量">
+                    <el-input-number v-model="examInfo.qnum" :min="1" :max="examPaper.items.length" label="数量"></el-input-number>
+                    <span style="margin-left:10px;" v-if="examPaper.items.length==0">先添加试题</span>
+                    <span style="margin-left:10px;" v-if="examPaper.items.length>0">试卷有 {{examPaper.items.length}} 道试题</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="20" v-if="examInfo.randomMode&&examInfo.paperType==2">
+                <el-form-item label="数量">
+                    <el-input-number v-model="examInfo.qnum" :min="1" :max="usePaper.counts" label="数量"></el-input-number>
+                    <span style="margin-left:10px;" v-if="usePaper.counts==0">先选择试卷</span>
+                    <span style="margin-left:10px;" v-if="usePaper.counts>0">试卷有 {{usePaper.counts}} 道试题</span>
+                </el-form-item>
+              </el-col>
+            </el-form-item>
           </el-form>
           </div>
           <div v-if="examInfo.paperType==1">
@@ -285,7 +307,9 @@
              return;
            }
         }
-
+        if(!this.examInfo.randomMode){
+          this.examInfo.qnum = 0
+        }
         this.$emit("save",this.examInfo);
       },
       deleteExam(){ //删除
@@ -294,6 +318,8 @@
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
+          this.examInfo.randomMode = false;
+          this.examInfo.qnum = 0;
           this.$emit("remove",this.examInfo);
         }).catch(() => {
 

src/components/Course/exam.vue

@@ -326,48 +326,91 @@ export default {
         return qitems;
     },
     startTest(){
-      if(this.info.paperType==2){
-        apiExamPaper.getPaperContent(this.info.paperId).then(rs=>{
-          if(rs.status=200){
-             this.examPaper.json=JSON.parse(rs.result);
-             //console.log(this.examPaper.json,'this.examPaper.json');
-             let qitems=this.convertToItems(this.examPaper.json);
+      apiExamPaper.newPaperContent(this.info.id).then(res=>{
+        if(!res.error&&res.result != ''){
+          if(this.info.paperType==2){
+            //TODO1
+            console.log("调用开始考试 if paperType == 2")
+            this.examPaper.json=res.result;
+            let qitems=this.convertToItems(this.examPaper.json);
             this.paper ={items:qitems};
             this.total=qitems.length;
             this.curItem=qitems[this.curIndex];
             this.startTime=new Date();//记录开始时间
             this.timerValue=this.info.testDuration;
+            this.content.status=1;
             this.timer=setInterval(this.changeTimer,60000);
             this.testStart=true;
           }else{
-            this.$message.error('加载试卷内容失败，请与管理员联系，试卷是否已删除');
-          }
-        })
-      }else{
-        let paper= JSON.parse(this.info.paperContent);
-        paper.items.forEach(item=>{
-          //console.log(item);
-          if(item.type==101){
-            item.userAnswer='';
-          }else if(item.type==102){
-            item.userAnswer=[];
-          }else{
-            item.userAnswer=''
-          }
-          item.options.forEach(opt=>{
-            opt.checked=false;
-          })
-        });
-        this.total=paper.items.length;
-        this.paper =paper;
-        //console.log(this.paper);
+            console.log("调用开始考试 else paperType != 2")
+            let paper= {items:res.result};
+            paper.items.forEach(item=>{
+              if(item.type==101){
+                item.userAnswer='';
+              }else if(item.type==102){
+                item.userAnswer=[];
+              }else{
+                item.userAnswer=''
+              }
+              item.options.forEach(opt=>{
+                opt.checked=false;
+              })
+            });
+            this.total=paper.items.length;
+            this.paper =paper;
 
-        this.curItem=paper.items[this.curIndex];
-        this.startTime=new Date();//记录开始时间
-        this.timerValue=this.info.testDuration;
-        this.timer=setInterval(this.changeTimer,60000);
-        this.testStart=true;
-      }
+            this.curItem=paper.items[this.curIndex];
+            this.startTime=new Date();//记录开始时间
+            this.timerValue=this.info.testDuration;
+            this.timer=setInterval(this.changeTimer,60000);
+            this.testStart=true;
+          }
+        }else{
+          this.$message.error('加载试卷内容失败，请与管理员联系，试卷是否已删除');
+        }
+      })
+      // if(this.info.paperType==2){
+      //   apiExamPaper.getPaperContent(this.info.paperId).then(rs=>{
+      //     if(rs.status=200){
+      //        this.examPaper.json=JSON.parse(rs.result);
+      //        //console.log(this.examPaper.json,'this.examPaper.json');
+      //        let qitems=this.convertToItems(this.examPaper.json);
+      //       this.paper ={items:qitems};
+      //       this.total=qitems.length;
+      //       this.curItem=qitems[this.curIndex];
+      //       this.startTime=new Date();//记录开始时间
+      //       this.timerValue=this.info.testDuration;
+      //       this.timer=setInterval(this.changeTimer,60000);
+      //       this.testStart=true;
+      //     }else{
+      //       this.$message.error('加载试卷内容失败，请与管理员联系，试卷是否已删除');
+      //     }
+      //   })
+      // }else{
+      //   let paper= JSON.parse(this.info.paperContent);
+      //   paper.items.forEach(item=>{
+      //     //console.log(item);
+      //     if(item.type==101){
+      //       item.userAnswer='';
+      //     }else if(item.type==102){
+      //       item.userAnswer=[];
+      //     }else{
+      //       item.userAnswer=''
+      //     }
+      //     item.options.forEach(opt=>{
+      //       opt.checked=false;
+      //     })
+      //   });
+      //   this.total=paper.items.length;
+      //   this.paper =paper;
+      //   //console.log(this.paper);
+
+      //   this.curItem=paper.items[this.curIndex];
+      //   this.startTime=new Date();//记录开始时间
+      //   this.timerValue=this.info.testDuration;
+      //   this.timer=setInterval(this.changeTimer,60000);
+      //   this.testStart=true;
+      // }
     },
     chooseOption(opt){
     	if(this.curItem.type==101 || this.curItem.type==103){
@@ -532,7 +575,7 @@ export default {
         randomMode:this.info.randomMode,
         score:testScore,
         paperJson:JSON.stringify(this.paper),//原来是对象，这里要也要对象
-        //startTime:formatDate(this.startTime),//此时间需要格式化,格式化时间可以放在util中
+        startTime:formatDate(this.startTime),//此时间需要格式化,格式化时间可以放在util中
         //endTime:formatDate(now),
       }
       //计划考试的时长
@@ -543,8 +586,15 @@ export default {
       apiStudy.saveExam(postData).then(res=>{
         this.thisTrue = true
          if(res.status == 200) {
+            console.log("获取数据结果 考试 res ==>",res)
             this.records.push(res.result);
-            this.content.status=9;//表已学习完，判断上级的章是否已完成
+            //TODO 评分更改 最终完成
+            if(res.result.score > res.result.passLine){
+              this.content.status=9;//表已学习完，判断上级的章是否已完成
+            }else{
+              this.content.status=1;
+            }
+
             this.studyItemId=res.result.studyItemId;//第一次保存时是没有的，所以这里要赋值
             this.$alert('您本次考试得分：'+this.lastScore, '考试成绩', {
                   confirmButtonText: '确定',

src/components/Course/homework.vue

@@ -37,7 +37,7 @@
            </div>
        </div>
        <div style="text-align: center;padding-bottom: 10px;">
-           <el-button type="primary" @click="submitHomework()">{{records.length>0?'重新提交':'提交'}}</el-button>
+           <el-button type="primary" :disabled="isSubmit" @click="submitHomework()">{{records.length>0?'重新提交':'提交'}}</el-button>
        </div>
      </div>
      <div v-show="showRecord"><!--作业提交记录-->
@@ -87,10 +87,12 @@ export default {
       has:true,
       info:{},
       studyItemId:'',
+      studyItemIdOnce: '',
       filePath:'',
       answer:'',
       close:false,
       records:[],//作业记录
+      isSubmit:false,
     };
   },
   mounted() {
@@ -134,7 +136,11 @@ export default {
       }
       apiCourseStudy.myHomeworkList(params).then(rs=>{
         if(rs.status==200){
+          this.studyItemId = ''
           this.records=rs.result;
+          if(rs.result.length>0){
+            this.studyItemIdOnce = rs.result[rs.result.length - 1].id;
+          }
         }
       })
     },
@@ -171,9 +177,9 @@ export default {
           return;
         }
       }
-
+      this.isSubmit = true
       let pamars = {
-        studyItemId: this.studyItemId,//学习内容记录id,
+        studyItemId: this.studyItemId || this.studyItemIdOnce,//学习内容记录id,
         studyId: this.studyId,//学习id,
         courseId: this.content.courseId,//课程id,
         contentId: this.content.id,//内容id,
@@ -185,6 +191,7 @@ export default {
         score: 0
       }
       apiCourseStudy.saveHomework(pamars).then(res=>{
+        this.isSubmit = false
          if(res.status==200){
             this.$message.success("作业已提交");
             this.filePath='';

src/components/Course/weikeContent.vue

@@ -401,6 +401,28 @@
               <el-form-item label="考试说明">
                  <el-input type="textarea" show-word-limit v-model="exam.info.info" placeholder="关于考试的说明(限255字以内)" maxlength="255"></el-input>
               </el-form-item>
+              <el-form-item  label="随机模式">
+                <el-col :span="4">
+                  <el-radio-group v-model="exam.info.randomMode">
+                    <el-radio :label="true">是</el-radio>
+                    <el-radio :label="false">否</el-radio>
+                  </el-radio-group>
+                </el-col>
+                <el-col :span="20" v-if="exam.info.randomMode&&exam.info.paperType==1">
+                  <el-form-item label="数量">
+                     <el-input-number v-model="exam.info.qnum" :min="1" :max="exam.paperJson.items.length" label="数量"></el-input-number>
+                     <span style="margin-left:10px;" v-if="exam.paperJson.items.length==0">先添加试题</span>
+                     <span style="margin-left:10px;" v-if="exam.paperJson.items.length>0">试卷有 {{exam.paperJson.items.length}} 道试题</span>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="20" v-if="exam.info.randomMode&&exam.info.paperType==2">
+                  <el-form-item label="数量">
+                     <el-input-number v-model="exam.info.qnum" :min="1" :max="usePaper.counts" label="数量"></el-input-number>
+                     <span style="margin-left:10px;" v-if="usePaper.counts==0">先选择试卷</span>
+                     <span style="margin-left:10px;" v-if="usePaper.counts>0">试卷有 {{usePaper.counts}} 道试题</span>
+                  </el-form-item>
+                </el-col>
+              </el-form-item>
             </el-form>
             </div>
             <div v-if="exam.info.paperType==1">
@@ -1049,6 +1071,7 @@
              this.cwareChange.curriculumData = deepClone(this.cware.curriculumData)
           }
         }else if(index==2){
+          this.homework.content.contentName = this.homework.info.name || '作业'
           postData.content=this.homework.content;
           postData.homework=this.homework.info;
           this.homeworkChange = deepClone(this.homework)
@@ -1058,12 +1081,14 @@
           if(this.exam.info.paperType==2){
             if(!this.exam.info.paperId){
                this.$message.error("您还未选择任何试卷");
+               this.loading=false;
                return;
             }
           }else{
             //检查是不是所有的试题都有了答案
             if(this.exam.paperJson.items.length==0){
               this.$message.error("您还没有添加考试的试题");
+              this.loading=false;
               return;
             }
             let pass=true;
@@ -1086,10 +1111,15 @@
             }
             this.exam.info.paperContent=JSON.stringify(this.exam.paperJson);
           }
+          if(!this.exam.info.randomMode){
+            this.exam.info.qnum = 0
+          }
           postData.exam=this.exam.info;
+          postData.content.contentName='考试';
           this.examChange = deepClone(this.exam);
         }else if(index==4){
           this.assess.content.content=JSON.stringify(this.assess.json);
+          this.assess.content.contentName='评估';
           postData.content=this.assess.content;
         }
 
@@ -1149,6 +1179,8 @@
             postData.id=this.exam.content.id;
             postData.ctype=this.exam.content.contentType;
             curContent=this.exam.content;
+            this.exam.info.randomMode = false;
+            this.exam.info.qnum = 0
           }else if(index==4){
             postData.id=this.assess.content.id;
             postData.ctype=this.assess.content.contentType;

src/components/FileUpload/index.vue

@@ -12,7 +12,6 @@
       :show-file-list="showList"
       :data="data"
       :headers="headers"
-      :on-remove="handleRemove"
       class="upload-file-uploader"
       ref="upload"
     >
@@ -143,9 +142,6 @@ export default {
     },
   },
   methods: {
-    handleRemove(file, fileList){
-      this.$emit('isTrue',false)
-    },
     // 上传前校检格式和大小
     handleBeforeUpload(file) {
       if(this.beforeMsg){
@@ -190,8 +186,6 @@ export default {
       if(this.loading) {
         this.isLoading = true;
       }
-      this.$emit('isTrue',true)
-      this.$emit('isFalse',true)
       return true;
     },
     // 文件个数超出
@@ -201,7 +195,6 @@ export default {
     // 上传失败
     handleUploadError(err) {
       this.isLoading = false;
-      this.$emit('isTrue',false)
       this.$message({message:"上传失败, 请重试",type:'error',offset:100});
     },
     // 上传成功回调
@@ -224,13 +217,16 @@ export default {
         if(delIdx>-1){
           fileList.splice(delIdx,1);
         }
+        this.$emit("success", res);
       } else {
         this.isLoading = false;
-        //this.fileList = [];
+        if(this.limit == 1){
+          this.fileList = [];
+        }
         this.$message({message:"上传失败",type:'error',offset:100});
       }
 
-      this.$emit("success", res);
+      // this.$emit("success", res);
     },
     // 删除文件
     handleDelete(index) {

src/components/HomePage/caseList.vue

@@ -8,7 +8,10 @@
                     <span style="margin-left:28px">{{item.eventTime}}</span>
                     <span v-if="item.aid == userInfo.aid" class="follow-hide pointer" style="float:right">
                       <span v-if="item.hidden">已隐藏</span>
-                      <span v-else  @click="emitHide(item.id)">  <svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>隐藏 </span>
+                      <span class="span_hidden" v-else  @click="emitHide(item.id)">  
+                        <!-- <svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon> -->
+                         <div class="is_hidden"></div>
+                        隐藏 </span>
                     </span>
                   </p>
                   <div class="case-info-cont">
@@ -136,6 +139,22 @@
   </script>
 
   <style lang="scss" scoped>
+  .span_hidden{
+    display: flex;
+    &:hover{
+      .is_hidden{
+        background: url('../../assets/images/case/Frame(12).png');
+        background-size: 100%;
+      }
+    }
+    .is_hidden{
+      width: 18px;
+      height: 18px;
+      background: url('../../assets/images/case/Frame(5).png');
+      background-size: 100%;
+      margin-right: 10px;
+    }
+  }
     .sign-text{
       color: #666666;
       font-size: 14px;

src/components/PdfPreview/index.vue

@@ -6,7 +6,7 @@
       <span v-else style="margin:0 10px;">{{ currentPage }} / {{ pageCount }}</span>
       <el-button @click="nextPage('header')" :disabled="loadedRatio !== 1" icon="el-icon-arrow-right"></el-button>
     </div>
-    <div class="pdf-box">
+    <div class="pdf-box" style="max-height: 725px;">
       <transition name="progress"> 
         <el-progress v-if="showProgress" :percentage="Math.floor(loadedRatio * 100)" :text-inside="true" :show-text="false"></el-progress>
       </transition>

src/components/Portal/authorInfo.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="item-author">
-		<div  @click="toHome()">
+		<div  v-if="userName" @click="toHome()">
       <!-- <el-avatar shape="square" size="small" :src="userAvatar" v-if="userAvatar"></el-avatar> -->
       <!-- <div v-else class="uavatar"><span class="uavatar-text">{{avatarText}}</span></div> -->
       <el-avatar shape="circle" size="small" :src="userAvatar" v-if="userAvatar"></el-avatar>
@@ -12,9 +12,10 @@
         </div>
         </div>
     </div>
-		<div v-if="!onlyAvatar" style="padding-left: 14px;padding-top: 6px;font-size: 14px;">
+		<div v-if="!onlyAvatar&&userName" style="padding-left: 14px;padding-top: 6px;font-size: 14px;">
       <span style="color: #333333;font-weight: 600;font-size: 16px;">{{userName}}</span>
       <span class="author-text" v-if="userInfo && userInfo!=''"> {{userInfo}} </span>
+      <span style="margin-left: 15px;" class="comWords" v-if="authorTags.length != 0" v-for="tag in authorTags">{{tag}}</span>
     </div>
     <slot />
 	</div>
@@ -49,6 +50,12 @@
       onlyAvatar:{
         type:Boolean,
         default:false
+      },
+      authorTags: {
+        type:Array,
+        default(){
+          return []
+        }
       }
 		},
     data(){
@@ -119,6 +126,14 @@
       font-weight: 300;
       margin-left: 4px;
     }
+    .comWords {
+      background: #409EFF;
+      border-radius: 2px;
+      font-weight: 400;
+      font-size: 12px;
+      color: #FFFFFF;
+      padding: 4px 10px;
+    }
     .uavatar{
       // border: 1px solid #73adfe;
       width: 28px;

src/components/Portal/comments.vue

@@ -92,11 +92,19 @@
                       <div class="comment-btns">
 
                          <!-- <a><svg-icon icon-class="like"></svg-icon><span>66</span></a> -->
-                         <div v-show="btnsShowRowId==com.id">
+                         <div style="display: flex" v-show="btnsShowRowId==com.id">
 
-                           <a @click="showReply(com)"><svg-icon icon-class="comment" style="margin-right: 0px;font-size: 16px;"></svg-icon><span>回复</span></a>
+                           <a style="display: flex;align-items: center;" @click="showReply(com)">
+                            <!-- <svg-icon icon-class="comment" style="margin-right: 0px;font-size: 16px;"></svg-icon> -->
+                              <div class="is_comment"></div>
+                              <span>回复</span> 
+                           </a>
                            <!--必须当前登录人是一个人-->
-                           <a v-if="userInfo.aid==com.sysCreateAid" @click="delCommnet(com,comIdx)"><svg-icon icon-class="remove" style="margin-right: 0px;font-size: 16px;"></svg-icon><span>删除</span></a>
+                           <a style="display: flex;align-items: center;" v-if="userInfo.aid==com.sysCreateAid" @click="delCommnet(com,comIdx)">
+                            <!-- <svg-icon icon-class="remove" style="margin-right: 0px;font-size: 16px;"></svg-icon> -->
+                             <div class="is_remove"></div>
+                            <span>删除</span>
+                           </a>
                            <a v-if="com.replyList && com.replyList.length==5" @click="showMoreReply(com)" ><svg-icon icon-class="all" style="margin-right: 0px;font-size: 16px;"></svg-icon><span>全部</span></a>
                          </div>
                       </div>
@@ -960,6 +968,28 @@
         line-height: 35px;
         a{
           margin-right:15px;
+          &:hover{
+            .is_comment{
+              background: url('../../assets/images/case/Frame(9).png');
+              background-size: 100%;
+            }
+            .is_remove{
+              background: url('../../assets/images/case/Frame(15).png');
+              background-size: 100%;
+            }
+          }
+          .is_comment{
+            width: 16px;
+            height: 16px;
+            background: url('../../assets/images/case/Frame.png');
+            background-size: 100%;
+          }
+          .is_remove{
+            width: 16px;
+            height: 16px;
+            background: url('../../assets/images/case/Frame(8).png');
+            background-size: 100%;
+          }
           span{
             margin-left: 6px;
             color: #8590A6;

src/components/Portal/interactBar.vue

@@ -10,7 +10,8 @@
         <el-tooltip  effect="light" :content="type == 4 || type == 5 ?'回答':'回复'" placement="left" :visible-arrow="false" popper-class="text-tooltip">
           <!-- <svg-icon style="margin-right: 0;"  icon-class="comment"></svg-icon> -->
          <!-- <img style="width:16px;height:14px;vertical-align: middle;" :src="require('@/assets/images/icon/answers.png')"> -->
-         <svg-icon style="margin-right: 0;font-size: 14px;" icon-class="comment"></svg-icon>
+         <!-- <svg-icon style="margin-right: 0;font-size: 14px;" icon-class="comment"></svg-icon> -->
+         <div class="is_comment"></div>
         </el-tooltip>
         <span class="interact-bar-value"> {{ data.answers? data.answers:0}}</span>
       </div>
@@ -23,14 +24,16 @@
       </div>
       <div v-if="comments" class="interact-bar-btn" :style="`min-width: ${nodeWidth};`" :class="{cursor:!readonly}">
         <el-tooltip  effect="light" content="评论" placement="left" :visible-arrow="false" popper-class="text-tooltip">
-          <svg-icon style="margin-right: 0;font-size: 14px;" icon-class="comment"></svg-icon>
+          <!-- <svg-icon style="margin-right: 0;font-size: 14px;" icon-class="comment"></svg-icon> -->
+           <div class="is_comment"></div>
         </el-tooltip>
         <span class="interact-bar-value"> {{data.comments? data.comments:0}}</span>
       </div>
 
       <div v-if="praises" @click="addPraise()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
         <el-tooltip effect="light" content="点赞" placement="top" :visible-arrow="false" popper-class="text-tooltip">
-          <svg-icon style="margin-right: 0;font-size: 14px;" :icon-class="isPraise?'praised':'like'"></svg-icon>
+          <!-- <svg-icon style="margin-right: 0;font-size: 14px;" :icon-class="isPraise?'praised':'like'"></svg-icon> -->
+           <div class="is_praise" :class="isPraise?'is_praise_a':'is_praise'"></div>
         </el-tooltip>
         <span class="interact-bar-value"> {{ data.praises? data.praises:0}}</span>
       </div>
@@ -38,19 +41,22 @@
       <div v-if="favorites"  @click.stop="addFavorite()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
         <el-tooltip effect="light" content="收藏" placement="top" :visible-arrow="false" popper-class="text-tooltip">
           <svg-icon v-if="courseExclusive" style="font-size: 32px;margin-right: 0;" :icon-class="isFavorite?'collectedCourse':'collectionCourse'"></svg-icon>
-          <svg-icon v-else style="margin-right: 0;" :style="{'font-size':(size+2)+'px'}" :icon-class="isFavorite?'scactive2':'xihuan'"></svg-icon>
+          <!-- <svg-icon v-else style="margin-right: 0;" :style="{'font-size':(size+2)+'px'}" :icon-class="isFavorite?'scactive2':'xihuan'"></svg-icon> -->
+           <div v-else class="is_favorite" :class="isFavorite?'is_favorite_a':'is_favorite'"></div>
         </el-tooltip>
         <span v-if="!courseExclusive" class="interact-bar-value"> {{ data.favorites? data.favorites:0}}</span>
       </div>
       <div v-if="shares" @click="addShare()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
         <el-tooltip effect="light" content="分享" placement="top" :visible-arrow="false" popper-class="text-tooltip">
-          <svg-icon icon-class="share" style="margin-right: 0;" :style="{'font-size':(size+2)+'px'}"></svg-icon>
+          <!-- <svg-icon icon-class="share" style="margin-right: 0;" :style="{'font-size':(size+2)+'px'}"></svg-icon> -->
+           <div class="is_share"></div>
         </el-tooltip>
         <span class="interact-bar-value"> {{data.shares}}</span>
       </div>
       <div v-if="views" style="cursor: default;" :style="`min-width: ${nodeWidth};margin-left:${data.views>1000? '20px':'20px'}`" class="interact-bar-btn ese-view" :class="{cursor:!readonly}">
         <el-tooltip effect="light" content="浏览量" placement="top" :visible-arrow="false" popper-class="text-tooltip">
-          <svg-icon style="margin-right: 0; font-size:22px;" icon-class="eyes"></svg-icon>
+          <!-- <svg-icon style="margin-right: 0; font-size:22px;" icon-class="eyes"></svg-icon> -->
+           <div class="is_view"></div>
         </el-tooltip>
         <!-- <div style="float:right;margin-left:8px"> -->
         <span  class="interact-bar-value eyes-view" > {{ formatNum(data.views)}}</span>
@@ -530,6 +536,7 @@ export default {
             this.$store.dispatch("unicomFavorites",false)
           }
           this.$message({message:'已取消收藏',type:'success'});
+          this.$emit('deleteFavorite',true)
           //this.$emit('addFavorite',res.result);//添加收藏,如果是true代表添加成功，false代表已存在
         }else{
           console.log('取消收藏失败：'+res.message);
@@ -713,6 +720,77 @@ export default {
     justify-content: flex-end;
     .interact-bar-btn {
       margin: 0 0 0 15px;
+      display: flex;
+      justify-content: end;
+      align-items: center;
+      &:hover{
+        .is_praise{
+          background: url('../../assets/images/case/Frame\(10\).png');
+        }
+        .is_favorite{
+          background: url('../../assets/images/case/Frame\(11\).png');
+          background-size: 100%;
+        }
+        .is_share{
+          background: url('../../assets/images/case/Frame\(14\).png');
+          background-size: 100%;
+        }
+        .is_view{
+          background: url('../../assets/images/case/Frame\(12\).png');
+        background-size: 100%;
+        }
+        .is_comment{
+          background: url('../../assets/images/case/Frame\(9\).png');
+          background-size: 100%;
+        }
+      }
+      .is_comment{
+        width: 16px;
+        height: 16px;
+        background: url('../../assets/images/case/Frame.png');
+        background-size: 100%;
+        margin-right: 4px;
+      }
+      .is_view{
+        width: 17px;
+        height: 17px;
+        background: url('../../assets/images/case/Frame\(5\).png');
+        background-size: 100%;
+        margin-right: 4px;
+      }
+      .is_share{
+        width: 16px;
+        height: 16px;
+        background: url('../../assets/images/case/Frame\(7\).png');
+        background-size: 100%;
+        margin-right: 4px;
+      }
+      .is_praise{
+        width: 14px;
+        height: 14px;
+        background: url('../../assets/images/case/Frame\(1\).png');
+        margin-right: 4px;
+      }
+      .is_praise_a{
+        width: 14px;
+        height: 14px;
+        background: url('../../assets/images/case/Frame\(10\).png');
+        margin-right: 4px;
+      }
+      .is_favorite{
+        width: 16px;
+        height: 16px;
+        background: url('../../assets/images/case/Frame\(2\).png');
+        background-size: 100%;
+        margin-right: 4px;
+      }
+      .is_favorite_a{
+        width: 16px;
+        height: 16px;
+        background: url('../../assets/images/case/Frame\(11\).png');
+        background-size: 100%;
+        margin-right: 4px;
+      }
     }
     .interact-bar-value{
       //  color:#6E7B84; ui图给的颜色，但是效果于ui图效果不一样，也没有透明度，所以找一个相近的和谐的颜色

src/components/PortalHeader.vue

@@ -6,7 +6,7 @@
             <img src="../assets/logo/logo-white.png" v-if="textColor == '#fff' || textColor == '#ffffff'" style="width:160px;height: 27px;" />
             <img src="../assets/logo/logo.png" v-else style="width:160px;height: 27px;" />
           </div>
-          <div class="portal-top-nav">
+          <div class="portal-top-nav" v-if="userInfo.role === 1">
             <div class="top-nav" :style="{color:textColor}" :class="current == 'index' ? activeNav : ''">
               <router-link to="/index" >首页
                 <div :class="current == 'index' ? 'nav-bottbor' : ''"></div>
@@ -36,7 +36,8 @@
               <el-dropdown placement="bottom" @command="handleCommand">
                 <span class="el-dropdown-link" style="font-size:16px;cursor: pointer;" :style="{color:textColor}">专区</span>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item command="one">BOE系列公开课</el-dropdown-item>
+                  <el-dropdown-item command="zero">热点论坛</el-dropdown-item>
+                  <el-dropdown-item command="one" divided>BOE系列公开课</el-dropdown-item>
                   <el-dropdown-item command="two" divided>Grow180</el-dropdown-item>
                   <el-dropdown-item command="three" divided>管理者进阶</el-dropdown-item>
                   <el-dropdown-item command="four" divided>U选小课堂</el-dropdown-item>
@@ -50,7 +51,8 @@
               <el-dropdown placement="bottom" @command="handleContributor">
                 <span class="el-dropdown-link" style="font-size:16px;cursor: pointer;" :style="{color:textColor}">贡献者大会</span>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item command="one">2023</el-dropdown-item>
+                  <el-dropdown-item command="three">2024</el-dropdown-item>
+                  <el-dropdown-item command="one" divided>2023</el-dropdown-item>
                   <el-dropdown-item command="two" divided>2022</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
@@ -65,7 +67,7 @@
           </div>
         </div>
         <div class="portal-top-right">
-          <div  v-if="goSearch !=10" style="position: relative;">
+          <div  v-if="goSearch !=10 && userInfo.role === 1" style="position: relative;">
             <el-input class="portal-input" v-show="!hideSearch" placeholder="搜索全部" style="border-radius: 20px !important; " @keyup.enter.native="searchJump()" clearable maxlength="50" v-model="keyword" >
               <el-select v-if="current == 'index'"  v-model="findType" style="width: 75px; border-radius:20px !important;" slot="prepend" placeholder="请选择">
                 <el-option label="课程" value="1"></el-option>
@@ -208,6 +210,7 @@ export default {
     this.sex = this.userInfo.sex;
     this.$store.dispatch('refrashMsg');
     this.loadBoeData();
+    // console.log('this.userInfo::',this.userInfo)
     //this.loadPopupConfig();
   },
   methods: {
@@ -244,6 +247,7 @@ export default {
       let obj = {
           one: urlPre + "/web/contributornew/index",
           two: urlPre + "/web/contributor/index",
+          three: urlPre + "/web/contributor_2024/index"
         };
         window.open(obj[val]);
     },
@@ -255,6 +259,7 @@ export default {
         let urlPre = window.location.protocol + "//" + window.location.host;
         // process.env.VUE_APP_BOE_WEB_URL
         let obj = {
+          zero: urlPre + "/pc/hotforum",
           one: urlPre + "/web/teacherLesson",
           two: urlPre + "/grow180/login",
           three: this.webBaseUrl + "/study/index?study=1",

src/components/Study/manager.vue

@@ -13,7 +13,7 @@
     </div>
     <!-- <div style="color: red;">下面的表格标题及内容需要调整完善</div> -->
     <div>
-      <el-tabs v-model="tabName" @tab-click="handleTabClick">
+      <el-tabs style="width: 100%;" v-model="tabName" @tab-click="handleTabClick">
         <el-tab-pane label="报名管理" name="second">
           <!-- <div>已报名{{study.list.length}}人，共有0人报名未成功，共有{{study.list.length}}人通过审核</div> -->
           <el-row style="margin: 20px 0;" :gutter="20">
@@ -95,9 +95,9 @@
             <el-col :offset="12" :span="4">
               <div class="grid-content bg-purple">
                 <el-select v-model="learningRecords.status" clearable placeholder="状态">
-                  <el-option label="已完成" :value="9"></el-option>
                   <el-option label="未开始" :value="1"></el-option>
-                  <el-option label="进行中" :value="8"></el-option>
+                  <el-option label="进行中" :value="2"></el-option>
+                  <el-option label="已完成" :value="9"></el-option>
                 </el-select>
               </div>
             </el-col>
@@ -192,7 +192,7 @@
               </el-table-column>-->
               <el-table-column label="学习人员" width="110">
                 <template slot-scope="scope">
-                  <el-button size="mini" type="info" @click="getCatalogue(scope.row,scope.row.contentName)" >学习人员</el-button>
+                  <el-button size="mini" type="info" @click="getCatalogue(scope.row,scope.row.contentType)" >学习人员</el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -260,8 +260,8 @@
               </el-table-column>
               <el-table-column prop="status" label="状态">
                 <template slot-scope="scope">
-                  <span v-if="scope.row.contentName.split('--')[1]=='考试'">{{scope.row.status == 9? '已完成':scope.row.status == 2?'进行中':'未开始'}}</span>
-                  <span v-else>{{scope.row.status == 9? '已完成':'未开始'}}</span>
+                  <!-- <span v-if="scope.row.contentName.split('--')[1]=='考试'">{{scope.row.status == 9? '已完成':scope.row.status == 2?'进行中':'未开始'}}</span> -->
+                  <span>{{scope.row.status == 9? '已完成':scope.row.status == 2?'进行中':'未开始'}}</span>
                 </template>
               </el-table-column>
               <el-table-column prop="duration" label="进度">
@@ -285,12 +285,14 @@
         <el-form-item label="状态:">
           <el-select v-model="learningSituation.status" clearable placeholder="状态">
             <el-option label="未开始" :value="1"></el-option>
-            <el-option label="已开始" :value="2"></el-option>
+            <el-option label="进行中" :value="3"></el-option>
+            <el-option label="已完成" :value="2"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="studyContentRecords">搜索</el-button>
+          <el-button type="primary" @click="studyContentRecordsSearch">搜索</el-button>
         </el-form-item>
+        <el-button v-if="isHomeWork" :disabled="isTrue" style="padding:10px 15px;margin-bottom: 10px;" type="primary" @click="downLoad">导出全部作业</el-button>
       </el-form>
       <el-table max-height="500" border :data="learningSituation.list" style="width: 100%">
         <el-table-column prop="aname" label="姓名" width="180"></el-table-column>
@@ -334,6 +336,8 @@ import apiCoursePortal from "@/api/modules/coursePortal.js";
 import { mapGetters,mapActions } from 'vuex';
 import apiUser from '@/api/system/user.js';
 import apiStudy from '@/api/modules/courseStudy.js';
+import { getToken } from '@/utils/token'
+import axios from 'axios'
 export default {
   components: {auditCourse1,auditCourse2},
   computed: {
@@ -343,11 +347,18 @@ export default {
     manageStudyData: {
       type: Object,
       default: () => ({})
+    },
+    isShowDialog:{
+      type: Boolean,
+      default: false
     }
   },
   data() {
     return {
+      downParams: {},
       typePress: false,
+      isHomeWork: false,
+      isTrue: false,
       catalogRecordTree:[],
       catalogRecordList:[],
       resOwnerListMap:[],
@@ -371,7 +382,9 @@ export default {
         pageSize: 10, // 每页多少条
         count: 0,
         type: "",
-        list: []
+        list: [],
+        status: '',
+        name: '',
       },
       learningRecords: {
         pageIndex: 1, //第几页
@@ -408,6 +421,21 @@ export default {
         this.getDetail();
       }
      }
+    },
+    'study.catalogueShow'(val){
+      if(!val){
+        this.learningSituation.status = null
+        this.learningSituation.name = ''
+      }
+    },
+    isShowDialog(val){
+      if(!val){
+        this.signup.status = null
+        this.signup.name = ''
+        this.learningRecords.status = null
+        this.learningRecords.name = ''
+        this.value = ''
+      }
     }
   },
   mounted() {
@@ -479,6 +507,10 @@ export default {
         }
       });
     },
+    studyContentRecordsSearch(){
+      this.learningSituation.pageIndex = 1;
+      this.studyContentRecords()
+    },
     // 资源里的学习详情
     studyContentRecords() {
       let params = {
@@ -489,6 +521,7 @@ export default {
         pageIndex: this.learningSituation.pageIndex,
         pageSize: this.learningSituation.pageSize
       };
+      this.downParams = params;
       apicourseStudy.studyContentRecords(params).then(res => {
         if (res.status === 200) {
           this.learningSituation.list = res.result.list;
@@ -498,6 +531,77 @@ export default {
         }
       });
     },
+    downLoad(){
+      if(this.learningSituation.list.length == 0){
+        this.$message.warning('暂无数据');
+        return
+      }
+      this.isTrue = true;
+      let params = {
+        courseName:this.manageStudyData.name,
+        courseId: this.manageStudyData.id,
+        status: this.downParams.status || '',
+        name: this.downParams.name || '',
+        contentId: this.contentId,
+      }
+      // window.open(`/systemapi/xboe/m/course/portal/export?contentId=${params.contentId}&courseName=${params.courseName}&courseId=${params.courseId}&status=${params.status}&name=${params.name}`)
+      const url = `/systemapi/xboe/m/course/portal/export?contentId=${params.contentId}&courseName=${params.courseName}&courseId=${params.courseId}&status=${params.status}&name=${params.name}`
+      axios({
+          method: 'get',
+          url: url,
+          // responseType: 'blob',
+          headers: { 'X-Access-Token': getToken() }
+        }).then((res) => {
+          this.isTrue = false;
+          if(res.data.status == 200){
+            if(res.data.result.includes('upload')){
+              window.open('/upload'+res.data.result.split('upload')[1])
+            }else{
+              this.$message.warning(res.data.result)
+            }
+          }
+        }).catch(err=>{
+          this.isTrue = false;
+          this.$message.error(err.response.data.message)
+        })
+      // axios({
+      //     method: 'get',
+      //     url: url,
+      //     responseType: 'blob',
+      //     headers: { 'X-Access-Token': getToken() }
+      //   }).then((response) => {
+      //       if (response.status === 200) {
+      //         this.isTrue = false;
+      //         if (!(response.headers['content-type']).startsWith('application/json')) {
+      //           this.resolveBlob(response, 'application/zip', `${params.courseName}【作业】`);
+      //         } else {
+      //           console.log(response,'response')
+      //           const reader = new FileReader();
+      //           reader.onload = (e) => {
+      //             const errorData = JSON.parse(e.target.result)
+      //             this.$message.error(errorData.result)
+      //           };
+      //           reader.readAsText(response.data);
+      //         }
+      //       }
+      //     }).catch((error) => {
+      //       this.isTrue = false;
+      //       // 错误处理
+      //       console.log(error);
+      //       this.$message.error(error.data ? error.data.message : error.toString());
+      //     });
+    },
+    resolveBlob(res, mimeType,filename) {
+      const link = document.createElement('a');// 创建a标签
+      let blob = new Blob([res.data], { type: mimeType }); // 设置文件类型
+      link.style.display = "none";
+      link.href = URL.createObjectURL(blob); // 创建URL
+      link.setAttribute("download", `${filename}`);
+      document.body.appendChild(link);
+      link.click();
+      URL.revokeObjectURL(link.href);
+      document.body.removeChild(link);
+    },
     handleSizeChangeSituation(val) {
       this.learningSituation.pageSize = val;
       this.learningSituation.pageIndex = 1;
@@ -696,10 +800,15 @@ export default {
       this.getSignupList();
     },
     getCatalogue(row,type) {
-      if(type=='考试'){
+      if(type==61){
         this.typePress = true
       }else{
-        this.typePress = false
+        this.typePress = true
+      }
+      if(type == 60){
+        this.isHomeWork = true
+      }else{
+        this.isHomeWork = false
       }
       this.contentId = row.id;
       this.study.catalogueShow = true;
@@ -754,4 +863,19 @@ export default {
   height: 400px;
   overflow: auto;
 }
+
+.el-tabs__nav-wrap::after {
+  display: none; /* 隐藏滚动条轨道 */
+}
+
+.el-tabs__nav-scroll {
+  overflow: hidden; /* 隐藏滚动条滑块 */
+}
+
+/* 隐藏垂直滚动条 */
+.el-table .el-table__body-wrapper::-webkit-scrollbar {
+  display: none; /* Chrome, Safari, Opera*/
+}
+
+
 </style>

src/components/UserCenter/menu.vue

@@ -14,7 +14,7 @@
         :default-active="activeMenu"
         router
         active-text-color="#3379FB"
-        :default-openeds="['manageTodo','manageFinish','teacherTodo','teacherFinish','lecturer','myqa','notice','mystudy', 'course', 'exam', 'u001', 'u002', 'u003', 'u004','mylecnotes','mycaseRecord']"
+        :default-openeds="['manageTodo','manageFinish','teacherTodo','teacherFinish','lecturer','myqa','notice','mystudy','myGrowth', 'course', 'exam', 'u001', 'u002', 'u003', 'u004','mylecnotes','mycaseRecord']"
         class="el-menu-vertical"
         @open="handleOpen"
         @close="handleClose"
@@ -242,6 +242,20 @@
           <svg-icon :icon-class="activeMenu == '/user/medal'?'myxunzhang-active':'myxunzhang'"></svg-icon>
           <span slot="title">我的勋章</span>
       </el-menu-item>
+        <template v-if="showGrowthNav">
+          <el-submenu index="myGrowth" v-show="curIdentity == 1">
+            <template slot="title">
+              <!-- <i class="el-icon-s-grid"></i> -->
+              <img src="../../assets/images/myGrowth.jpg" style="width: 1em;height: 1em;margin-right: 8px;"></img>
+              <span>我的必修</span>
+            </template>
+            <el-menu-item index="/growth/growthPage">
+              <!-- <i class="el-icon-menu"></i> -->
+              <span slot="title" class="study textl">专业力必修</span>
+            </el-menu-item>
+          </el-submenu>
+        </template>
+
         <el-submenu index="mystudy" v-show="curIdentity == 1">
           <template slot="title">
             <!-- <i class="el-icon-s-grid"></i> -->
@@ -385,6 +399,7 @@ import { mapGetters } from 'vuex';
 import apicourseStudy from "../../api/modules/courseStudy.js"
 import {pageList} from "@/api/modules/lecturer"
 import courseImage from "@/components/Course/courseImage.vue"
+import { listData } from "@/api/growth/growthpath"
 import testUser from '@/utils/testUsers.js'
 export default {
   name: 'UcMenu',
@@ -413,7 +428,8 @@ export default {
       isCollapse: false,
       lastStudy:{},
       overlayShow: false,
-      instructor:0
+      instructor:0,
+      showGrowthNav: false
     };
   },
   created() {
@@ -422,6 +438,11 @@ export default {
     this.getLastStudy();
     //获取讲师认证中条数
     this.instructorCertification()
+    console.log(this.userInfo,'userInfouserInfo')
+    //如果专业力必修没有学习任务则隐藏“我的必修按钮”
+    listData().then(res => {
+      this.showGrowthNav = !!res.data.length
+    })
   },
   mounted() {
     //console.log(this.userInfo.loginName,'this.userInfo.loginName');

src/components/VideoPlayer/index.vue

@@ -18,7 +18,6 @@
       @keydown.right.prevent="forwardCurrentTime"
       @keydown.up.prevent="increaseVolume"
       @keydown.down.prevent="lowerVolume"
-      @keydown.esc.prevent="toggleFullScreen"
       tabindex="0"
       width="100%"
       height="100%"
@@ -40,12 +39,12 @@
             :isPlaying="isPlaying"
             :biBarrageXml="biBarrageXml"
     />
-    <!-- 加载动画 -->
-    <div v-show="isShowLoading  && isCrowd && isShowPlayer" class="player-loading" @click="videoDom.focus({preventScroll: true})">
+    <!-- 加载动画(应该当前视频没有缓存时显示加载动画)   && isCrowd && isShowPlayer -->
+    <div v-show="isShowLoading" class="player-loading" @click="videoDom.focus({preventScroll: true})">
       <img src="@/components/VideoPlayer/images/loading.svg"  alt="loading"/>
     </div>
     <!-- 控制栏 -->
-    <div v-show="!isShowLoading && isCrowd" class="player-controls-container" @click="videoDom.focus({preventScroll: true})">
+    <div v-show="isCrowd" class="player-controls-container" @click="videoDom.focus({preventScroll: true})">
       <div v-show="isShowVolumeHint" class="player-volumeHint">
         <span class="player-volumeHint-text">当前音量:{{volumePercent}}%</span>
       </div>
@@ -71,6 +70,7 @@
       <div :class="{'player-controls': true, 'cursor-lasting-static': isCursorStatic}">
         <div class="player-progress-bar">
           <progressBar
+            :blobId="blobId"
             :currentProgress="currentProgress"
             v-on:updateProgress="updateProgressByClickBar"
             v-on:getMouseDownStatus="getMouseDownStatusOfProgressBar"
@@ -241,6 +241,11 @@ export default {
       type: String,
       default: null,
     },
+    // 视频链接对应的content Id
+    blobId: {
+      type: String,
+      default: null,
+    },
     // 主题色
     primaryColor: {
       type: String,
@@ -266,7 +271,7 @@ export default {
     },
     isDrag:{
       type: Boolean,
-      default: null,
+      default: true,
     },
     isCrowd:{
       type: Boolean,
@@ -312,6 +317,17 @@ export default {
     }
 
     setInterval(() => {
+          //console.log('this.currentProgress::',this.currentProgress,this.isDrag,this.videoDom.currentTime , this.videoDom.duration)
+          // 视频播放时本地记录视频实时播放时长,视频设置了禁止拖动时执行
+          if(!this.isDrag){
+            var time = localStorage.getItem('videoProgressData')
+            var arr = time&&JSON.parse(time) || {}
+            if(arr[this.blobId] < this.currentProgress || !arr[this.blobId]){
+              arr[this.blobId] = parseFloat((this.currentProgress).toFixed(8))
+              if(arr[this.blobId]) localStorage.setItem('videoProgressData',JSON.stringify(arr))
+            }
+          }
+
       // 定时更新进度条
       if (this.isPlaying && !this.isMousedownProgress) {
         this.currentProgress =
@@ -368,19 +384,38 @@ export default {
       console.log('\x1b[31m%s\x1b[0m','*****************加载失败**********')
     })
     // 监听全屏事件的变化，保存数据
-    window.addEventListener("fullscreenchange", () => {
+    window.addEventListener("F", () => {
       this.isFullscreen = this.isFullScreen();
     });
+    document.addEventListener('fullscreenchange',this.handleFullscreenChange);
+    document.addEventListener('webkitfullscreenchange',this.handleFullscreenChange );
+    // this.videoDom.addEventListener('keydown', function(e){
+    //   //console.log('\x1b[31m%s\x1b[0m','*****************加载失败**********')
+    //   console.log("video is exit");
+    //   if(e.key === "Escape"){
+    //     console.log("按键 退出全屏 执行")
+    //   }
+    // })
+
+    // this.videoDom.addEventListener("keydown", (e) => {
+    //   console.log("是否监听到");
+    //   if(e.keyCode == 27){
+    //     console.log("是否监听到 esc");
+    //     this.toggleFullScreen();
+    //   }
+    // });
   },
   methods: {
     //当视频由于需要缓冲下一帧而停止，解决一直计时的问题
     onWaiting(){
       console.log('触发了onWairing');
+      this.isShowLoading = true
       this.$emit('onPlayerPause', {})
     },
     //当音频/视频在已因缓冲而暂停或停止后已就绪时
     onPlaying(){
       console.log('触发缓存结束onPlaying');
+      this.isShowLoading = false
       if(this.videoDom.paused){
         this.$emit('onPlayerPause', {})
       }else{
@@ -471,6 +506,13 @@ export default {
     updateProgressBySetTime(newCurrentTime) {
       this.currentProgress = newCurrentTime / this.videoDom.duration;
     },
+    /* 点击进度条更新视频播放进度2
+    */
+    updateProgressByClickBar2(newCurrentTime,progressVideo) {
+      this.currentProgress = progressVideo;
+      this.barrageTimelineStart = newCurrentTime;
+      this.videoDom.currentTime = newCurrentTime;
+    },
     /* 提高视频音量
      */
     increaseVolume() {
@@ -521,6 +563,7 @@ export default {
     /* 切换“全屏”和“非全屏”模式
      */
     toggleFullScreen() {
+      console.log("toggleFullScreen 执行 ",this.isFullScreen())
       let element = this.$refs.area;
       if (!this.isFullScreen()) {
         if (element.requestFullscreen) {
@@ -577,6 +620,24 @@ export default {
       const currentTime = this.$refs.video.currentTime;
       this.$emit('onTimeUpdate', currentTime);
     },
+    /**
+     * 监听全屏变化
+     */
+    handleFullscreenChange() {
+      console.log("handleFullscreenChange gx this.isFullScreen()",this.isFullScreen())
+      console.log("handleFullscreenChange gx this.isFullscreen",this.isFullscreen)
+
+      if(this.isFullscreen){
+        this.isFullscreen = !!document.fullscreenElement;
+        if (!this.isFullscreen) {
+          // 退出全屏后的逻辑（如暂停视频、更新 UI 等）
+          console.log('ESC 已退出全屏 handleFullscreenChange',this.isFullscreen);
+          this.$emit('onFullscreen',false);//全屏
+        }
+      }
+
+
+    }
   },
   watch: {
     currentVolume: function () {

src/components/VideoPlayer/progress-bar.vue

@@ -38,6 +38,9 @@ export default {
     isDrag:{
       type: Boolean,
       default: true,
+    },
+    blobId:{
+      type: String,
     }
   },
   data() {
@@ -57,10 +60,12 @@ export default {
     window.addEventListener("mousemove", (e) => {
       if (this.is_mousedown_progress) {
         this.move(e);
+        e.preventDefault();
       }
     });
     window.addEventListener("mouseup", (e) => {
       this.up(e);
+      e.preventDefault();
     });
   },
   beforeDestroy() {
@@ -68,7 +73,7 @@ export default {
   },
   methods: {
     down(e) {
-      if(this.isDrag) {
+      // if(this.isDrag) {
         this.$emit("getMouseDownStatus", true);
         this.is_mousedown_progress = true;
         // 获取完整进度条的clientX（dom左上角）
@@ -76,30 +81,50 @@ export default {
         // 计算调整后的当前进度条的长度
         this.current_width_px = e.clientX - init_clientX;
         // 设置当前的播放进度（同时作用于当前进度条的样式）
-        let current =
-            (e.clientX - init_clientX) / this.dom_full.clientWidth;
+        let current = (e.clientX - init_clientX) / this.dom_full.clientWidth;
+        if(current>1) current = 1;
+        if(current<0) current = 0;
+        var time = localStorage.getItem('videoProgressData');
+        var arr = time&&JSON.parse(time) || {}
+        //console.log('down arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
+        // 禁止拖动
+        if(!this.isDrag && time && arr[this.blobId] < current) return;
+
         this.$emit("updateProgress", current);
-      }
-      
+      // }
+
     },
     move(e) {
-      if (this.is_mousedown_progress && this.isDrag) {
+      if (this.is_mousedown_progress) {
         let init_clientX = this.dom_full.getBoundingClientRect().left;
         this.current_width_px = e.clientX - init_clientX;
-        let current =
-          (e.clientX - init_clientX) / this.dom_full.clientWidth;
+        let current = (e.clientX - init_clientX) / this.dom_full.clientWidth;
+        if(current>1) current = 1;
+        if(current<0) current = 0;
+        var time = localStorage.getItem('videoProgressData');
+        var arr = time&&JSON.parse(time) || {}
+        //console.log('move arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
+        // 禁止拖动
+        if(!this.isDrag && time && arr[this.blobId] < current) return;
         this.$emit("updateProgress", current);
       }
     },
     up() {
-      if (this.is_mousedown_progress && this.isDrag) {
+      if (this.is_mousedown_progress) {
         // 标记鼠标不处于按下的状态了
         this.is_mousedown_progress = false;
         // 松开鼠标后，即调整进度条后，此时的进度（0-1）
-        let current =
-          this.current_width_px / this.dom_full.clientWidth;
-        this.$emit("updateProgress", current);
+        let current = this.current_width_px / this.dom_full.clientWidth;
+        if(current>1) current = 1;
+        if(current<0) current = 0;
+        var time = localStorage.getItem('videoProgressData');
+        var arr = time&&JSON.parse(time) || {}
+        //console.log('up arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
         this.$emit("getMouseDownStatus", false);
+        // 禁止拖动
+        if(!this.isDrag && time && arr[this.blobId] < current) return;
+        this.$emit("updateProgress", current);
+
       }
     },
   },
@@ -151,4 +176,4 @@ export default {
 .progress-bar:hover .progress-current::after {
   opacity: 1;
 }
-</style>
+</style>

src/data/pages.js

@@ -82,6 +82,9 @@ export const pages=[
     {title:'学习路径图',path:'path',component:'study/StudyPath',hidden:false},
     {title:'学习项目',path:'project',component:'study/StudyProject',hidden:false}
   ]},
+  {title:'我的必修',path:'/growth',hidden:false,children:[
+    {title:'专业力必修',path:'growthPage',component:'growth/index',hidden:false},
+  ]},
   {title:'个人中心',path:'/uc',hidden:false,children:[
     {title:'首页',path:'index',component:'StudyIndex',hidden:false}
   ]},

src/layout/components/AppMain.vue

@@ -6,7 +6,10 @@
         <!-- <div style="height: 20px;"></div> -->
       </div>
       <!-- width: 990px; -->
-      <div class="main-body" style="padding: 30px 20px;flex:1; background-color: #fff;margin-left: 20px;">
+      <div class="main-body" :style="{
+             backgroundColor: bgColor,
+             padding
+            }" style="flex:1; margin-left: 20px;">
         <!-- <div style="margin-bottom: 10px;padding:10px; border-bottom: 1px solid #dbdbdb;"> -->
           <!-- <el-breadcrumb separator-class="el-icon-arrow-right">
             <el-breadcrumb-item :to="{ path: '/uc/index' }"><i class="el-icon-arrow-right"></i>个人中心</el-breadcrumb-item>
@@ -15,10 +18,12 @@
         <!-- </div> -->
         <transition name="fade-transform" mode="out-in">
           <keep-alive :include="cachedViews">
-            <div style="background-color: #FFFFFF;min-height: 600px;padding-bottom: 50px;">
+            <div :style="{
+             backgroundColor: bgColor
+            }" style="min-height: 600px;padding-bottom: 50px;">
             <router-view :key="key" />
             </div>
-          </keep-alive>
+          </keep-alive> 
         </transition>
       </div>
     </div>
@@ -39,7 +44,14 @@ export default {
       return this.$route.meta.title;
     },
     key() {
+      console.log(this.$route)
       return this.$route.path
+    },
+    bgColor() {
+     return this.$route.path === "/growth/growthPage" ? "rgba(0,0,0,0)" : "#fff";
+    },
+    padding(){
+      return this.$route.path === "/growth/growthPage" ? "0" : "30px 20px";
     }
   }
 }

src/layout/components/TopNav/Index.vue

@@ -6,7 +6,7 @@
         <div class="xtop-logo">
           <router-link class="routerLink" to="/index"><img src="../../../assets/logo/logo-white.png" style="width:161px;height:27px;" /></router-link>
         </div>
-        <div class="xtop-nav">
+        <div class="xtop-nav" v-if="userInfo.role === 1">
           <div class="xtop-nav-item"><a :href="`${webBaseUrl}/index`">首页</a></div>
           <div class="xtop-nav-item"><a :href="`${webBaseUrl}/course`">课程</a></div>
           <div class="xtop-nav-item"><a :href="`${webBaseUrl}/case`">案例</a></div>

src/router/index.js

@@ -193,6 +193,20 @@ export const constantRoutes = [{
     name: 'caseDetail',
     meta: {title: '案例详情', keepAlive: true, icon: 'dashboard', noCache: false, affix: true},
   },
+  {
+    path: '/case/charts',
+    hidden: true,
+    component: (resolve) => require(['@/views/portal/case/Charts'], resolve),
+    name: 'caseCharts',
+    meta: {title: '排行榜', keepAlive: true, icon: 'dashboard', noCache: false, affix: true},
+  },
+  {
+    path: '/case/excellent',
+    hidden: true,
+    component: (resolve) => require(['@/views/portal/case/Excellent'], resolve),
+    name: 'caseExcellent',
+    meta: {title: '浏览量榜单', keepAlive: true, icon: 'dashboard', noCache: false, affix: true},
+  },
   {
     path: '/article',
     hidden: true,
@@ -320,6 +334,20 @@ export const constantRoutes = [{
     name: 'videotest',
     meta: {title: '课程视频测试', icon: 'dashboard', noCache: true, affix: true},
   },
+  {
+    path: '/hotforum',
+    hidden: true,
+    component: (resolve) => require(['@/views/hotforum/Index'], resolve),
+    name: 'hotforum',
+    meta: {title: '热点论坛', icon: 'dashboard', noCache: true, affix: true},
+  },
+  {
+    path: '/lexiang',
+    hidden: true,
+    component: (resolve) => require(['@/views/sso/lexiang'], resolve),
+    name: 'lexiang',
+    meta: {title: '单点登录', icon: 'dashboard', noCache: true, affix: true},
+  },
   {
     path: '/404',
     component: (resolve) => require(['@/views/error/404'], resolve),

src/security.js

@@ -24,16 +24,26 @@ router.beforeEach((to, from, next) => {
   }
 
   NProgress.start();
-
+  // console.log('whiteList::',whiteList,to.path)
   if (whiteList.indexOf(to.path) !== -1) {
     // 在免登录白名单，直接进入
     next()
   }else{
     if(getToken()){
       if(to.path === '/login'){
-        next({ path: process.env.VUE_APP_PUBLIC_PATH+'/index' })
+        // 如果是外部用户，把配置的路由跳转到个人中心
+        if(store.getters.userInfo.role === 2){
+          next({ path: process.env.VUE_APP_PUBLIC_PATH+'/uc/study/courses' })
+        }else{
+          next({ path: process.env.VUE_APP_PUBLIC_PATH+'/index' })
+        }
         NProgress.done();
       } else {
+        //console.log('store.getters.userInfo:',store.getters.userInfo.role)
+        // 如果是外部用户，把配置的路由跳转到个人中心
+        if(store.getters.userInfo.role === 2){
+          if(to.path === '/index' || to.path === '/course' || to.path === '/case' || to.path === '/article' ) location.href = '/pc/uc/study/task'
+        }
         //后续这里需要增加一定的控制
           if (!store.getters.init) {
             sessionStorage.removeItem(xpage.constants.localCaseFiltersKey);

src/store/modules/user.js

@@ -41,6 +41,11 @@ const user = {
             sessionStorage.setItem("curIdentity", iden);
         },
         SET_UserInfo: (state, uinfo) => {
+            // 内部用户和外部用户 测试外部企业ID：1811380709626150912  生产外部wyhgID：1811640937932288000
+            uinfo.role = uinfo.departId === "1811640937932288000"? 2 : 1;
+            // uinfo.role = uinfo.departFullName.indexOf('京东方科技集团股份有限公司')!=-1?1:2
+            //if(uinfo.name === '尹晓钦') uinfo.role = 2
+            // console.log('uinfo::',uinfo)
             state.info = uinfo
         },
         SET_PERMISSIONS: (state, permissions) => {

src/utils/xajax2.js

@@ -1,233 +0,0 @@
-import axios from 'axios'
-import qs from 'qs'
-import { Notification, MessageBox, Message } from 'element-ui'
-import store from '@/store'
-import { getToken } from '@/utils/token'
-import errorCode from '@/utils/errorCode'
-/**
- *request请求 axios.request(config)
- *requestJson请求 axios.request(config)
- *get请求 axios.get(url[, config])
- *post请求 axios.post(url[, data[, config]])
- *postJson请求 axios.post(url[, data[, config]])
- *put请求 axios.put(url[, data[, config]])
- *putJson请求 axios.put(url[, data[, config]])
- *patch请求 axios.patch(url[, data[, config]])
- *patchJson请求 axios.patch(url[, data[, config]])
- *delete请求 axios.delete(url[, config])
- */
-
-//const ReLoginUrl="/login";
-
-const ReLoginUrl=process.env.VUE_APP_LOGIN_URL;
-
-const TokenName='XBOE-Access-Token';
-/**axios.defaults.headers['Content-Type'] = 'application/x-www-form-urlencoded'**/
-//只是用于发送json对象数据时使用post,put,patch
-const jsonRequest=axios.create({
-  headers:{'Content-Type':'application/json;charset=utf-8'},
-  // axios中请求配置有baseURL选项，表示请求URL公共部分
-  baseURL: process.env.VUE_APP_BASE_API,
-  //超时
-  timeout: 60000,
-});
-//发送json对象的拦截器
-jsonRequest.interceptors.request.use(config => {
-  //是否需要设置 token
-  const isToken = (config.headers || {}).isToken === false
-  if (getToken() && !isToken) {
-     config.headers[TokenName] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-  }
-  return config
-}, error => {
-    console.log(error)
-    Promise.reject(error)
-})
-
-// 响应拦截器
-jsonRequest.interceptors.response.use(res => {
-
-    const code = res.data.status || 200;
-     if(code===200){
-         return res.data
-     }else{
-         if(code == 6001){ //针对于老系统的处理
-               store.dispatch('LogOut').then(() => {
-                  location.href = ReLoginUrl;
-               })
-         }else if(code === 401){
-               store.dispatch('LogOut').then(() => {
-                  location.href =  ReLoginUrl;
-               })
-         }else if(code === 402){
-               store.dispatch('LogOut').then(() => {
-                  location.href =  ReLoginUrl;
-               })
-         }else if(code===403){
-            var msg='当前操作没有权限';
-            Message({message: msg, type: 'error'});
-            return Promise.reject(new Error(msg))
-            //return res.data;
-         }else if(code===302){
-            location.href =  ReLoginUrl;
-         }else{
-            //Message({message: res.data.message, type: 'error'});
-            //console.log('err:' + res.data.error);
-            //return Promise.reject(new Error(res.data.message))
-            return res.data;
-         }
-     }
-  },
-  error => {
-    console.log('err' + error)
-    let { message } = error;
-    if (message == "Network Error") {
-      message = "网络异常，请稍后重试";
-    }
-    else if (message.includes("timeout")) {
-      message = "系统接口请求超时";
-      //location.href = this.webBaseUrl + ReLoginUrl;
-    }
-    else if (message.includes("Request failed with status code")) {
-      message = "系统接口" + message.substr(message.length - 3) + "异常";
-    }
-    Message({
-      message: message,
-      type: 'error',
-      duration: 5 * 1000
-    })
-    return Promise.reject(error)
-  }
-)
-
-//用于普通的发送请求
-const formRequest=axios.create({
-  headers:{'Content-Type':'application/x-www-form-urlencoded'},
-  // axios中请求配置有baseURL选项，表示请求URL公共部分
-  baseURL: process.env.VUE_APP_BASE_API,
-  //超时
-  timeout: 10000,
-})
-//发送json对象的拦截器
-formRequest.interceptors.request.use(config => {
-  //是否需要设置 token
-  const isToken = (config.headers || {}).isToken === false
-  if (getToken() && !isToken) {
-     config.headers[TokenName] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-  }
-  return config
-}, error => {
-    console.log(error)
-    Promise.reject(error)
-});
-formRequest.interceptors.response.use(res => {
-    const code = res.data.status || 200;
-     if(code===200){
-         return res.data
-     }else{
-         if(code == 6001){ //针对于老系统的处理，因为老系统是字符串，所以这里不使用三等于号
-               store.dispatch('LogOut').then(() => {
-                  location.href = ReLoginUrl;
-               })
-         }else if(code === 401){
-               store.dispatch('LogOut').then(() => {
-                  location.href = ReLoginUrl;
-               })
-         }else if(code === 402){
-               store.dispatch('LogOut').then(() => {
-                  location.href =  ReLoginUrl;
-               })
-         }else if(code===403){
-            var msg='当前操作没有权限';
-            Message({message: msg, type: 'error'});
-            return Promise.reject(new Error(msg))
-         }else if(code===302){
-            location.href = ReLoginUrl;
-         }else{
-            //Message({message: res.data.message, type: 'error'});
-            //console.log('err' + res.data.error);
-            //return Promise.reject(new Error(res.data.message))
-            return res.data;//返回给用户做业务处理
-         }
-     }
-  },
-  error => {
-    console.log('err' + error)
-    let { message } = error;
-    if (message == "Network Error") {
-      message = "网络异常，请稍后重试";
-    }
-    else if (message.includes("timeout")) {
-      message = "接口超时，请检查是否上传成功";
-      //location.href = this.webBaseUrl + ReLoginUrl;
-    }
-    else if (message.includes("Request failed with status code")) {
-      message = "系统接口" + message.substr(message.length - 3) + "异常";
-    }
-    Message({
-      message: message,
-      type: 'error',
-      duration: 5 * 1000
-    })
-    return Promise.reject(error)
-  }
-)
-
-//request请求
-const request=function(cfg){
-   if(cfg.data){
-      cfg.data=qs.stringify(cfg.data);
-   }
-};
-//requestJson请求
-const requestJson=jsonRequest.request;
-//get请求
-const get=formRequest.request;
-//post请求
-const post=function(url,data,config){
-   if(data){
-      data=qs.stringify(data);
-   }
-   return formRequest.post(url,data,config);
-}
-//post请求
-const postForm=function(url,data,config){
-   return formRequest.post(url,data,config);
-}
-//postJson请求
-const postJson=jsonRequest.post;
-//put请求
-const put=function(url,data,config){
-   if(data){
-      data=qs.stringify(data);
-   }
-   return formRequest.put(url,data,config);
-}
-//putJson请求
-const putJson=jsonRequest.put;
-//patch请求
-const patch=function(url,data,config){
-   if(data){
-      data=qs.stringify(data);
-   }
-   return formRequest.patch(url,data,config);
-}
-//patchJson请求
-const patchJson=jsonRequest.patch;
-//delete请求
-const del=formRequest.delete;
-
-
-export default {
-    request,
-    requestJson,
-    get,
-    post,
-    postJson,
-    put,
-    putJson,
-    patch,
-    patchJson,
-    del,
-    postForm
-}

src/views/Forward.vue

@@ -2,7 +2,7 @@
   <div class="box" :class="{ incl: url.includes('projectdetails') }">
     <portal-header style="background: #387DF7;" :hideSearch="true" textColor="#ffffff"></portal-header>
         <iframe :src="url" style="width: 100%;height: 100%;" frameborder="0" ref="iframe"></iframe>
-    <portal-footer></portal-footer>
+    <portal-footer v-if="isShowFooter"></portal-footer>
   </div>
 </template>
 <script>
@@ -16,7 +16,8 @@ import portalFooter from "@/components/PortalFooter.vue";
     data(){
       return {
        url: "",
-       boeUrl:process.env.VUE_APP_BOE_WEB_URL
+       boeUrl:process.env.VUE_APP_BOE_WEB_URL,
+       isShowFooter:true
       }
     },
     mounted() {
@@ -24,6 +25,10 @@ import portalFooter from "@/components/PortalFooter.vue";
       let to = this.$route.query.to;//跳转的地址，以 /开头的地址
       let urlPre=window.location.protocol+'//'+window.location.host;
       this.url=urlPre+to
+
+      if(to.includes('growthList')){
+        this.isShowFooter = false
+      }
       if(params){
          this.url=this.url+'?'+params;
       }

src/views/Login.vue

@@ -1,3 +1,4 @@
+<!--
 <template>
   <div class="login" :style="`background: url(${webBaseUrl}/temp/background.jpg) no-repeat`">
     <el-form :model="form" ref="form" :rules="rules">
@@ -24,7 +25,7 @@
       <el-form-item>
         <section>
           <el-checkbox v-model="rememberMe">记住密码</el-checkbox>
-          <!-- <span>忘记密码</span> -->
+          &lt;!&ndash; <span>忘记密码</span> &ndash;&gt;
         </section>
       </el-form-item>
       <el-form-item><el-button type="primary" @click="loginSubmit">点击登录</el-button></el-form-item>
@@ -194,3 +195,4 @@
   }
 }
 </style>
+-->

src/views/case/ManageList.vue

@@ -32,6 +32,9 @@
           </div>
         </div>
       </div>
+      <div style="margin: 5px 0 0 5px;">
+        <el-button type="primary" @click="recoRanking">推荐榜单</el-button>
+      </div>
     </div>
     <el-table style="100%" :data="caseList" border stripe>
       <el-table-column label="标题" prop="title" show-overflow-tooltip>
@@ -49,6 +52,7 @@
       <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button-group>
+            <el-button style="margin:0 5px" type="text" v-if="scope.row.recommendRank === ''||scope.row.recommendRank === null" @click="suggest(scope.row)" icon="el-icon-medal">榜单推荐</el-button>
             <!-- <el-button type="text" @click="shareItem(scope.row)"  icon="el-icon-share" style="margin:0 5px">推荐</el-button> -->
             <el-button style="margin:0 5px" v-if="!scope.row.isTop && scope.row.confidentialityLevel == '内部'" type="text"
               @click="setTop(scope.row)" icon="el-icon-top">置顶</el-button>
@@ -56,8 +60,12 @@
               @click="setTop(scope.row)" icon="el-icon-bottom">取消置顶</el-button>
             <el-button type="text" icon="el-icon-medal"
               v-if="scope.row.filePath && scope.row.confidentialityLevel == '内部'"><span @click="cancal(scope.row)"
-                v-if="scope.row.excellent">取消最佳</span><span @click="open(scope.row)" v-else>最佳案例</span></el-button>
+                v-if="scope.row.excellent">取消最佳</span>
+                <!-- <span @click="open(scope.row)" v-else>最佳案例</span> -->
+                <span @click="theBest(scope.row)" v-else>最佳</span>
+              </el-button>
             <el-button style="margin:0 5px" type="text" @click="delItem(scope.row)" icon="el-icon-delete">删除</el-button>
+            <!-- <el-button style="margin:0 5px" type="text" @click="theBest(scope.row)" icon="el-icon-delete">最佳</el-button> -->
           </el-button-group>
         </template>
       </el-table-column>
@@ -121,16 +129,91 @@
       </div>
       <span slot="footer" class="dialog-footer"><el-button @click="recommend.dlgShow = false">关闭</el-button></span>
     </el-dialog>
+    <el-dialog
+      title="最佳案例"
+      :visible.sync="bestValue"
+      width="36%">
+      <div class="best_card">
+        <div class="card_item">
+          <div class="card_title">
+            <i class="icon"></i>
+            <span class="text">年度</span>
+          </div>
+          <el-input style="width:190px" disabled v-model="bestYear" placeholder="请输入年度"></el-input>
+        </div>
+        <div class="card_item">
+          <div class="card_title">
+            <i class="icon"></i>
+            <span class="text">组织领域</span>
+          </div>
+          <el-input disabled v-model="bestOrg" placeholder="请输入组织领域"></el-input>
+        </div>
+        <div class="card_item">
+          <div class="card_title">
+            <span class="text">最佳理由</span>
+          </div>
+          <el-input type="textarea"
+            placeholder="请输入内容"
+            v-model="bestTextarea"
+            maxlength="200"
+            show-word-limit></el-input>
+        </div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="notBest">取 消</el-button>
+        <el-button type="primary" @click="parameBest">确 定</el-button>
+      </span>
+    </el-dialog>
+    <el-drawer
+      title="推荐榜单"
+      :visible.sync="RankingShow"
+      size="80%">
+      <div style="padding: 10px 20px 80px">
+        <el-table :data="tableData" border stripe>
+          <el-table-column
+            type="index"
+            width="50"
+            label="排序">
+          </el-table-column>
+          <el-table-column show-overflow-tooltip label="案例标题" prop="caseTitle"></el-table-column>
+          <el-table-column width="150px" label="作者名称" prop="caseAuthor"></el-table-column>
+          <el-table-column width="150px" label="上榜人" prop="caseAuthor"></el-table-column>
+          <el-table-column width="250px" label="上榜时间" prop="recommendRankPusTime"></el-table-column>
+          <el-table-column label="操作">
+            <template slot-scope="scope">
+              <el-button-group>
+                <el-button style="margin:0 5px" type="text" @click="handleNotRank(scope.row)" icon="el-icon-delete">取消推荐</el-button>
+                <el-button style="margin:0 5px" type="text" @click="moveUp(scope.row,scope.$index)" icon="el-icon-top">上移排序</el-button>
+                <el-button style="margin:0 5px" type="text" @click="moveDown(scope.row,scope.$index)" icon="el-icon-bottom">下移排序</el-button>
+              </el-button-group>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="rank_footer">
+        <el-button @click="closeDrawer" style="width: 130px;height:40px;margin-right: 30px;" type="default">取消</el-button>
+        <el-button @click="queryList" style="width: 130px;height:40px;margin-right: 15px;" type="primary">确定</el-button>
+      </div>
+    </el-drawer>
   </div>
 </template>
 
 <script>
 import apiCase from '@/api/modules/cases.js';
 import apiUser from '@/api/system/user.js'
+import apiType from "@/api/modules/type.js";
 export default {
   name: 'articleItems',
   data() {
     return {
+      adminList: [],
+      caseType: process.env.VUE_APP_CASE_TYPE,
+      RankingShow: false,
+      bestYear: '',
+      bestOrg: '',
+      bestId: '',
+      bestTextarea: '',
+      bestValue: false,
       excellent: false,
       queryObj: {
         pageIndex: 1,
@@ -139,6 +222,8 @@ export default {
         excellent: '',
       }, //查询对象
       caseList: [], //案例列表
+      tableData: [],
+      caseIds: '',
       count: 0,
       recommend: {
         dlgShow: false,
@@ -171,8 +256,153 @@ export default {
   },
   mounted() {
     this.getData();
+    this.getList();
+    apiType.treeList(1,Number(this.caseType ?? 155),1).then(res=>{
+      if(res.code == 200){
+        this.adminList = res.data.records;
+      }
+    })
+  },
+  watch:{
+    RankingShow(val){
+      if(val){
+        this.getList()
+      }
+    }
   },
   methods: {
+    orgDomainTranslate(code) { // 组织领域翻译
+      if (code == '') {
+        return
+      }
+      let name = '';
+      let data = this.adminList.find(item => {
+        return item.code == code;
+      });
+      if (data) {
+        name = data.name;
+      }
+      return name;
+    },
+    suggest(record){
+      if(this.tableData.length == 10){
+        this.$message.error('最多推荐10个')
+        return
+      }
+      this.$confirm('你确认要推荐此案例吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        apiCase.riseIntoRank({caseId:record.id}).then(res=>{
+          if(res.status == 200 ){
+            this.$message.success('推荐成功')
+            this.getData()
+            this.getList()
+          }
+        })
+      })
+    },
+    handleNotRank(record){
+      this.$confirm('你确认要取消推荐吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        apiCase.cancelRiseIntoRank({caseId:record?.caseId}).then(res=>{
+          if(res.status == 200){
+            this.$message.success('取消推荐成功')
+            this.getList()
+            this.getData()
+          }
+        }).catch(()=>{
+          this.$message.error('取消推荐失败')
+        })
+      })
+    },
+    moveUp(row,index){
+      console.log(row,index,'index')
+      if(index == 0){
+        this.$message.error('已经排到第一位了')
+        return
+      }
+      this.swapArray(this.tableData,index,index-1)
+    },
+    moveDown(row,index){
+      if(index == this.tableData.length - 1){
+        this.$message.error('已经排到最后一位了')
+        return
+      }
+      this.swapArray(this.tableData,index,index+1)
+    },
+    swapArray(arr, index1, index2){
+      const temp = arr[index1];
+      arr.splice(index1, 1);
+      arr.splice(index2, 0, temp);
+    },
+    getList(){
+      apiCase.getQueryRecommendRank({pageSize:10}).then(res=>{
+        console.log(res,'res')
+        if(res.status == 200){
+          this.tableData = res.result
+          this.caseIds = res.result.map(item=>item.caseId).join(',')
+        }
+      })
+    },
+    notBest(){
+      this.bestValue = false
+      this.bestYear = ''
+      this.bestOrg = ''
+      this.bestId = ''
+      this.bestTextarea = ''
+    },
+    parameBest(){
+      this.excellent = true;
+      let data = {
+        id: this.bestId,
+        excellent: this.excellent,
+        excellentReason: this.bestTextarea
+      }
+      apiCase.excellent(data).then(res=>{
+        if (res.status == 200) {
+            this.$message({
+              type: 'success',
+              message: '设置最佳案例成功!'
+            });
+            this.getData()
+          }else{
+            this.$message({
+              type: 'error',
+              message: res.message
+            });
+          }
+          this.notBest()
+      })
+    },
+    recoRanking(){
+      this.RankingShow = true
+    },
+    closeDrawer(){
+      this.RankingShow = false
+    },
+    queryList(){
+      if(this.caseIds != this.tableData.map(item=>item.caseId).join(',')){
+        apiCase.adjustRank({caseIds:this.tableData.map(item=>item.caseId).join(',')}).then(res=>{
+          if(res.status == 200){
+            this.$message({
+              message: '调整成功',
+              type: 'success'
+            })
+          }
+        }).catch(()=>{
+          this.$message({
+            message: '调整失败',
+            type: 'error'
+          })
+        })
+      }
+      this.RankingShow = false
+    },
     // 导出
     importList() {
       apiCase.exports(this.queryObj).then(res => {
@@ -211,6 +441,11 @@ export default {
               message: '取消成功!'
             });
             this.getData()
+          }else{
+            this.$message({
+              type: 'error',
+              message: res.message
+            });
           }
         })
       }).catch(() => {
@@ -354,6 +589,12 @@ export default {
           this.$message({ type: 'info', message: '已取消删除', offset: 50 });
         });
     },
+    theBest(item){
+      this.bestValue = true
+      this.bestId = item.id
+      this.bestOrg = this.orgDomainTranslate(item.orgDomainParent)
+      this.bestYear = item.sysCreateTime.split('-')[0]
+    },
     //添加推荐
     shareItem(item) {
       this.shareItemData = { ...item }
@@ -467,6 +708,48 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.rank_footer{
+  position: absolute;
+  bottom: 0;
+  right: 0;
+  width: 100%;
+  height: 80px;
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+  background: #fff;
+  padding-right: 20px;
+}
+::v-deep .el-dialog__header{
+  border-bottom: 1px solid #f0f0f1;
+}
+::v-deep .el-textarea__inner{
+  height: 100px !important;
+}
+.best_card{
+  .card_item{
+    display: flex;
+    justify-content: start;
+    margin-bottom: 20px;
+    .card_title{
+      width: 94px;
+      min-width: 94px;
+      display: flex;
+      align-items: center;
+      justify-content: end;
+      margin-right: 14px;
+      .icon{
+        width:8px;
+        height: 8px;
+        background: url('../../assets/images/asterisk.png') no-repeat;
+        background-size: 100%;
+      }
+      .text{
+
+      }
+    }
+  }
+}
 .article-status1 {
   padding: 3px;
   border: 1px dotted #1ea0fa;

src/views/course/Courseware.vue

@@ -149,7 +149,7 @@
                <el-checkbox v-model="deviceMobile" @change="isVisible(1)" label="移动端可见" border></el-checkbox>
                <el-checkbox v-model="devicePc" @change="isVisible(2)" label="pc端可见" border></el-checkbox>
             </div>
-            <file-upload scorm="zip" dir="files" @isFalse="isFalseChange" @isTrue="isTrueChange" :beforeMsg="needOrg" :showList="true" :value="imageShowUrl" :limit="5" @success="handleUploadSuccess" @remove="handleRemoveSuccess"></file-upload>
+            <file-upload scorm="zip" dir="files" :beforeMsg="needOrg" :showList="true" :value="imageShowUrl" :limit="5" @success="handleUploadSuccess" @remove="handleRemoveSuccess"></file-upload>
           </div>
 
         </div>
@@ -159,7 +159,7 @@
             <el-table-column prop="fileName" label="文件名称"></el-table-column>
             <el-table-column prop="name" label="课件名称">
               <template slot-scope="scope">
-                <el-input type="text" maxlength="50" v-model="scope.row.name"></el-input>
+                <el-input type="text" v-model="scope.row.name"></el-input>
               </template>
             </el-table-column>
             <el-table-column prop="resType" label="类型" width="80">
@@ -169,8 +169,7 @@
             </el-table-column>
             <el-table-column prop="duration" label="时长(分)"  width="100">
               <template slot-scope="scope">
-                <!-- <el-input type="number" :stpe="1" min="0" size="small" step-strictly v-model="scope.row.minute"></el-input> -->
-                <el-input-number style="width: 78px;" :max="999" controls-position="right" size="small" :min="0" v-model="scope.row.minute" :step="1" step-strictly></el-input-number>
+                <el-input type="number" size="small" v-model="scope.row.minute"></el-input>
               </template>
             </el-table-column>
             <el-table-column label="可见性" width="100">
@@ -195,7 +194,7 @@
       <span slot="footer">
         <!-- <el-button type="infor" @click="isVisible(1)">移动端可见</el-button>
         <el-button type="infor" @click="isVisible(2)">pc端可见</el-button> -->
-        <el-button type="primary" @click="saveUpload()" :loading="isTrue">保存</el-button>
+        <el-button type="primary" @click="saveUpload()">保存</el-button>
       </span>
     </el-dialog>
     <el-dialog v-if="coursewareShow" title="预览课件" :close-on-click-modal="false" width="800px" :visible.sync="coursewareShow" custom-class="g-dialog">
@@ -281,8 +280,6 @@ export default {
   },
   data() {
     return {
-      isTrue: false,
-      isFalse: false,
       resOwnerListMap: [],
       //fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
       fileBaseUrl:this.$xpage.constants.fileBaseUrl, //获成动态获取的处理
@@ -395,12 +392,6 @@ export default {
     this.search();
   },
   methods: {
-    isTrueChange(val){
-      this.isTrue = val
-    },
-    isFalseChange(val){
-      this.isFalse = val
-    },
     beforeCheck(){
       if(!this.upload.orgId ||!this.upload.orgName){
           return false;
@@ -564,7 +555,7 @@ export default {
           // remark: 备注说明，可以为空，不填
         };
         //try {
-          coueseFile.saveUpload2(data).then(res=>{
+          coueseFile.saveUpload(data).then(res=>{
             if(res.status==200){
               //console.log('上传文件成功：'+rs.result.displayName);
               res.result.device1 = true;
@@ -573,18 +564,12 @@ export default {
               if(res.result.duration){
                 res.result.minute=Math.round(res.result.duration/60); //四舍五入
               }
-              if(res.result.duration==0){
-                this.$message.error('上传的视频时长不能为0，请手动编辑时长');
-              }
               this.fileList.push(res.result);
-              this.isTrue = false;
             }else{
               this.$message.error(res.message);
-              this.isFalse = false
             }
           }).catch (error=>{
             console.log(error,'error')
-            this.isFalse = false
             //this.$message.error(error);
           });
           // const { result, status } = coueseFile.saveUpload(data);
@@ -613,26 +598,16 @@ export default {
     },
     handleCloseCheck(done){
       //console.log('关闭的处理aaaaa');
-      if(this.isTrue&&this.isFalse){
-        this.$message.error('文件正在上传中，请耐心等待');
-        return false;
-      }
       if(this.fileList.length>0){
         this.$message.error('有待保存的上传文件，请执行保存操作');
         return false;
       }else{
-        this.isTrue = false
-        this.isFalse = false
         return done(true);
       }
 
     },
     // 文件上传保存
     saveUpload() {
-      if(this.fileList.length<=0){
-        this.$message.error('请上传文件');
-        return;
-      }
       if(!this.upload.orgName){
         this.$message.success('请选择资源归属');
         return;
@@ -653,20 +628,6 @@ export default {
         item.duration = item.minute ? parseFloat(item.minute) * 60 : 1800;
       });
       this.loading = true;
-      const messageD = this.fileList.some(item =>{
-        if(item.name == ''){
-          this.$message.error('课件名称不能为空');
-          return true;
-        }else if(!item.minute||item.minute == undefined){
-          this.$message.error('时长不能为空并且不能为0');
-          return true;
-        }else{
-          return false
-        }
-      })
-      if(messageD){
-        return 
-      }
       coueseFile.batchUpdate(this.fileList).then(rs => {
         if (rs.status === 200) {
           this.$message.success('保存成功');
@@ -832,16 +793,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-::v-deep .el-input-number.is-controls-right .el-input__inner{
-  padding-right: 20px;
-  padding-left: 8px;
-}
-::v-deep .el-input-number__decrease{
-  width: 16px;
-}
-::v-deep .el-input-number__increase{
-  width: 16px;
-}
 .butpost{
   position: absolute;
   right: 1%;

src/views/course/ManageList.vue

@@ -195,8 +195,16 @@
       </template>
     </el-dialog>
     <!--课程管理-->
-    <el-dialog custom-class="g-dialog" title="课程学习管理" width="900px" :visible.sync="manageStudy.dlgShow" :close-on-click-modal="false">
-      <manager :manageStudyData="manageStudyData"></manager>
+    <el-dialog
+        custom-class="g-dialog"
+        title="课程学习管理"
+        width="900px"
+        height="900px"
+        :visible.sync="manageStudy.dlgShow"
+        :close-on-click-modal="false"
+
+        >
+      <manager :manageStudyData="manageStudyData" :isShowDialog="manageStudy.dlgShow"></manager>
       <template #footer>
         <el-button @click="manageStudy.dlgShow = false">关闭</el-button>
       </template>
@@ -668,8 +676,10 @@ export default {
       }
       apiCourse.pageList(this.params).then(rs=>{
           if(rs.status==200){
-            this.pageData = rs.result.list;
+            this.pageData = rs.result.list ? rs.result.list : [];
+            // this.pageData = rs.result.list;
             this.page.count = rs.result.count;
+            this.page.pageSize = rs.result.pageSize;
           }else{
             return this.$message.error(rs.message);
           }
@@ -939,4 +949,8 @@ export default {
     }
   }
 }
+
+.el-dialog__body {
+  overflow: hidden;
+}
 </style>

src/views/course/Mylecnotes.vue

@@ -1,206 +1,206 @@
 <template>
-     <div style="padding: 12px 32px 10px 12px;">
-      <div style="display: flex;justify-content: flex-start;">
+  <div style="padding: 12px 32px 10px 12px;">
+   <div style="display: flex;justify-content: flex-start;">
 
-        <div><el-input v-model="keyword" placeholder="输入课程名称搜索" clearable></el-input></div>
-        <div style="padding-left: 10px;"><el-button @click="recordList()" type="primary" icon="el-icon-search">搜索</el-button></div>
-        <div style="padding: 0px 5px;"><el-button icon="el-icon-refresh-right" @click="keyword = ''" type="primary" >重置</el-button></div>
-        <div style="padding: 0px 5px;"><el-button type="primary" @click="exportFile()" icon="el-icon-search" size="small" round>导出</el-button></div>
-        <div style="padding: 0px 5px;"><el-button type="primary" @click="exportStudentOfTearcher()" icon="el-icon-search" size="small" round>导出学员信息</el-button></div>
-      </div>
-      <div class="Export">
-        <!-- <div style="padding-left: 10px;"><el-button type="primary" @click="exportFile()" icon="el-icon-search" size="small" round>导出</el-button></div> -->
-        <!-- <div style="padding: 0px 5px;"><el-button icon="el-icon-refresh-right" type="primary" size="small" round>导出学员信息</el-button></div> -->
-      </div>
-      <div style="margin-top:20px;">
-        <el-table :data="pageData" border stripe>
-            <el-table-column
-            label="课程时间"
-            prop="courseTime"
-            width="200px">
-            </el-table-column>
-            <el-table-column
-            label="课程名称"
-            prop="courseName"
-            width="200px">
-            </el-table-column>
-            <el-table-column
-            label="开课场地"
-            prop="address"
-            width="240px">
-            </el-table-column>
-            <el-table-column
-            label="所属课程"
-            prop="parentCourse"
-            width="120px">
-            </el-table-column>
-            <el-table-column
-            label="所属项目"
-            prop="parentProject"
-            ></el-table-column>
-            <el-table-column
-            label="所属路径"
-            prop="parentRoute"
-            width="200px"
-            ></el-table-column>
-            <el-table-column
-            label="学习总人数"
-            prop="studentNumber"
-            width="100px"
-            ></el-table-column>
-            <el-table-column
-            label="时长(分钟)"
-            width="100px"
-            prop="period"
-            ></el-table-column>
-            <el-table-column
-            label="评分"
-            width="100px"
-            prop="score"
-             ></el-table-column>
-            <el-table-column
-            label="操作"
-            align="center"
-            width="150px"
-            prop="cz"
-            fixed="right"
-             >
-             <template v-slot="scope">
-              <el-button type="text" @click="exportStudentOfCourse(scope.row.courseId)" size="small">导出学员信息</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
+     <div><el-input v-model="keyword" placeholder="输入课程名称搜索" clearable></el-input></div>
+     <div style="padding-left: 10px;"><el-button @click="recordList()" type="primary" icon="el-icon-search">搜索</el-button></div>
+     <div style="padding: 0px 5px;"><el-button icon="el-icon-refresh-right" @click="keyword = ''" type="primary" >重置</el-button></div>
+     <div style="padding: 0px 5px;"><el-button type="primary" @click="exportFile()" icon="el-icon-search" size="small" round>导出</el-button></div>
+     <div style="padding: 0px 5px;"><el-button type="primary" @click="exportStudentOfTearcher()" icon="el-icon-search" size="small" round>导出学员信息</el-button></div>
+   </div>
+   <div class="Export">
+     <!-- <div style="padding-left: 10px;"><el-button type="primary" @click="exportFile()" icon="el-icon-search" size="small" round>导出</el-button></div> -->
+     <!-- <div style="padding: 0px 5px;"><el-button icon="el-icon-refresh-right" type="primary" size="small" round>导出学员信息</el-button></div> -->
+   </div>
+   <div style="margin-top:20px;">
+     <el-table :data="pageData" border stripe>
+         <el-table-column
+         label="课程时间"
+         prop="courseTime"
+         width="200px">
+         </el-table-column>
+         <el-table-column
+         label="课程名称"
+         prop="courseName"
+         width="200px">
+         </el-table-column>
+         <el-table-column
+         label="开课场地"
+         prop="address"
+         width="240px">
+         </el-table-column>
+         <el-table-column
+         label="所属课程"
+         prop="parentCourse"
+         width="120px">
+         </el-table-column>
+         <el-table-column
+         label="所属项目"
+         prop="parentProject"
+         ></el-table-column>
+         <el-table-column
+         label="所属路径"
+         prop="parentRoute"
+         width="200px"
+         ></el-table-column>
+         <el-table-column
+         label="学习总人数"
+         prop="studentNumber"
+         width="100px"
+         ></el-table-column>
+         <el-table-column
+         label="时长(分钟)"
+         width="100px"
+         prop="period"
+         ></el-table-column>
+         <el-table-column
+         label="评分"
+         width="100px"
+         prop="score"
+          ></el-table-column>
+         <el-table-column
+         label="操作"
+         align="center"
+         width="150px"
+         prop="cz"
+         fixed="right"
+          >
+          <template v-slot="scope">
+           <el-button type="text" @click="exportStudentOfCourse(scope.row.courseId)" size="small">导出学员信息</el-button>
+         </template>
+       </el-table-column>
+     </el-table>
+   </div>
 
-    <div style="text-align: center; margin-top:57px">
-     <el-pagination
-      background
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="pageInfo.page"
-        :page-sizes="[10, 20, 30, 40]"
-        :page-size="pageInfo.pageSize"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="pageInfo.total"
-      ></el-pagination>
-      </div>
+ <div style="text-align: center; margin-top:57px">
+  <el-pagination
+   background
+     @size-change="handleSizeChange"
+     @current-change="handleCurrentChange"
+     :current-page="pageInfo.page"
+     :page-sizes="[10, 20, 30, 40]"
+     :page-size="pageInfo.pageSize"
+     layout="total, sizes, prev, pager, next, jumper"
+     :total="pageInfo.total"
+   ></el-pagination>
+   </div>
 
-    </div>
+ </div>
 </template>
 
 <script>
 import apiCourse from '../../api/boe/courseRecord.js';
 import { mapGetters } from 'vuex';
 export default {
-  data(){
-    return {
-        pageData:[],
-        keyword:'',
-        pageInfo:{},
-    }
-  },
+data(){
+ return {
+     pageData:[],
+     keyword:'',
+     pageInfo:{},
+ }
+},
 
-  mounted() {
-    this.recordList(1);
+mounted() {
+ this.recordList(1);
 
-  },
-  computed: {
-    ...mapGetters(['userInfo'])
-  },
+},
+computed: {
+ ...mapGetters(['userInfo'])
+},
 
-  methods: {
+methods: {
 
-      // 导出所有记录
-      exportFile(){
-        let req = {
-          userId: this.userInfo.sysId
-          // userId:"70F80F4E-34BA-10AB-894A-8FA812B19637"
-        }
-        apiCourse.courseRecordExport(req).then(res=>{
-            const link = document.createElement('a');// 创建a标签
-            let blob = new Blob([res.data],{type: 'application/vnd.ms-excel'}); // 设置文件类型
-            link.style.display = "none";
-            link.href = URL.createObjectURL(blob); // 创建URL
-            link.setAttribute("download", "授课记录.xls");
-            document.body.appendChild(link);
-            link.click();
-            document.body.removeChild(link);
-        })
-      },
+   // 导出所有记录
+   exportFile(){
+     let req = {
+       userId: this.userInfo.sysId
+       // userId:"70F80F4E-34BA-10AB-894A-8FA812B19637"
+     }
+     apiCourse.courseRecordExport(req).then(res=>{
+         const link = document.createElement('a');// 创建a标签
+         let blob = new Blob([res.data],{type: 'application/vnd.ms-excel'}); // 设置文件类型
+         link.style.display = "none";
+         link.href = URL.createObjectURL(blob); // 创建URL
+         link.setAttribute("download", "授课记录.xls");
+         document.body.appendChild(link);
+         link.click();
+         document.body.removeChild(link);
+     })
+   },
 
 
-      // 导出课程下的学员信息
-      exportStudentOfCourse(courseId){
-        let userId = this.userInfo.sysId;
-        apiCourse.exportStudentOfCourse(userId,courseId).then(res=>{
-            const link = document.createElement('a');// 创建a标签
-            let blob = new Blob([res.data],{type: 'application/vnd.ms-excel'}); // 设置文件类型
-            link.style.display = "none";
-            link.href = URL.createObjectURL(blob); // 创建URL
-            link.setAttribute("download", "授课记录.xls");
-            document.body.appendChild(link);
-            link.click();
-            document.body.removeChild(link);
-        })
-      },
+   // 导出课程下的学员信息
+   exportStudentOfCourse(courseId){
+     let userId = this.userInfo.sysId;
+     apiCourse.exportStudentOfCourse(userId,courseId).then(res=>{
+         const link = document.createElement('a');// 创建a标签
+         let blob = new Blob([res.data],{type: 'application/vnd.ms-excel'}); // 设置文件类型
+         link.style.display = "none";
+         link.href = URL.createObjectURL(blob); // 创建URL
+         link.setAttribute("download", "授课记录.xls");
+         document.body.appendChild(link);
+         link.click();
+         document.body.removeChild(link);
+     })
+   },
 
-      // 导出教师下的所有授课记录下的学员信息
-      exportStudentOfTearcher(){
-        let userId = this.userInfo.sysId;
-        // let userId = '5D36C207-64F4-C512-312D-C9598257695C';
-        apiCourse.exportStudentOfTearcher(userId).then(res=>{
-            const link = document.createElement('a');// 创建a标签
-            let blob = new Blob([res.data],{type: 'application/vnd.ms-excel'}); // 设置文件类型
-            link.style.display = "none";
-            link.href = URL.createObjectURL(blob); // 创建URL
-            link.setAttribute("download", "授课记录.xls");
-            document.body.appendChild(link);
-            link.click();
-            document.body.removeChild(link);
-        })
-      },
+   // 导出教师下的所有授课记录下的学员信息
+   exportStudentOfTearcher(){
+     let userId = this.userInfo.sysId;
+     // let userId = '5D36C207-64F4-C512-312D-C9598257695C';
+     apiCourse.exportStudentOfTearcher(userId).then(res=>{
+         const link = document.createElement('a');// 创建a标签
+         let blob = new Blob([res.data],{type: 'application/vnd.ms-excel'}); // 设置文件类型
+         link.style.display = "none";
+         link.href = URL.createObjectURL(blob); // 创建URL
+         link.setAttribute("download", "授课记录.xls");
+         document.body.appendChild(link);
+         link.click();
+         document.body.removeChild(link);
+     })
+   },
 
 
-      recordList(pageIndex){
-        let req = {
-        //     userId:"6B049FAF-C314-7CCF-0D28-0D23F4C42531",
-            userId: this.userInfo.sysId,
-            keyword:this.keyword,
-            page:pageIndex,
-            pageSize:10
-        }
-        apiCourse.courseRecordList(req).then(res=>{
-          if(res.status == 200) {
-            this.pageData = res.result.list;
-            this.pageInfo = res.result.pageInfo;
-          } else {
-             this.$message({
-              type: 'error',
-              message: res.message
-            });
-          }
-        })
-      },
+   recordList(pageIndex){
+     let req = {
+     //     userId:"6B049FAF-C314-7CCF-0D28-0D23F4C42531",
+         userId: this.userInfo.sysId,
+         keyword:this.keyword,
+         page:pageIndex,
+         pageSize:10
+     }
+     apiCourse.courseRecordList(req).then(res=>{
+       if(res.status == 200) {
+         this.pageData = res.result.list;
+         this.pageInfo = res.result.pageInfo;
+       } else {
+          this.$message({
+           type: 'error',
+           message: res.message
+         });
+       }
+     })
+   },
 
-      // 每页显示的条数事件
-      handleSizeChange(val){
-        this.pageInfo.pageSize = val;
-        this.recordList(1);
-      },
-      // 显示制定页的数据
-      handleCurrentChange(val){
-        this.pageInfo.pageIndex = val;
-        this.recordList(this.pageInfo.pageIndex);
-      },
+   // 每页显示的条数事件
+   handleSizeChange(val){
+     this.pageInfo.pageSize = val;
+     this.recordList(1);
+   },
+   // 显示制定页的数据
+   handleCurrentChange(val){
+     this.pageInfo.pageIndex = val;
+     this.recordList(this.pageInfo.pageIndex);
+   },
 
-  },
+},
 
 }
 </script>
 
 <style lang="scss" scoped>
 .Export{
-  display: flex;
-  padding-top: 10px;
+display: flex;
+padding-top: 10px;
 }
 </style>

src/views/exam/Test.vue

@@ -16,7 +16,7 @@
                 <li v-if="testPaper.deadlineTime">结束时间:  {{ testPaper.deadlineTime }}</li>
               </ul>
             </div>
-            <div v-if="testPaper.testFront" style="padding: 20px;text-align: center;" v-html="testPaper.testFront">
+            <div v-if="testPaper.testFront && testPaper.testFront != 'null'" style="padding: 20px;text-align: center;" v-html="testPaper.testFront">
               <!--考前说明-->
             </div>
             <div v-if="canExam" class="test-time" style="margin-top:20px" >

src/views/grateful/TeacherOpinion.vue

@@ -118,7 +118,7 @@ export default {
   }
 
   &::after {
-    content: '认证讲师库(2023)';
+    content: '认证讲师库';
     position: absolute;
     bottom: 25px;
     left: 180px;