去掉无用日志

# 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/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

@@ -1,61 +1,61 @@
 <template>
-  <div>
-    <div v-if="has" class="homework-div">
-      <div>
-        <div class="homework-title">作业名称</div>
-        <div class="homework-content">{{info.name}}</div>
-      </div>
-      <div>
-        <div class="homework-title">内容</div>
-        <div class="homework-content">{{info.content}}</div>
-      </div>
-      <div v-if="info.file">
-        <div class="homework-title">附件</div>
-        <div class="homework-content" style="color: blue">
-          <a :href="fileBaseUrl+info.file" target="_blank">下载作业附件</a></div>
-      </div>
-      <div>
-        <div class="homework-title">截止时间</div>
-        <div class="homework-content" :style="{color:close? 'red':''}">{{info.deadTime}}</div>
-      </div>
-      <div v-show="!close && showSubmit">
-        <div v-if="info.submitMode>1">
-          <div class="homework-title">作业内容</div>
-          <div class="homework-content">
-            <el-input type="textarea" rows="5" show-word-limit maxlength="255" v-model="answer" placeholder="(限255个字)"></el-input>
+ <div>
+   <div v-if="has" class="homework-div">
+     <div>
+       <div class="homework-title">作业名称</div>
+       <div class="homework-content">{{info.name}}</div>
+     </div>
+     <div>
+       <div class="homework-title">内容</div>
+       <div class="homework-content">{{info.content}}</div>
+     </div>
+     <div v-if="info.file">
+       <div class="homework-title">附件</div>
+       <div class="homework-content" style="color: blue">
+           <a :href="fileBaseUrl+info.file" target="_blank">下载作业附件</a></div>
+     </div>
+     <div>
+       <div class="homework-title">截止时间</div>
+       <div class="homework-content" :style="{color:close? 'red':''}">{{info.deadTime}}</div>
+     </div>
+     <div v-show="!close && showSubmit">
+       <div v-if="info.submitMode>1">
+         <div class="homework-title">作业内容</div>
+         <div class="homework-content">
+           <el-input type="textarea" rows="5" show-word-limit maxlength="255" v-model="answer" placeholder="(限255个字)"></el-input>
           </div>
-        </div>
-        <div v-if="info.submitMode==1 || info.submitMode==3">
-          <div class="homework-title">上传作业</div>
-          <div class="homework-content">
-            <div v-if="filePath!=''">
-              <el-tag closable type="success" @close="removeHomeworkFile">作业附件</el-tag><span style="margin-left: 10px;">请点击下面的提交</span>
-            </div>
-            <div v-else >
-              <file-upload dir="files" :isShowTip="false" @success="uploadHomeworkFile" @remove="removeHomeworkFile"></file-upload>
-            </div>
-          </div>
-        </div>
-        <div style="text-align: center;padding-bottom: 10px;">
-          <el-button type="primary" :disabled="isSubmit" @click="submitHomework()">{{records.length>0?'重新提交':'提交'}}</el-button>
-        </div>
-      </div>
-      <div v-show="showRecord"><!--作业提交记录-->
-        <el-table :data="records" style="width: 100%" border>
-          <el-table-column prop="endTime" label="提交时间" width="100" align="center"></el-table-column>
-          <el-table-column  label="内容">
-            <template slot-scope="scope">
-              <div>{{scope.row.hwAnswer}}</div>
-              <div style="padding-top: 5px;" v-if="scope.row.filePath!=''">
-                <a :href="fileBaseUrl+scope.row.filePath" target="_blank">下载上传的作业文件</a>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-    </div>
-    <div v-else style="text-align: center;padding-top: 20px;color: red;">此课程无作业</div>
-  </div>
+       </div>
+       <div v-if="info.submitMode==1 || info.submitMode==3">
+           <div class="homework-title">上传作业</div>
+           <div class="homework-content">
+               <div v-if="filePath!=''">
+                 <el-tag closable type="success" @close="removeHomeworkFile">作业附件</el-tag><span style="margin-left: 10px;">请点击下面的提交</span>
+               </div>
+               <div v-else >
+                 <file-upload dir="files" :isShowTip="false" @success="uploadHomeworkFile" @remove="removeHomeworkFile"></file-upload>
+               </div>
+           </div>
+       </div>
+       <div style="text-align: center;padding-bottom: 10px;">
+           <el-button type="primary" :disabled="isSubmit" @click="submitHomework()">{{records.length>0?'重新提交':'提交'}}</el-button>
+       </div>
+     </div>
+     <div v-show="showRecord"><!--作业提交记录-->
+      <el-table :data="records" style="width: 100%" border>
+         <el-table-column prop="endTime" label="提交时间" width="100" align="center"></el-table-column>
+         <el-table-column  label="内容">
+           <template slot-scope="scope">
+             <div>{{scope.row.hwAnswer}}</div>
+             <div style="padding-top: 5px;" v-if="scope.row.filePath!=''">
+               <a :href="fileBaseUrl+scope.row.filePath" target="_blank">下载上传的作业文件</a>
+             </div>
+           </template>
+         </el-table-column>
+       </el-table>
+     </div>
+   </div>
+   <div v-else style="text-align: center;padding-top: 20px;color: red;">此课程无作业</div>
+ </div>
 </template>
 
 <script>
@@ -65,21 +65,21 @@ import FileUpload from '@/components/FileUpload/index.vue';
 export default {
   components: { FileUpload },
   props:{
-    studyId: {
-      type: String,
-    },
-    showRecord:{
-      type:Boolean,
-      default:true
-    },
-    showSubmit:{
-      type:Boolean,
-      default:true
-    },
-    content: {
-      type: Object,
-      default:()=>{}
-    }
+      studyId: {
+        type: String,
+      },
+      showRecord:{
+        type:Boolean,
+        default:true
+      },
+      showSubmit:{
+        type:Boolean,
+        default:true
+      },
+      content: {
+        type: Object,
+        default:()=>{}
+      }
   },
   data() {
     return {
@@ -106,26 +106,26 @@ export default {
   methods: {
     loadHomeworkInfo(){
       apiCourse.getHomework(this.content.id).then(res=>{
-        if(res.status==200){
-          this.info=res.result;
-          //检查是否过期
-          if(res.result.deadTime!=''){
-            var d = new Date(res.result.deadTime);
-            var now=new Date();
-            if(now.getTime() > d.getTime()){
-              this.close=true;
-            } else {
-              this.close=false;
+         if(res.status==200){
+             this.info=res.result;
+             //检查是否过期
+            if(res.result.deadTime!=''){
+               var d = new Date(res.result.deadTime);
+               var now=new Date();
+               if(now.getTime() > d.getTime()){
+                  this.close=true;
+               } else {
+                  this.close=false;
+               }
             }
-          }
-          if(!this.showTest && this.showRecord){
-            this.loadRecord();
-          }
-        }else if(res.status==404){
-          //没有找到作业信息
-        }else{
-          this.$message.error(res.message);
-        }
+             if(!this.showTest && this.showRecord){
+               this.loadRecord();
+             }
+         }else if(res.status==404){
+            //没有找到作业信息
+         }else{
+           this.$message.error(res.message);
+         }
       });
       //
     },
@@ -149,15 +149,15 @@ export default {
       this.filePath = res.result.filePath;
     },
     removeHomeworkFile(){
-      this.$confirm('您确定要删除已上传的附件吗？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.filePath='';
-        //从服务器端删除
-        this.$message({ type: 'success',  message: '删除成功!' });
-      })
+       this.$confirm('您确定要删除已上传的附件吗？', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+              }).then(() => {
+                this.filePath='';
+                //从服务器端删除
+                this.$message({ type: 'success',  message: '删除成功!' });
+              })
 
     },
     submitHomework() {//提交作业
@@ -192,16 +192,16 @@ export default {
       }
       apiCourseStudy.saveHomework(pamars).then(res=>{
         this.isSubmit = false
-        if(res.status==200){
-          this.$message.success("作业已提交");
-          this.filePath='';
-          this.answer='';
-          this.studyItemId=res.result.id;
-          this.records=[res.result];
-          this.$emit("submit", this.content);
-        }else {
-          this.$message.error(res.message);
-        }
+         if(res.status==200){
+            this.$message.success("作业已提交");
+            this.filePath='';
+            this.answer='';
+            this.studyItemId=res.result.id;
+            this.records=[res.result];
+            this.$emit("submit", this.content);
+         }else {
+            this.$message.error(res.message);
+         }
 
       })
     },
@@ -210,27 +210,27 @@ export default {
 </script>
 
 <style scoped lang="scss">
-.homework-div {
-  border: 1px solid #dadada;
-  min-height: 500px;
-  padding: 20px;
-  font-size: 14px;
-  display: flex;
-  flex-direction: column;
-  align-items: flex-start;
-  >div{
-    width: 100%;
-    text-align: left;
-    .homework-title {
-      margin-bottom: 10px;
-      font-weight: 600;
-    }
-    .homework-content {
-      color: #666;
-      margin-bottom: 10px;
+  .homework-div {
+    border: 1px solid #dadada;
+    min-height: 500px;
+    padding: 20px;
+    font-size: 14px;
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    >div{
       width: 100%;
+      text-align: left;
+      .homework-title {
+        margin-bottom: 10px;
+        font-weight: 600;
+      }
+      .homework-content {
+        color: #666;
+        margin-bottom: 10px;
+        width: 100%;
+      }
     }
-  }
 
-}
+  }
 </style>

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">
@@ -1059,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;
@@ -1087,6 +1111,9 @@
             }
             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);
@@ -1152,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

@@ -217,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/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

@@ -51,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>
@@ -209,7 +210,7 @@ export default {
     this.sex = this.userInfo.sex;
     this.$store.dispatch('refrashMsg');
     this.loadBoeData();
-    console.log('this.userInfo::',this.userInfo)
+    // console.log('this.userInfo::',this.userInfo)
     //this.loadPopupConfig();
   },
   methods: {
@@ -246,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]);
     },

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">
@@ -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>
@@ -292,6 +292,7 @@
         <el-form-item>
           <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>
@@ -335,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: {
@@ -352,7 +355,10 @@ export default {
   },
   data() {
     return {
+      downParams: {},
       typePress: false,
+      isHomeWork: false,
+      isTrue: false,
       catalogRecordTree:[],
       catalogRecordList:[],
       resOwnerListMap:[],
@@ -377,8 +383,8 @@ export default {
         count: 0,
         type: "",
         list: [],
-        name: '',
         status: '',
+        name: '',
       },
       learningRecords: {
         pageIndex: 1, //第几页
@@ -515,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;
@@ -524,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;
@@ -722,11 +800,16 @@ export default {
       this.getSignupList();
     },
     getCatalogue(row,type) {
-      if(type=='考试'){
+      if(type==61){
         this.typePress = true
       }else{
         this.typePress = true
       }
+      if(type == 60){
+        this.isHomeWork = true
+      }else{
+        this.isHomeWork = false
+      }
       this.contentId = row.id;
       this.study.catalogueShow = true;
       this.learningSituation.pageIndex = 1;//重置为第一页
@@ -780,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,17 @@
           <svg-icon :icon-class="activeMenu == '/user/medal'?'myxunzhang-active':'myxunzhang'"></svg-icon>
           <span slot="title">我的勋章</span>
       </el-menu-item>
+        <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>
         <el-submenu index="mystudy" v-show="curIdentity == 1">
           <template slot="title">
             <!-- <i class="el-icon-s-grid"></i> -->
@@ -422,6 +433,7 @@ export default {
     this.getLastStudy();
     //获取讲师认证中条数
     this.instructorCertification()
+    console.log(this.userInfo,'userInfouserInfo')
   },
   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 =
@@ -356,20 +372,50 @@ export default {
       this.isCursorStatic = false;
       this.timeoutControlsHint = 2000;
     });
+    this.videoDom.addEventListener('loadstart', function(){
+      console.log('\x1b[34m%s\x1b[0m','*****************视频加载中**************')
+    })
+
+    this.videoDom.addEventListener('loadeddata', function(){
+      console.log('\x1b[32m%s\x1b[0m','*****************加载完毕*************')
+    })
+
+    this.videoDom.addEventListener('error', function(){
+      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{
@@ -460,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() {
@@ -510,6 +563,7 @@ export default {
     /* 切换“全屏”和“非全屏”模式
      */
     toggleFullScreen() {
+      console.log("toggleFullScreen 执行 ",this.isFullScreen())
       let element = this.$refs.area;
       if (!this.isFullScreen()) {
         if (element.requestFullscreen) {
@@ -566,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/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,

src/utils/tools.js

@@ -423,6 +423,7 @@ export function translate(field) {
   let name = '';
   switch (field) {
       case 'total':name = '累计'; break;
+      case 'now':name = '当前'; break;
       case 'weeks':name = '本周'; break;
       case 'months':name = '本月'; break;
       case 'years':name = '本年'; break;

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/ManageList.vue

@@ -195,7 +195,15 @@
       </template>
     </el-dialog>
     <!--课程管理-->
-    <el-dialog custom-class="g-dialog" title="课程学习管理" width="900px" :visible.sync="manageStudy.dlgShow" :close-on-click-modal="false">
+    <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>
@@ -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;

src/views/growth/index.vue

@@ -0,0 +1,390 @@
+<template>
+  <div class="growth" v-loading="loading" id="scrollContainer">
+    <div class="growth-left">
+      <div class="navbar">
+        <div style="display: flex; flex: 1">
+          <div class="nav-title">我的专业力必修</div>
+        </div>
+      </div>
+
+      <div class="growth-item" v-for="item of list" :id="item.id">
+        <div class="growth-nav">
+          <div class="growth-name">{{ item.growthName }}</div>
+          <div class="f-a-c">
+            <div
+              class="growth-state"
+              :style="{
+                color:
+                  item.learningState === 0
+                    ? '#999999'
+                    : item.learningState === 1
+                    ? '#6ba158'
+                    : '#F2903D',
+              }"
+            >
+              {{
+                item.learningState === 0
+                  ? "未开始"
+                  : item.learningState === 1
+                  ? "已完成"
+                  : "进行中"
+              }}
+            </div>
+            <div class="growth-btn" @click="jumpRouter(item)">去学习</div>
+          </div>
+        </div>
+        <template v-if="item.description">
+          <div class="tip-title">说明</div>
+          <div class="tip-content">
+            {{ item.description || "暂无说明" }}
+          </div>
+        </template>
+
+        <div class="progress-title">学习进度</div>
+
+        <div class="progress-content">
+          <div class="f-j-b" style="margin-bottom: 10px">
+            <div class="f-a-c">
+              <div style="font-size: 16px; color: #333333">必修进度</div>
+              <div style="font-size: 18px; color: #999999; margin-left: 12px">
+                {{ item.requiredTaskCompletedNum }}/{{ item.requiredTaskNum }}
+              </div>
+            </div>
+            <div style="font-size: 18px; color: #0077ec">
+              {{ requiredTaskCompletionRate(item) }}%
+            </div>
+          </div>
+          <el-progress
+            :stroke-width="6"
+            :show-text="false"
+            :percentage="requiredTaskCompletionRate(item)"
+            color="#0077EC"
+          ></el-progress>
+        </div>
+        <template v-if="item.electiveTaskNum !== 0">
+          <div class="progress-content">
+            <div class="f-j-b" style="margin-bottom: 10px">
+              <div class="f-a-c">
+                <div style="font-size: 16px; color: #333333">选修进度</div>
+                <div style="font-size: 18px; color: #999999; margin-left: 12px">
+                  {{ item.electiveTaskCompletedNum }}/{{ item.electiveTaskNum }}
+                </div>
+                <el-tooltip
+                  class="item"
+                  effect="light"
+                  :content="`还需完成${item.electivePoorNum}个选修任务`"
+                  placement="top-start"
+                >
+                  <i class="el-icon-question"></i>
+                </el-tooltip>
+              </div>
+              <div style="font-size: 18px; color: #0077ec">
+                {{ electiveTaskCompletionRate(item) }}%
+              </div>
+            </div>
+            <el-progress
+              :stroke-width="6"
+              :show-text="false"
+              color="#0077EC"
+              :percentage="electiveTaskCompletionRate(item)"
+            ></el-progress>
+          </div>
+        </template>
+        <div class="progress-content">
+          <div class="f-j-b" style="margin-bottom: 10px">
+            <div class="f-a-c">
+              <div style="font-size: 16px; color: #333333">总进度</div>
+              <div style="font-size: 18px; color: #999999; margin-left: 12px">
+                {{ item.totalTaskCompletedNum }}/{{ item.totalTaskNum }}
+              </div>
+            </div>
+            <div style="font-size: 18px; color: #0077ec">
+              {{ totalTaskCompletionRate(item) }}%
+            </div>
+          </div>
+          <el-progress
+            :stroke-width="6"
+            :show-text="false"
+            color="#0077EC"
+            :percentage="totalTaskCompletionRate(item)"
+          ></el-progress>
+        </div>
+        <div class="growth-bg-icon">
+          <img src="@/assets/images/growth/growth-bg-icon.png" />
+        </div>
+      </div>
+      <template v-if="!list.length">
+        <div class="empty">
+          <el-empty :image-size="200"></el-empty>
+        </div>
+      </template>
+    </div>
+    <!-- <template v-if="!list || list.length < 2">
+      <div class="growth-right">
+        <div class="title">专业力必修</div>
+        <div
+          :key="item.id"
+          class="item-growth"
+          :class="activeItem.id == item.id ? 'active' : ''"
+          v-for="item of list"
+        >
+          <div class="icon"></div>
+          <div @click="handlerAnchor(item)">
+            {{ item.growthName }}
+          </div>
+        </div>
+      </div>
+    </template> -->
+  </div>
+</template>
+<script>
+import { listData, getTotalGrowthTaskDetail } from "@/api/growth/growthpath";
+export default {
+  data() {
+    return {
+      list: [],
+      loading: false,
+      totalData: {},
+      activeItem: {},
+    };
+  },
+  computed: {
+    // 完成进度
+    totalTaskCompletionRate() {
+      return (item) => {
+        if (item.totalTaskCompletedNum && item.totalTaskNum) {
+          let num = item.totalTaskCompletedNum / item.totalTaskNum;
+          num = num * 100;
+          num = num.toFixed(0);
+          return Number(num);
+        } else {
+          return 0;
+        }
+      };
+    },
+    // 选修进度
+    electiveTaskCompletionRate() {
+      return (item) => {
+        if (item.electiveTaskCompletedNum && item.electiveTaskNum) {
+          let num = item.electiveTaskCompletedNum / item.electiveTaskNum;
+          num = num * 100;
+          num = num.toFixed(0);
+          return Number(num);
+        } else if (item.electiveTaskNum == 0) {
+          return 100;
+        } else {
+          return 0;
+        }
+      };
+    },
+    // 必修进度
+    requiredTaskCompletionRate() {
+      return (item) => {
+        if (item.requiredTaskCompletedNum && item.requiredTaskNum) {
+          let num = item.requiredTaskCompletedNum / item.requiredTaskNum;
+          num = num * 100;
+          num = num.toFixed(0);
+          return Number(num);
+        } else {
+          return 0;
+        }
+      };
+    },
+  },
+  methods: {
+    select(item) {},
+    jumpRouter(item) {
+      let studentPath = process.env.VUE_APP_STUDENT_PATH;
+      let params = encodeURIComponent("routerId=" + item.id);
+      this.$router.push(
+        "/forward?to=" + studentPath + "/growthList&params=" + params
+      );
+    },
+
+    handlerAnchor(item, index) {
+      this.activeItem = item;
+      let dom = document.getElementById(`${item.id}`);
+      dom.classList.add("handler-add-padding");
+      dom.scrollIntoView({ behavior: "smooth" });
+    },
+  },
+  created() {
+    this.loading = true;
+    listData().then((res) => {
+      this.activeItem = res.data[0];
+      this.list = res.data;
+      this.loading = false;
+    });
+    getTotalGrowthTaskDetail().then((res) => {
+      this.totalData = res.data;
+    });
+    // 处理滚动事件的代码
+    let that = this;
+    window.addEventListener("scroll", function () {
+      let dom = document.getElementById(`${that.activeItem.id}`);
+      if (dom) {
+        dom.classList.remove("handler-add-padding");
+      }
+    });
+  },
+};
+</script>
+<style lang="less" scoped>
+.f-a-c {
+  display: flex;
+  align-items: center;
+}
+.f-j-b {
+  display: flex;
+  justify-content: space-between;
+}
+.f-j-c {
+  display: flex;
+  justify-content: center;
+}
+.growth {
+  .empty {
+    height: 600px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background-color: #ffffff;
+  }
+  .el-icon-question {
+    color: #387df7;
+    font-size: 16px;
+    margin-left: 5px;
+  }
+  .handler-add-padding {
+    padding: 100px 38px 66px 40px !important;
+    margin-top: -80px;
+  }
+  display: flex;
+  .growth-left {
+    margin-right: 10px;
+
+    flex: 1;
+    .growth-item {
+      background: #ffffff;
+      padding: 30px 38px 66px 40px;
+      margin-bottom: 35px;
+      position: relative;
+      .growth-bg-icon {
+        position: absolute;
+        right: 92px;
+        bottom: 0;
+      }
+      .progress-title {
+        // font-weight: 700;
+        font-size: 18px;
+        color: #000000;
+        margin: 28px 0 20px 0;
+      }
+      .progress-content {
+        margin-bottom: 28px;
+      }
+      .tip-title {
+        // font-weight: 700;
+        font-size: 18px;
+        color: #000000;
+        margin: 30px 0 10px 0;
+      }
+      .tip-content {
+        font-size: 16px;
+        color: #333333;
+        line-height: 30px;
+      }
+      .growth-nav {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding-bottom: 28px;
+        border-bottom: 2px solid #f5f5f5;
+      }
+      .growth-name {
+        font-weight: bold;
+        font-size: 18px;
+        color: #0071ed;
+      }
+      .growth-state {
+        font-size: 15px;
+        margin-right: 18px;
+      }
+      .growth-btn {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        width: 120px;
+        height: 36px;
+        background: #f2903d;
+        border-radius: 4px;
+        font-size: 16px;
+        color: #ffffff;
+        cursor: pointer;
+      }
+    }
+    .navbar {
+      display: flex;
+      align-items: center;
+      height: 90px;
+      padding-left: 40px;
+      margin-bottom: 10px;
+      color: #ffffff;
+      background-image: url(../../assets/images/growth/growth-bg.png);
+      background-size: 100% 100%;
+      .nav-title {
+        font-weight: 700;
+        font-size: 18px;
+        margin-right: 10%;
+      }
+      .nav-total {
+        // margin-left: 15%;
+        width: 20%;
+      }
+      .total-num {
+        font-weight: bold;
+        font-size: 22px;
+      }
+    }
+  }
+  .growth-right {
+    width: 30%;
+    max-width: 464px;
+    margin-bottom: 35px;
+    background-color: #ffffff;
+    padding: 35px 20px 20px 30px;
+    .title {
+      font-size: 18px;
+      color: #000000;
+      font-weight: 700;
+      margin-bottom: 30px;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
+    .item-growth {
+      display: flex;
+      align-items: center;
+      border-radius: 5px;
+      font-size: 14px;
+      color: #666666;
+      padding: 10px 20px 10px 8px;
+      cursor: pointer;
+    }
+    .icon {
+      width: 4px;
+      height: 4px;
+      background: #4c5564;
+      border-radius: 50%;
+      margin-right: 10px;
+    }
+    .active {
+      background: #e3edfe;
+      color: #000;
+      .icon {
+        background: #0077ec;
+      }
+    }
+  }
+}
+</style>

src/views/hotforum/Index.vue

@@ -22,7 +22,7 @@
           {img:'01',url:'1265897142383042560'},
           {img:'02',url:'1265697724606210048'},
           {img:'003',url:'1280185851054231552'},
-          {img:'4',url:''},
+          {img:'04',url:'1321778585966247936'},
         ],
       }
     },
@@ -97,7 +97,7 @@
       padding: 28px;
       padding-top: 62px;
       margin-bottom: 59px;
-      
+
       .img {
         width: 100%; // 图片宽度占满item宽度
         height: auto; // 自动调整高度
@@ -132,7 +132,7 @@
       padding: 14px;
       padding-top: 26px;
       margin-bottom: 30px;
-      
+
       .img {
         width: 100%; // 图片宽度占满item宽度
         height: auto; // 自动调整高度
@@ -176,4 +176,4 @@
   }
 }
 }
-</style>
+</style>

src/views/lecturer/CoachingPage.vue

@@ -22,7 +22,7 @@ export default {
   },
   methods:{
     getTeacherList() {
-      addTeacher({pageNo:1,pageSize:100,keyword:''}).then(res=>{
+      addTeacher({pageNo:1,pageSize:20,keyword:''}).then(res=>{
         this.options = res.data.map(item => {
           return { value: item.realName, label: item.realName };
         });

src/views/lecturer/CoachingSuccess.vue

@@ -64,7 +64,7 @@ export default {
       })
     },
     addTeacher() {
-      addTeacher({pageNo: 1, pageSize: 10, keyword: this.form.teacherNo}).then(res => {
+      addTeacher({pageNo: 1, pageSize: 10, userNo: this.form.teacherNo}).then(res => {
         this.getProgress(res.data[0].id)
       })
     },

src/views/lecturer/FinalSuccess.vue

@@ -100,7 +100,7 @@ export default {
       })
     },
     addTeacher() {
-      addTeacher({pageNo: 1, pageSize: 10, keyword: this.form.teacherNo}).then(res => {
+      addTeacher({pageNo: 1, pageSize: 10, userNo: this.form.teacherNo}).then(res => {
         this.getProgress(res.data[0].id)
       })
     },

src/views/lecturer/OnlineLearning.vue

@@ -56,7 +56,7 @@ export default {
       })
     },
     addTeacher(){
-      addTeacher({pageNo:1,pageSize:10,keyword:this.form.teacherNo}).then(res=>{
+      addTeacher({pageNo:1,pageSize:10,userNo:this.form.teacherNo}).then(res=>{
         this.getProgress(res.data[0].id)
       })
     },
@@ -64,16 +64,17 @@ export default {
       getProgress({teacherId:id}).then(res=>{
         this.progressData=res.data
         if ( res.data.length>=1 ){
-          res.data.forEach((item,index)=>{
-            if (item.progress==100 && index==res.data.length-1){
-              this.disabled=false
-            }else if (item.progress==100) {
-            }else {
-              this.disabled=true
-              return
+          const isAll = true;
+          res.data.some(item => {
+            if (item.progress != 100) {
+              this.disabled = true;
+              isAll = false;
+              return true;
             }
-          })
-
+          });
+          if (isAll) {
+            this.disabled = false;
+          }
         }
       })
     },

src/views/lecturer/TwoAthentication.vue

@@ -87,7 +87,7 @@ export default {
       })
     },
     addTeacher(){
-      addTeacher({pageNo:1,pageSize:10,keyword:this.form.teacherNo}).then(res=>{
+      addTeacher({pageNo:1,pageSize:10,userNo:this.form.teacherNo}).then(res=>{
         this.getProgress(res.data[0].id)
       })
     },

src/views/lecturer/TwoCoaching.vue

@@ -25,7 +25,7 @@ export default {
   },
   methods:{
     getTeacherList() {
-      addTeacher({pageNo:1,pageSize:100,keyword:''}).then(res=>{
+      addTeacher({pageNo:1,pageSize:20,keyword:''}).then(res=>{
         this.options = res.data.map(item => {
           return { value: item.realName, label: item.realName };
         });

src/views/lecturer/TwoCos.vue

@@ -90,7 +90,7 @@ export default {
       })
     },
     addTeacher(){
-      addTeacher({pageNo:1,pageSize:10,keyword:this.form.teacherNo}).then(res=>{
+      addTeacher({pageNo:1,pageSize:10,userNo:this.form.teacherNo}).then(res=>{
         this.getProgress(res.data[0].id)
       })
     },

src/views/lecturer/TwoFinals.vue

@@ -95,7 +95,7 @@ export default {
       })
     },
     addTeacher(){
-      addTeacher({pageNo:1,pageSize:10,keyword:this.form.teacherNo}).then(res=>{
+      addTeacher({pageNo:1,pageSize:10,userNo:this.form.teacherNo}).then(res=>{
         this.getProgress(res.data[0].id)
       })
     },

src/views/portal/case/Charts.vue

@@ -0,0 +1,242 @@
+<template>
+  <div class="charts">
+    <div class="charts_header">
+      <portal-header textColor="#fff"></portal-header>
+      <div class="text">
+        排行榜
+      </div>
+    </div>
+    <div class="charts_content">
+      <div class="charts_item" :style="{justifyContent:recommendRank.length>0?'':'center'}">
+          <div :style="{width:recommendRank.length>0?'':'600px',marginRight:recommendRank.length>0?'':'45px'}" class="charts_item_box charts_bg1">
+            <div class="charts_text">
+              <div class="text">好评榜</div>
+              <el-dropdown trigger="click"  @command="positiveReview">
+                <span class="el-dropdown-link">
+                  {{favorableName}}<i class="el-icon-arrow-down el-icon--right"></i>
+                </span>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item command="total">总</el-dropdown-item>
+                  <el-dropdown-item command="quarter">季度</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </div>
+            <ul class="charts_list">
+              <li v-for="(item, index) in Positive" :key="index" class="list">
+                <router-link style="display: flex;align-items: center;" :to="'/case/detail?id=' + item.caseId">
+                  <img class="num" :src="require(
+                    `../../../../public/images/${imgNumBlue(index)}.png`
+                  )" alt="">
+                  <span class="text">{{ item.caseTitle }}</span>
+                </router-link>
+              </li>
+            </ul>
+          </div>
+          <div :style="{width:recommendRank.length>0?'':'600px'}" class="charts_item_box charts_bg2">
+            <div class="charts_text">
+              <div class="text">人气榜</div>
+              <el-dropdown trigger="click"  @command="popularityReview">
+                <span class="el-dropdown-link">
+                  {{popularityName}}<i class="el-icon-arrow-down el-icon--right"></i>
+                </span>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item command="total">总</el-dropdown-item>
+                  <el-dropdown-item command="quarter">季度</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </div>
+            <ul class="charts_list">
+              <li v-for="(item, index) in Popularity" :key="index" class="list">
+                <router-link style="display: flex;align-items: center;" :to="'/case/detail?id=' + item.caseId">
+                  <img class="num" :src="require(
+                    `../../../../public/images/${imgNumOrg(index)}.png`
+                  )" alt="">
+                  <span class="text">{{ item.caseTitle }}</span>
+                </router-link>
+              </li>
+            </ul>
+          </div>
+          <div v-if="recommendRank.length > 0" class="charts_item_box charts_bg3">
+            <div class="charts_text">
+              <div class="text">推荐榜</div>
+            </div>
+            <ul class="charts_list">
+              <li v-for="(item, index) in recommendRank" :key="index" class="list">
+                <router-link style="display: flex;align-items: center;" :to="'/case/detail?id=' + item.caseId">
+                  <img class="num" :src="require(
+                    `../../../../public/images/${imgNumPink(index)}.png`
+                  )" alt="">
+                  <span class="text">{{ item.caseTitle }}</span>
+                </router-link>
+              </li>
+            </ul>
+          </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import apiCase from "@/api/modules/cases.js";
+import portalHeader from '@/components/PortalHeader.vue'
+  export default {
+    name: 'charts',
+    components:{portalHeader},
+    data() {
+      return {
+        ankingList: [],//排行数据1
+        Popularity: [],//排行数据2
+        Positive: [],//排行数据3
+        recommendRank: [],
+        switch: {
+          'total': '总',
+          'quarter': '季度',
+        },
+        favorableName: '季度',
+        popularityName: '季度',
+      }
+    },
+    mounted() {
+      this.getPopularity();
+      this.getPositive();
+      this.getQueryRecommendRank()
+    },
+    methods: {
+      getPopularity() {
+        apiCase.queryPraisesNew(10,this.popularityName == '季度' ? 1 : 2).then(res => {
+          if(res.status == 200) {
+            this.Popularity = res.result
+          }
+        })
+      },
+      getPositive() {
+        apiCase.queryCommentsNew(10,this.favorableName == '季度' ? 3 : 4).then(res => {
+          if(res.status == 200) {
+            this.Positive = res.result
+          }
+        })
+      },
+      getQueryRecommendRank(){
+        apiCase.queryRecommendRank(10).then(res => {
+          if(res.status == 200) {
+            this.recommendRank = res.result
+          }
+        })
+      },
+      imgNumBlue(index){
+        return 'listblue0' + (index+1)
+      },
+      imgNumOrg(index){
+        return (
+          index>2?'listblue0' + (index+1):'list0'+(index+1)
+        )
+      },
+      imgNumPink(index){
+        return (
+          index>2?'listblue0' + (index+1):'listred0'+(index+1)
+        )
+      },
+      positiveReview(e){
+        this.favorableName = this.switch[e]
+        this.getPositive()
+      },
+      popularityReview(e){
+        this.popularityName = this.switch[e]
+        this.getPopularity()
+      },
+    },
+  }
+</script>
+
+<style lang="scss" scoped>
+.el-dropdown-link {
+  cursor: pointer;
+  font-weight: 400;
+  font-size: 14px;
+  color: rgba(51,51,51,0.9);
+}
+.el-icon--right{
+  margin-left: 13px !important;
+}
+.charts{
+  min-height: 100vh;
+  background-color: #F2F5F7;
+  .charts_header{
+    width: 100%;
+    // height: 240px;
+    background: url('../../../../public/images/headerBack.png') no-repeat;
+    background-size: 100% 100%;
+    padding-bottom: 37px;
+    .text{
+      margin-top: 41px;
+      font-weight: 400;
+      font-size: 340%;
+      color: #FFFFFF;
+      padding-left: 98px;
+    }
+  }
+  .charts_content{
+    padding: 52px 91px 58px;
+    .charts_item{
+      display: flex;
+      justify-content: space-between;
+      .charts_item_box{
+        width: 30%;
+        padding: 30px;
+        background-color: #fff;
+        width: 30%;
+        min-height: 716px;
+        margin-right: 30px;
+        .charts_text{
+          display: flex;
+          justify-content: space-between;
+          height: 40px;
+          align-items: center;
+          .text{
+            font-size: 24px;
+            color: #000000;
+          }
+        }
+        .charts_list{
+          .list{
+            cursor: pointer;
+            margin-top:30px;
+            line-height: 22px;
+            .num{
+              width: 25px;
+              height: 30px;
+              margin-right: 10px;
+            }
+            .text{
+              font-weight: 500;
+              font-size: 14px;
+              color: #677D86;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              white-space: nowrap;
+            }
+          }
+        }
+      }
+      .charts_bg1{
+        // width: 100%;
+        height: 100%;
+        background: url('../../../../public/images/qa-box.png') no-repeat;
+        background-size: 100% 100%;
+      }
+      .charts_bg2{
+        // width: 100%;
+        height: 100%;
+        background: url('../../../../public/images/list-or.png') no-repeat;
+        background-size: 100% 100%;
+      }
+      .charts_bg3{
+        // width: 100%;
+        height: 100%;
+        background: url('../../../../public/images/list-pink.png') no-repeat;
+        background-size: 100% 100%;
+      }
+    }
+  }
+}
+</style>

src/views/portal/case/Detail.vue

@@ -109,13 +109,28 @@
           </div>
         </div>
         <div class="xcontent2-minor" :style="{ display: zoomShow ? '' : 'none' }">
-          <div>
-            <div id="fixd-box">
-              <div class="portal-ranking ranking-bg">
-                <p class="ranking-title">好评榜</p>
+          <div id="fixd-box">
+            <router-link class="the_charts" to="/case/charts">
+              <div class="text">排行榜</div>
+              <div class="icon">></div>
+            </router-link>
+            <div>
+              <div class="portal-ranking ranking-bg" style="padding: 20px 15px;max-height: 222px;">
+                <div style="display: flex;justify-content: space-between;">
+                  <p class="ranking-title">好评榜</p>
+                  <el-dropdown trigger="click"  @command="positiveReview">
+                    <span class="el-dropdown-link">
+                      {{favorableName}}<i class="el-icon-arrow-down el-icon--right"></i>
+                    </span>
+                    <el-dropdown-menu slot="dropdown">
+                      <el-dropdown-item command="total">总</el-dropdown-item>
+                      <el-dropdown-item command="quarter">季度</el-dropdown-item>
+                    </el-dropdown-menu>
+                  </el-dropdown>
+                </div>
                 <ul class="ranking-data">
                   <li v-for="(item, index) in Positive" :key="index" class="title-line-ellipsis"
-                    style="cursor: pointer;margin-top:30px;line-height: 22px;" @click="jumpRouter(item)">
+                    style="cursor: pointer;margin-top:15px;line-height: 22px;" @click="jumpRouter(item)">
                     <span class="portal-right-text blue-one" v-if="index == 0">
                       <img :src="`${webBaseUrl}/images/listblue01.png`" alt="">
                     </span>
@@ -131,15 +146,26 @@
                     <span class="portal-right-text" v-if="index == 4">
                       <img :src="`${webBaseUrl}/images/list05.png`" alt="">
                     </span>
-                    <span class="portal-title-desc" style="font-size: 14px;">{{ item.title }}</span>
+                    <span class="portal-title-desc" style="font-size: 14px;">{{ item.caseTitle }}</span>
                   </li>
                 </ul>
               </div>
-              <div style="margin-top:26px" class="portal-ranking ranking-bg1">
-                <p class="ranking-title">人气榜</p>
+              <div style="padding: 20px 15px;max-height: 222px;margin-top: 20px;" class="portal-ranking ranking-bg1">
+                <div style="display: flex;justify-content: space-between;">
+                  <p class="ranking-title">人气榜</p>
+                  <el-dropdown trigger="click"  @command="popularityReview">
+                    <span class="el-dropdown-link">
+                      {{popularityName}}<i class="el-icon-arrow-down el-icon--right"></i>
+                    </span>
+                    <el-dropdown-menu slot="dropdown">
+                      <el-dropdown-item command="total">总</el-dropdown-item>
+                      <el-dropdown-item command="quarter">季度</el-dropdown-item>
+                    </el-dropdown-menu>
+                  </el-dropdown>
+                </div>
                 <ul class="ranking-data">
                   <li v-for="(item, index) in Popularity" :key="index" class="title-line-ellipsis"
-                    style="cursor: pointer;margin-top:30px;line-height: 22px;" @click="jumpRouter(item)">
+                    style="cursor: pointer;margin-top:15px;line-height: 22px;" @click="jumpRouter(item)">
                     <span class="portal-right-text orange-one" v-if="index == 0">
                       <img :src="`${webBaseUrl}/images/list-01.png`" alt="">
                     </span>
@@ -155,7 +181,27 @@
                     <span class="portal-right-text" v-if="index == 4">
                       <img :src="`${webBaseUrl}/images/list05.png`" alt="">
                     </span>
-                    <span class="portal-title-desc" style="font-size: 14px;">{{ item.title }}</span>
+                    <span class="portal-title-desc" style="font-size: 14px;">{{ item.caseTitle }}</span>
+                  </li>
+                </ul>
+              </div>
+              <div v-if="recommendRank.length > 0" class="portal-ranking ranking-bg2" style="padding: 20px 15px;max-height: 222px;margin-top: 20px;">
+                <p class="ranking-title">推荐榜</p>
+                <ul class="ranking-data">
+                  <li v-for="(item, index) in recommendRank" :key="index" class="title-line-ellipsis"
+                    style="cursor: pointer;margin-top:15px;line-height: 22px;">
+                    <router-link :to="'/case/detail?id=' + item.caseId">
+                      <span class="portal-right-text blue-one" v-if="index == 0">
+                        <img :src="`${webBaseUrl}/images/listred01 .png`" alt="">
+                      </span>
+                      <span class="portal-right-text blue-tow" v-if="index == 1">
+                        <img :src="`${webBaseUrl}/images/listred02.png`" alt="">
+                      </span>
+                      <span class="portal-right-text blue-three" v-if="index == 2">
+                        <img :src="`${webBaseUrl}/images/listred03.png`" alt="">
+                      </span>
+                      <span class="portal-title-desc" style="font-size: 14px;">{{ item.caseTitle }}</span>
+                    </router-link>
                   </li>
                 </ul>
               </div>
@@ -199,6 +245,12 @@ export default {
   },
   data() {
     return {
+      switch: {
+        'total': '总',
+        'quarter': '季度',
+      },
+      favorableName: '季度',
+      popularityName: '季度',
       fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
       resonimg: {},
       Internet: 3,//1是成功 2是是失败 3是检测中
@@ -210,6 +262,7 @@ export default {
       ankingList: [],
       Popularity: [],
       Positive: [],
+      recommendRank: [],
       resolveId: '',
       basePath: process.env.VUE_APP_FILE_BASE_URL,
       pdfPath: '',
@@ -271,6 +324,14 @@ export default {
     this.cumulativeDuration = 0;
   },
   methods: {
+    positiveReview(e){
+      this.favorableName = this.switch[e]
+      this.getPositive()
+    },
+    popularityReview(e){
+      this.popularityName = this.switch[e]
+      this.getPopularity()
+    },
     endTimeRequst(caseId, recordEndTime) {
       console.log(this.dataTime);
       let time = (recordEndTime - this.dataTime) / 1000 / 60
@@ -297,6 +358,7 @@ export default {
       this.getAnkingData();
       this.getPopularity();
       this.getPositive();
+      this.getQueryRecommendRank();
       this.couresreso();
       this.retest();
       window.addEventListener(
@@ -329,7 +391,7 @@ export default {
         timedOut = true;
         xmlhttp.abort();
       }, 5000);
-      xmlhttp.open("HEAD", window.location.protocol + "//uapi.boe.com.cn", true);
+      xmlhttp.open("HEAD", window.location.protocol + "//uapi.boe.com.cn/500.html", true);
       xmlhttp.send();
       xmlhttp.onreadystatechange = function () {
         if (xmlhttp.readyState == 4) {
@@ -442,13 +504,13 @@ export default {
       // location.href =`${this.webBaseUrl}/case/detail?id=${item.id}`
       // this.$router.push(`/case/detail?id=${item.id}`);
       const currentRoute = this.$router.currentRoute;
-      if (currentRoute.query.id !== item.id) {
-        this.$router.push('/case/detail?id=' + item.id);
+      if (currentRoute.query.id !== item.caseId) {
+        this.$router.push('/case/detail?id=' + item.caseId);
       } else {
         // 结束时间
         let recordEndTime = new Date().getTime()
         this.endTimeRequst(item.id, recordEndTime)
-        location.href = `${this.webBaseUrl}/case/detail?id=${item.id}`
+        location.href = `${this.webBaseUrl}/case/detail?id=${item.caseId}`
       }
     },
     goTop() {
@@ -489,9 +551,9 @@ export default {
       if (pdfTopBox.getBoundingClientRect().top < 1000) {
         document.querySelector('#pdfTopBox').style.cssText = "position:static";
       }
-      if (scrollTop > 630) {
+      if (scrollTop > 240) {
         this.isTopBoxShow = true;
-        document.querySelector('#fixd-box').style.cssText = "position: fixed;top: -400px;width:" + outerWidth + "px";
+        document.querySelector('#fixd-box').style.cssText = "position: fixed;top: 10px;width:" + outerWidth + "px";
       } else {
         document.querySelector('#fixd-box').style.cssText = "position: static";
       }
@@ -505,40 +567,53 @@ export default {
       })
     },
     getPopularity() {
-      apiCase.queryPraises(5).then(res => {
-        if (res.status == 200) {
-          this.Popularity = res.result;
-          if (res.result.length < 5) {
-            for (let i = 0; i = (5 - res.result.length); i++) {
-              this.Popularity.push({
-                authorName: '',
-                count: 1,
-                id: '',
-                title: '',
-              })
-            }
-          }
+      // apiCase.queryPraises(5).then(res => {
+      //   if (res.status == 200) {
+      //     this.Popularity = res.result;
+      //     if (res.result.length < 5) {
+      //       for (let i = 0; i = (5 - res.result.length); i++) {
+      //         this.Popularity.push({
+      //           authorName: '',
+      //           count: 1,
+      //           id: '',
+      //           title: '',
+      //         })
+      //       }
+      //     }
+      //   }
+      // })
+      apiCase.queryPraisesNew(3,this.popularityName == '季度' ? 1 : 2).then(res => {
+        if(res.status == 200) {
+          this.Popularity = res.result
+        }
+      })
+    },
+    getQueryRecommendRank(){
+      apiCase.queryRecommendRank(3).then(res => {
+        if(res.status == 200) {
+          this.recommendRank = res.result
         }
       })
     },
     getPositive() {
-      apiCase.queryComments(5).then(res => {
-        if (res.status == 200) {
-          this.Positive = res.result;
-          if (res.result.length < 5) {
-            for (let i = 0; i = (5 - res.result.length); i++) {
-              this.Positive.push({
-                authorName: '',
-                count: 1,
-                id: '',
-                title: '',
-              })
-            }
-
-          }
-          // console.log(this.Positive);
-
-
+      // apiCase.queryComments(5).then(res => {
+      //   if (res.status == 200) {
+      //     this.Positive = res.result;
+      //     if (res.result.length < 5) {
+      //       for (let i = 0; i = (5 - res.result.length); i++) {
+      //         this.Positive.push({
+      //           authorName: '',
+      //           count: 1,
+      //           id: '',
+      //           title: '',
+      //         })
+      //       }
+      //     }
+      //   }
+      // })
+      apiCase.queryCommentsNew(3,this.favorableName == '季度' ? 3 : 4).then(res => {
+        if(res.status == 200) {
+          this.Positive = res.result
         }
       })
     },
@@ -659,7 +734,32 @@ export default {
     border-radius: 8px;
   }
 }
+.the_charts{
+  position: relative;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-bottom: 10px;
+  font-size: 18px;
+  max-width: 400px;
+  min-width: 260px;
+  height: 47px;
+  background: #DDEDFF;
+  border-radius: 8px;
+  .text{
+    font-size: 18px;
+    color: #387DF7;
+  }
+  .icon{
+    position: absolute;
+    font-size: 18px;
+    color: #387DF7;
+    right: 25px;
+    top: 50%;
+    transform: translateY(-50%);
+  }
 
+}
 .pdftext {
 
   // padding: 0 20px;

src/views/portal/case/Excellent.vue

@@ -0,0 +1,666 @@
+<template>
+  <div class="excellent">
+    <div class="charts_header">
+      <portal-header textColor="#fff"></portal-header>
+      <div class="text">
+        浏览TOP榜单
+      </div>
+    </div>
+    <div class="ex_content">
+      <div class="ex_top">
+        <div class="ex_select">
+          <div class="ex_left">
+            <div style="margin-right: 12px;">
+              <el-select v-model="majorValue" @change="majorChange" placeholder="请选择专业">
+                <el-option
+                  v-for="item in speciDataNew"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.code">
+                </el-option>
+              </el-select>
+            </div>
+            <div>
+              <el-select v-model="monthValue" @change="monthChange" placeholder="请选择月份">
+                <el-option
+                  v-for="item in optionsMonth"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </div>
+          </div>
+          <div class="ex_right" @click="goCase">返回</div>
+        </div>
+      </div>
+      <div v-if="caseList.list.length != 0" class="data-content">
+        <div v-for="item in caseList.list" :key="item.id" class="case-list">
+          <div class="case-info" style="padding-bottom: 28px;">
+            <div class="case-info-cont">
+              <div @click="toCaseDetail(item.id, item.refId)" style="cursor: pointer;">
+                <div class="case-info-title">
+                  <div class="case-titdiv">
+                    <div class="case-tittext">
+                      <span class="title-line-ellipsis" v-html="item.title"></span>
+                    </div>
+                    <div class="case-activeText">
+                      <!-- <span v-if="item.breCommend" class="comWords"
+                        style="background-color:rgba(232, 139, 72);">荐</span>
+                      <span v-if="item.excellent" class="comWords" style="background-color:red;">最佳</span> -->
+                      <span v-if="item.excellentTag" class="comWords" style="width: 98px;height: 24px;background: #F99000;border-radius: 2px;font-weight: 400;font-size: 12px;color: #FFFFFF;padding: 4px 10px;">
+                        {{item.excellentTag}}
+                      </span>
+                      <span v-if="item.viewRankTags.length != 0" v-for="tag in item.viewRankTags" class="comWords" style="width: 98px;height: 24px;background: #F99000;border-radius: 2px;font-weight: 400;font-size: 12px;color: #FFFFFF;padding: 4px 10px;">
+                        {{tag.tagName}}
+                      </span>
+                    </div>
+                    <div class="case-info-date portal-time">
+                      <i class="el-icon-time"></i>
+                      <time-show :time="item.sysCreateTime"></time-show>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div style="height:58px;padding-top:14px ">
+                <author :avatar="item.authorInfo.avatar" :name="item.authorInfo.name" :info="item.authorInfo.orgInfo"
+                  :sex="item.authorInfo.sex" :authorTags="item.authorTags" :aid="item.authorInfo.aid">
+                  <template>
+                    <div v-if="item.breCommend"
+                      style="padding-top: 6px;flex: 1;display: flex;justify-content: flex-end;color: #999;font-size: 12px;">
+                      <span>{{ item.recommendOrgName }}推荐</span>
+                    </div>
+                  </template>
+                </author>
+              </div>
+              <div @click="toCaseDetail(item.id, item.refId)" style="cursor: pointer;">
+                <div class="keyword-text clearfix">
+                  <div style="color:#2974D6;font-weight: 450;" v-if="item.orgDomainParent">
+                    {{ orgDomainTranslate(item.orgDomainParent) }}
+                  </div>
+                  <div style="color:#2974D6;font-weight: 450;" v-for="(item, idx) in item.majorType" :key="idx">
+                    {{ majorTypeTranslate(item) }}
+                  </div>
+                  <div v-if="item.keyword1">{{ item.keyword1 }}</div>
+                  <div v-if="item.keyword2">{{ item.keyword2 }}</div>
+                  <div v-if="item.keyword3">{{ item.keyword3 }}</div>
+                  <div v-if="item.keyword4">{{ item.keyword4 }}</div>
+                  <div v-if="item.keyword5">{{ item.keyword5 }}</div>
+                </div>
+              </div>
+              <div class="case-info-summary two-line-ellipsis" @click="toCaseDetail(item.id, item.refId)">
+                {{ item.summary }}
+              </div>
+              <!-- <div style="display: flex;justify-content: flex-end;">
+                <div style="margin:8px 0;">
+                  <interactBar :type="3" :data="item" :comments="false" :shares="true"></interactBar>
+                </div>
+              </div> -->
+            </div>
+          </div>
+        </div>
+        <div v-if="caseList.showPagCount > queryCondition.pageSize">
+          <pagination :size="queryCondition.pageSize" :total="caseList.count" :page="queryCondition.pageIndex"
+            layout="total, prev, pager, next, jumper" @change-page="currentChange"></pagination>
+        </div>
+      </div>
+      <div class="pagination-div" v-if="caseList.list.length == 0">
+        <span class="notcoures">
+          <img :src="`${webBaseUrl}/images/nocase.png`" alt="">
+          <h5>暂无案例，请优先学习其它案例吧～</h5>
+        </span>
+      </div>
+      <div v-if="isSeach" style="height:382px">
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from "vuex";
+import portalHeader from "@/components/PortalHeader.vue";
+import portalFooter from "@/components/PortalFooter.vue";
+import portalFloatTools from "@/components/PortalFloatTools.vue";
+import interactBar from "@/components/Portal/interactBar.vue";
+import timeShow from "@/components/Portal/datetimeShow.vue";
+import author from "@/components/Portal/authorInfo.vue";
+import apiCase from "@/api/modules/cases.js";
+import apiUser from "@/api/system/user.js";
+import apiSearchterm from "@/api/modules/searchterm.js";
+import { deepClone } from "../../../utils";
+import apiDict from "@/api/modules/dict.js";
+import apiType from "@/api/modules/type.js";
+import { cutFullName } from "@/utils/tools.js";
+import apiPlace from "@/api/phase2/place.js"
+  export default {
+    name: 'excellent',
+    components: {
+      portalHeader,
+      portalFooter,
+      portalFloatTools,
+      interactBar,
+      timeShow,
+      author
+    },
+    data() {
+      return {
+        majorId: '',
+        rankMonth: '',
+        optionsMonth: [],
+        majorValue: '',
+        monthValue: '',
+        caseList: {
+          count: 0,
+          list: [],
+          showPagCount: 0
+        },
+        isSeach: false,
+        domain: [],//组织领域
+        speciData: [],//专业分类
+        speciDataNew: [],
+        monthsObject: {},
+        treeList:[],
+        queryCondition: {
+          pageIndex: 1,
+          pageSize: 10,
+          majorType: '', //专业分类code
+          excellent: true,
+          keyWord: '',
+          orgDomainDtos: [],
+          caseType: process.env.VUE_APP_CASE_TYPE,
+          authorName: '',
+          notInIds: [],
+          type: 'all',
+          userId: '',
+          parent: '',
+          children: [],
+          name: '',
+          years: [],
+          // 随机
+          notInIds: [],//重复的id
+          orderField: "id",
+          orderAsc: false,//排序
+          sysType1:'',
+          sysType2:'',
+          sysType3:''
+        },
+      }
+    },
+    mounted() {
+      this.majorValue = this.$route.query.majorName
+      const dateStr = this.$route.query.riseRankTime;
+      const year = dateStr.substring(2, 4) + '年';
+      const month = dateStr.substring(5, 7) + '月';
+      this.monthValue = year + month;
+      this.getCaseData()
+      Promise.all([apiType.treeList(1,Number(this.caseType ?? 155),1), apiCase.majorTypes(),apiCase.queryAllTimePopularityOfMajor()]).then(rs => {
+        if (rs[0].code == 200) {
+          const {records} = rs[0].data
+          records.forEach(item => {
+            item.fielclass = false;
+            item.type = 'org_domain';
+            item.list = item.children ? item.children : []
+            if (Array.isArray(item.children)) {
+              item.list.forEach(sub => {
+                sub.list = sub.children ? sub.children : []
+                sub.fielclass = false
+                if (Array.isArray(sub.children)) {
+                  sub.list.forEach(three => {
+                    three.list = three.children ? three.children : []
+                    three.fielclass = false
+                  })
+                }
+              })
+            }
+          })
+          this.domain = records;
+        }
+        if (rs[1].status == 200) {
+          rs[1].result.forEach(item => {
+            item.fielclass = false;
+            item.type = 'major_type';
+          })
+          this.speciData = rs[1].result;
+        }
+        if(rs[2].status == 200){
+          const months = Object.keys(rs[2].result)
+          this.monthsObject = rs[2].result
+          months.forEach(item=>{
+            rs[1].result.forEach(sub=>{
+              if(item == sub.code){
+                this.speciDataNew.push(sub)
+              }
+            })
+          })
+        }
+        this.selectMonth(this.$route.query.majorId)
+      });
+      this.loadTypeData();//加载分类
+    },
+    computed: {
+      tagList() { //列表属性，用于计算
+      let list = [];
+      if (this.keyWord) {
+        list.push({ type: '0', code: 'keyword', name: this.keyWord, checked: true })
+      }
+      this.domain.forEach(one => {
+        var twoChildChecked = false;//是否有下级
+        one.list.forEach(two => {
+          if (two.fielclass) {
+            twoChildChecked = true;
+          }
+          var threeChildChecked = false;
+          two.list.forEach(three => {
+            if (three.fielclass) {
+              list.push(three);
+              threeChildChecked = true;
+            }
+          });
+          if (two.fielclass && !threeChildChecked) {
+            list.push(two);
+          }
+        });
+        if (one.fielclass && !twoChildChecked) {
+          list.push(one);
+        }
+      })
+      this.speciData.forEach(item => {
+        if (item.fielclass) {
+          list.push(item);
+        }
+      });
+      this.treeList.forEach(one => {
+        var twoChildChecked = false;//是否有下级
+        one.children && one.children.forEach(two => {
+          if (two.checked) {
+            twoChildChecked = true;
+          }
+          var threeChildChecked = false;
+          two.children  && two.children.forEach(three => {
+            if (three.checked) {
+              list.push(three);
+              threeChildChecked = true;
+            }
+          });
+          if (two.checked && !threeChildChecked) {
+            list.push(two);
+          }
+        });
+        if (one.checked && !twoChildChecked) {
+          list.push(one);
+        }
+      })
+
+      return list;
+    },
+    },
+    methods: {
+      selectMonth(e){
+        this.optionsMonth = this.monthsObject[e].map(item=>{
+          return {
+            value: item,
+            label: item.split('-')[0]+'年'+item.split('-')[1]+'月'
+          }
+        })
+      },
+      majorChange(e){
+        this.selectMonth(e)
+        this.majorId = e
+        this.rankMonth = '20' + this.optionsMonth[0].value + '-' + '20'
+        this.monthValue = this.optionsMonth[0].label
+        this.getCaseData()
+      },
+      monthChange(e){
+        this.rankMonth ='20' + e + '-' + '20'
+        this.getCaseData()
+      },
+      orgDomainTranslate(code) { // 组织领域翻译
+        if (code == '') {
+          return
+        }
+        let name = '';
+        let data = this.domain.find(item => {
+          return item.code == code;
+        });
+        if (data) {
+          name = data.name;
+        }
+        return name;
+      },
+      majorTypeTranslate(code) { // 专业分类翻译
+        let name = '';
+        let data = this.speciData.find(item => item.code == code);
+        if (data) {
+          name = data.name;
+        }
+        return name;
+      },
+      async loadTypeData() {
+        try {
+          const { result, status } = await apiType.tree(1);
+          if (status === 200) {
+            result.forEach(one => {
+              one.checked = false;
+              if(!one.children) one.children = []
+              one.children && one.children.forEach(two => {
+                two.checked = false;
+                if(!two.children) two.children = []
+                two.children && two.children.forEach(three => {
+                  three.checked = false;
+                  if(!three.children) three.children = []
+                })
+              })
+            })
+            this.treeList = result
+          }
+        } catch (error) {
+          // console.log(error);
+        }
+      },
+      goCase() {
+        this.$router.go(-1);
+      },
+      toCaseDetail(id, refId) {
+        if (refId) {
+          apiCase.startReadTimer(refId)
+        }
+        this.$router.push({ path: '/case/detail', query: { id } });
+      },
+      getAllFielclass() { //获取全部选中的标签
+        let newlist = JSON.parse(JSON.stringify(this.domain))
+        return newlist.filter(one => {
+          one.list = one.list.filter(two => {
+            two.list = two.list.filter(three => {
+              return three.fielclass;
+            })
+            return two.fielclass;
+          });
+          return one.fielclass
+        })
+      },
+      currentChange(val) {
+        this.caseList.showPagCount = 0
+        this.queryCondition.pageIndex = val
+        this.getCaseData()
+      },
+      getCaseUserData(caseList) {
+        let ids = caseList.map((item, index) => {
+          return item.authorId;
+        });
+        //不能为空
+        if (!ids.length) return
+
+        const noReapetIds = [...new Set(ids)];
+        apiUser.getByIds(noReapetIds).then(res => {
+          if (res.status == 200) {
+            caseList.forEach((item, index) => {
+              res.result.some(author => {
+                if (author.aid == item.authorId) {
+                  item.authorInfo = author;
+                  author.orgInfo = cutFullName(author.orgInfo, 1);
+                  return true;
+                } else {
+                  return false;
+                }
+              });
+            });
+          } else {
+            this.$message.error(res.message);
+          }
+        });
+      },
+      async getCaseData() {
+        let majorTypeList = [];
+        let allFielclass = JSON.parse(JSON.stringify(this.getAllFielclass()));
+        // 获取树状id
+        this.queryCondition.orgDomainDtos = allFielclass.map(item => {
+          item.list = item.list.map(two => {
+            two.list = two.list.map(three => {
+              return {
+                parent: three.code
+              }
+            })
+            return {
+              parent: two.code,
+              children: two.list || []
+            }
+          })
+          return {
+            parent: item.code,
+            children: item.list || []
+          }
+        })
+        // 专业分类的id
+        this.tagList.forEach(tag => {
+          if (tag.type == '0') {
+            this.queryCondition.keyWord = tag.name;
+          } else if (tag.type == 'major_type') {
+            majorTypeList.push(tag.code);
+          }
+        });
+        this.queryCondition.majorType = majorTypeList.join(',');
+        this.queryCondition.majorId = this.majorId || this.$route.query.majorId
+        this.queryCondition.rankMonth = (this.rankMonth || this.$route.query.riseRankTime) + ' 00:00:00'
+        await apiCase.queryPopularityOfMajor(this.queryCondition).then((res) => {
+          if (res.status == 200) {
+            if (res.result.length > 0) {
+              this.isSeach = false;
+              res.result.forEach(item => {
+                item.majorType = item.majorType ? item.majorType.split(",") : [];
+                item.isAll = false;
+                item.authorInfo = {
+                  aid: "",
+                  name: "",
+                  orgInfo: "",
+                  avatar: "",
+                  sex: null
+                };
+              });
+            }
+            res.result.forEach(item=>{
+              item.viewRankTags = item.viewRankTags.slice(0,2)
+            })
+            this.caseList.list = res.result
+            if(this.caseList.length == 0){
+              this.isSeach = true
+            }else{
+              this.isSeach = false
+            }
+            this.getCaseUserData(res.result);
+            // 给所有的赋值
+            this.caseList.count = res.result.count;
+            this.caseList.showPagCount = res.result.count;
+          } else {
+            this.$message.error(res.message);
+          }
+        }).catch(err => {
+          // console.log(err);
+        });
+      },
+    },
+  }
+</script>
+
+<style lang="scss" scoped>
+.keyword-text {
+
+  div {
+    padding: 0px 8px;
+    margin-top: 5px;
+    float: left;
+    line-height: 24px;
+    font-size: 12px;
+    border-radius: 2px;
+    margin-right: 8px;
+    color: #2C68FF;
+    height: 24px;
+    background: rgba(44, 104, 255, 0.06);
+  }
+}
+.case-titdiv {
+  line-height: 30px;
+  display: flex;
+
+  .case-tittext {
+    font-size: 18px;
+    font-weight: 600;
+    color: #333333;
+    max-width: 67%;
+  }
+
+  .case-activeText {
+    line-height: 27.5px;
+
+    .comWords {
+      color: white;
+      font-size: 12px;
+      border-radius: 2px;
+      padding: 2px 4px;
+      margin-left: 20px;
+    }
+
+  }
+}
+.excellent{
+  background-color: #F2F5F7;
+  min-height: 100vh;
+  .charts_header{
+    width: 100%;
+    // height: 240px;
+    background: url('../../../../public/images/headerBack.png') no-repeat;
+    background-size: 100% 100%;
+    padding-bottom: 37px;
+    .text{
+      margin-top: 41px;
+      font-weight: 400;
+      font-size: 340%;
+      color: #FFFFFF;
+      padding-left: 98px;
+    }
+  }
+
+  .ex_content{
+    padding: 31px 90px 103px;
+    .ex_top{
+      background-color: #F2F5F7;
+      margin-bottom: 15px;
+      .ex_text{
+        font-size: 20px;
+        color: #fff;
+        margin-bottom: 10px;
+      }
+      .ex_select{
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        .ex_left{
+          display: flex;
+        }
+        .ex_right{
+          width: 71px;
+          height: 38px;
+          background: #2478FF;
+          border-radius: 4px;
+          text-align: center;
+          line-height: 38px;
+          cursor: pointer;
+          color: #fff;
+        }
+      }
+    }
+    .data-content {
+      background-color: #fff;
+      padding: 5px 50px;
+
+      ::v-deep .interact-bar-btns {
+        .interact-bar-btn {
+          text-align: right;
+          min-width: 78px !important;
+          margin-right: 0;
+        }
+      }
+
+      .case-list:last-child {
+        border-bottom: none;
+      }
+
+      .case-list {
+        border-bottom: 1px solid rgba(153, 153, 153, .2);
+        margin-top: 10px;
+        margin-bottom: 25px;
+        padding-left: 5px;
+        padding-right: 5px;
+      }
+
+      .case-image {
+        width: 230px;
+        height: 170px;
+        float: left;
+        border: 1px solid #eee;
+      }
+
+      .case-info {
+        .case-info-cont {
+          .case-info-title {
+            font-size: 15px;
+            color: #333;
+            font-weight: 600;
+            height: 30px;
+
+            .case-info-date {
+              flex: 1;
+              text-align: right;
+              font-weight: normal;
+
+              // font-size: 12px;
+              // height: 30px;
+              // font-weight: 200;
+              // color: #8590a6;
+              i {
+                margin-right: 5px;
+              }
+            }
+          }
+
+          .case-info-summary {
+            margin-top: 16px;
+            cursor: pointer;
+            margin-bottom: 5px;
+            word-break: break-all;
+            line-height: 24px;
+            font-size: 14px;
+            color: #333330;
+            font-weight: 400;
+          }
+
+          .case-info-tools {
+            height: 30px;
+
+            .case-info-tools-auth {
+              float: left;
+              font-size: 13px;
+              color: #999999;
+
+              img {
+                margin-right: 10px;
+                width: 30px;
+                border: 1px solid #eee;
+                border-radius: 50%;
+                vertical-align: middle;
+              }
+            }
+
+            .case-info-tools-btns {
+              float: right;
+
+              .case-info-tools-btn {
+                margin: 0 0 0 15px;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+</style>

src/views/portal/course/rePreview.vue

@@ -360,17 +360,25 @@ export default {
             }
       } else if(r.contentType == 40) {
          //let url = this.fileBaseUrl + r.content;
-         if(r.content!='' && r.content.indexOf('.pdf')==-1){
-             apiCourseFile.detail(r.contentRefId).then(cfrs=>{
-               if(cfrs.status==200){
-                  r.content=cfrs.result.previewFilePath;
-                  //console.log(r.content);
-               }else{
-                  $this.$message.error('加载pdf课件文件失败');
-               }
-             });
-         }
-
+        if(r.content!='' && r.content.indexOf('.pdf')==-1){
+          apiCourseFile.detail(r.contentRefId).then(cfrs=>{
+            if(cfrs.status==200){
+              r.content=cfrs.result.previewFilePath;
+              //console.log(r.content);
+            }else{
+              $this.$message.error('加载pdf课件文件失败');
+            }
+          });
+        }
+        if(r.content==''){
+          apiCourseFile.detail(r.contentRefId).then(cfrs=>{
+            if(cfrs.status==200){
+              r.content=cfrs.result.previewFilePath;
+            }else{
+              $this.$message.error('加载pdf课件文件失败');
+            }
+          });
+        }
       }
       this.contentData = r;
     },

src/views/study/Courses.vue

@@ -253,8 +253,8 @@ export default {
         if(res.status==200){
             let localCourseIds=[];//本地在线课程的id集合
             res.result.list.forEach(item=>{
-              if(item.courseImage.startsWith('/upload')){
-                 item.courseImage=$this.fileUrl+item.courseImage.substring(7)
+              if(item.courseImage?.startsWith('/upload')){
+                 item.courseImage=$this.fileUrl+item.courseImage?.substring(7)
               }
               if(item.source==2){
                 localCourseIds.push(item.id);

src/views/study/coursenew.vue

@@ -27,7 +27,7 @@
               <course-image v-if="courseInfo.id != ''" :course="courseInfo"></course-image>
             </div>
             <div v-if="resType == 10" style="position: relative;">
-              <videoPlayer ref="myVideoPlayer" id="myVideoPlayer" @progress="progress" :src="blobUrl" @onPlayerPlaying="onPlayerPlaying"
+              <videoPlayer ref="myVideoPlayer" id="myVideoPlayer" @progress="progress" :src="blobUrl" :blobId="blobId" @onPlayerPlaying="onPlayerPlaying"
                 :initTime="contentData.lastStudyTime" :notePlay="notePlay" @onPlayerPlay="onPlayerPlay"
                 :isDrag="curriculumData.isDrag" @onFullscreen="onFullscreen" @onPlayerPause="onPlayerPause"
                 @onPlayerEnded="onPlayerEnded" :isCrowd="isCrowd" @onTimeUpdate="handleAudioTimeUpdate"></videoPlayer>
@@ -167,7 +167,6 @@
             </div>
             <!-- 课程单元  -->
             <div class="course-units" v-if="tab == 1">
-
               <div :style="`height: ${controlHeight}px;overflow-y: auto;`">
                 <div class="catalog" v-if="courseInfo.type == 20">
                   <div  v-for="(item, index) in catalogTree" :key="index" :name="index">
@@ -292,7 +291,8 @@
                     <!-- <span style="font-size: 12px; color:#666666 ;">( {{cutOrgNamePath(item.authorInfo.orgInfo)}} )</span> -->
                 </div>
                 <!-- <div class="teacher-remark" v-html="item.authorInfo.sign"></div> -->
-                <div class="teacher-remark">{{cutOrgNamePath(item.authorInfo.orgInfo)}}</div>
+                <div v-if="item.teacherType === 1 " class="teacher-remark">{{cutOrgNamePath(item.authorInfo.orgInfo)}}</div>
+                <div v-else>{{item.supplier}}</div>
               </div>
               <div  style="padding-top:15px;width:70px;">
                 <followButton v-if="item.teacherName!=='BOE教师'" :auto="true" size="small" :aid="item.teacherId"></followButton>
@@ -501,7 +501,7 @@
           }
           treeList.push(treeNode);
         });
-        console.log(treeList,'treeList')
+        // console.log(treeList,'treeList')
         return treeList;
       }
     },
@@ -652,6 +652,8 @@
         } else {
           this.blobUrl = process.env.VUE_APP_BASE_API + '/xboe/m/course/cware/resource?sign=' + urlSign;
         }
+        // console.log('this.contentData.id:',this.contentData.id)
+        this.blobId = this.contentData.id
         //console.log(this.blobUrl,'this.blobUrl');
       },
       widthOpen(url) {
@@ -753,7 +755,7 @@
         if (this.contentData.status < 2) {
           // this.contentData.status = 2; //进行中
           if(r.contentType != 61&&r.contentType != 20 && r.contentType != 10){
-            setTimeout(() => {              
+            setTimeout(() => {
               this.isContentTypeTwo = r.contentType
               $this.isShowTime()
               }, 2000);
@@ -800,6 +802,11 @@
 
 
         this.$nextTick(function(){
+            if(this.contentData.progressVideo){
+              this.$refs.myVideoPlayer.updateProgressByClickBar2(this.contentData.lastStudyTime,this.contentData.progressVideo);
+              // $this.notePlay = this.contentData.lastStudyTime;
+            }
+
             //let h0=document.getElementById('id_course_player').offsetHeight;
             let h=$this.$refs.coursePlayer.offsetHeight;
             //let h1=$this.$refs.coursePlayer.clientHeight;
@@ -814,6 +821,28 @@
             $this.controlHeight=h-95;
             //console.log(h,$this.controlHeight,'$this.controlHeight');
         })
+
+
+        //console.log('this.contentData11:',this.contentData,this.curriculumData)
+        // 视频设置禁用处理逻辑,如果用户已全部观看完该视频，则设置为能全部拖动的逻辑，把isDrag设置为true即可,同时删除本地存储的数据
+        if(this.contentData.progressVideo ===1){
+          var obj = JSON.parse(this.contentData.content)
+          obj.isDrag = true
+          this.contentData.content = JSON.stringify(obj)
+          this.curriculumData.isDrag = true
+          var time = localStorage.getItem('videoProgressData')
+          var arr = time&&JSON.parse(time) || {}
+          //alert(con.progressVideo+'--'+con.id + '--'+JSON.stringify(arr))
+          delete arr[this.contentData.id];
+          localStorage.setItem('videoProgressData',JSON.stringify(arr))
+        }
+        if(this.contentData.progressVideo>0 && this.contentData.progressVideo !==1){
+          var time = localStorage.getItem('videoProgressData')
+          var arr = time&&JSON.parse(time) || {}
+          arr[this.contentData.id] = this.contentData.progressVideo
+          localStorage.setItem('videoProgressData',JSON.stringify(arr))
+        }
+
       },
       isShowTime(){
         if(this.isContentTypeTwo != this.contentData.contentType){
@@ -1116,6 +1145,8 @@
         //   }
         // }
         this.playerBoxShow = false;
+        // this.onPlayerPlayFullscreen()
+        // this.$watermark.set(this.userInfo.name + this.userInfo.loginName);
         let $this = this;
         //这里有些不准备，如果文件未能加载，这个事件就是错误的
         this.isAppendTime=true;
@@ -1133,6 +1164,7 @@
         //   }
         // }
       },
+
       onFullscreen(full) {
         let divId = 'videowatermark';
         var div = document.getElementById('myVideoPlayer')
@@ -1152,9 +1184,12 @@
             "position:absolute;pointer-events: none; width: 100%;height: 100%;top:0;left:0;bottom: 0;right: 0; display: flex;justify-content: center;flex-wrap: wrap;overflow: hidden; opacity:0.3;padding-top:10px";
           div.appendChild(div3);
         } else {
+          console.log("去除水印 ---- gx ----");
           var markDiv = div.querySelector("#" + divId);
+          console.log("去除水印 ---- gx markDiv ----",markDiv);
           if (markDiv) {
-      	     div.removeChild(markDiv);
+              console.log("执行去除水印 ---- gx markDiv ----",markDiv);
+      	      div.removeChild(markDiv);
           }
         }
       },
@@ -1205,6 +1240,16 @@
               itemId: this.contentData.studyItemId,
               videoTime: intTime
             };
+            //console.log('this.courseInfo:',this.contentData)
+            if(!this.curriculumData.isDrag && this.contentData.progressVideo !=1){
+              var time = localStorage.getItem('videoProgressData')
+              var arr = time&&JSON.parse(time) || {}
+              if(arr[this.blobId] && this.contentData.progressVideo<arr[this.blobId]) {
+              postData.progressVideo = arr[this.blobId]
+              postData.contentId = this.contentData.id
+              postData.courseId = this.contentData.courseId
+              }
+            }
             //console.log('记录播放时间')
             apiStudy.studyVideoTime(postData).then(rs => {
               if (rs.status != 200) {
@@ -1247,6 +1292,16 @@
             itemId: this.contentData.studyItemId,
             videoTime: intTime
           };
+          //console.log('this.courseInfo:',this.contentData)
+          if(!this.curriculumData.isDrag && this.contentData.progressVideo !=1){
+            var time = localStorage.getItem('videoProgressData')
+            var arr = time&&JSON.parse(time) || {}
+            if(arr[this.blobId] && this.contentData.progressVideo<arr[this.blobId]) {
+            postData.progressVideo = arr[this.blobId]
+            postData.contentId = this.contentData.id
+            postData.courseId = this.contentData.courseId
+            }
+          }
           //console.log('记录播放时间')
           apiStudy.studyVideoTime(postData).then(rs => {
             if (rs.status != 200) {
@@ -1398,6 +1453,7 @@
               }
               //console.log(scon.contentId,con.id);
               con.lastStudyTime = scon.lastStudyTime;
+              con.progressVideo = scon.progressVideo;
               //以下判断是为了兼容之前的问题，学习状态
               if (scon.status) {
                 con.status = scon.status;
@@ -1502,7 +1558,7 @@
           }
         }
       },
-      progress(val) { 
+      progress(val) {
         const progressValue = parseFloat(val) * 100;
         this.sendEventProgress = Number(progressValue.toFixed(2));
        },

vue.config.js

@@ -85,28 +85,28 @@ module.exports = {
             .end()
           config
             .optimization.splitChunks({
-            chunks: 'all',
-            cacheGroups: {
-              libs: {
-                name: 'chunk-libs',
-                test: /[\\/]node_modules[\\/]/,
-                priority: 10,
-                chunks: 'initial' // only package third parties that are initially dependent
-              },
-              elementUI: {
-                name: 'chunk-elementUI', // split elementUI into a single package
-                priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
-                test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
-              },
-              commons: {
-                name: 'chunk-commons',
-                test: resolve('src/components'), // can customize your rules
-                minChunks: 3, //  minimum common number
-                priority: 5,
-                reuseExistingChunk: true
+              chunks: 'all',
+              cacheGroups: {
+                libs: {
+                  name: 'chunk-libs',
+                  test: /[\\/]node_modules[\\/]/,
+                  priority: 10,
+                  chunks: 'initial' // only package third parties that are initially dependent
+                },
+                elementUI: {
+                  name: 'chunk-elementUI', // split elementUI into a single package
+                  priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
+                  test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
+                },
+                commons: {
+                  name: 'chunk-commons',
+                  test: resolve('src/components'), // can customize your rules
+                  minChunks: 3, //  minimum common number
+                  priority: 5,
+                  reuseExistingChunk: true
+                }
               }
-            }
-          })
+            })
           config.optimization.runtimeChunk('single'), {
             from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
             to: './', //到根目录下
@@ -124,6 +124,17 @@ module.exports = {
     // 114.115.162.187 测试环境
     // 192.168.0.107 晋宇
     proxy: {
+      // "/professional": {
+      //   // target: 'https://u-pre.boe.com',
+      //   // target: 'http://192.168.86.195:32002',
+      //   target: 'http://192.168.68.211:32002',
+      //   changeOrigin: true,
+      // },
+      "/growth": {
+        target: 'https://u-pre.boe.com',
+        // target: 'http://192.168.86.195:32002',
+        changeOrigin: true,
+      },
       '/manageApi': {
         // 目标代理服务器地址
         target: 'https://u-pre.boe.com',