个人中心临时修改，后期优化

# Conflicts:
#	src/assets/images/ban.png
#	src/views/study/coursenew.vue

.env.development

@@ -41,7 +41,6 @@ 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,7 +37,6 @@ 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,7 +37,6 @@ 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,7 +36,6 @@ 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,6 +1,5 @@
 /**我的授课记录*/
 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;
@@ -61,15 +60,12 @@ 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

@@ -1,8 +0,0 @@
-// 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/growth/index.js

@@ -0,0 +1,11 @@
+import ajax from "@/api/ajax"
+//获取详情
+export const getList = (params) => ajax.get('/manageApi',`/stu/grow/getStuLearnInfo?userId=${params}`);
+//获取路径图详情
+export const taskList = (params) => ajax.get('/manageApi',`/stu/grow/taskList?growId=${params}`);
+//全岗位路径
+export const getFullJobPath = (params) => ajax.get('/manageApi',`/stu/grow/getFullJobPath`);
+//外部考试
+export const queryExternalExam = (params) => ajax.get('/manageApi',`/external/exam/queryExternalExam?externalId=${params.externalId}&type=14`);
+//外部考试点击调用
+export const submitExternalExam = (params) => ajax.postJson('/manageApi',`/stu/externalExam/submitExternalExam`,params);

src/api/manage/manage.js

@@ -20,7 +20,25 @@ const getTaskNum = function(){
 const userTaskList = function(data){
   return ajax.postJson(baseURL,'/todoTask/queryTodoTaskDetail',data);
 }
-
+//已读
+const userRead = function(data){
+  return ajax.postJson(baseURL,'/todoTask/read',data);
+}
+//查询未读数量
+const queryTaskCounts = function(obj){
+  return ajax.postJson(baseURL,'/todoTask/queryTaskCounts',obj);
+}
+//领导力必修
+const leadership = function(data){
+  return ajax.postJson(baseURL,'/todoTask/leadership',data);
+}
+//定制化学习 1.学习项目 2.学习路径
+const customized = function(data){
+  return ajax.postJson(baseURL,'/todoTask/customized',data);
+}
+const compulsoryList = function(data){
+  return ajax.postJson(baseURL,'/todoTask/compulsoryList',data);
+}
 /**删除学习，取消报名*/
 const userDeleteStudy = function(data){
   return ajax.postJson(baseURL,'/stu/project/stuCancelEnrollment',data);
@@ -37,6 +55,11 @@ const userRsSginupCourse = function(data){
 export default {
     getTaskNum,
     userTaskList,
+    leadership,
+    customized,
+    compulsoryList,
     userDeleteStudy,
-    userRsSginupCourse
+    userRsSginupCourse,
+    queryTaskCounts,
+    userRead
 }

src/api/modules/cases.js

@@ -1,6 +1,6 @@
 /* 案例模块的相关处理*/
 import ajax from '@/utils/xajax.js'
-import ajaxs from '@/api/ajax.js'
+
 /**首页查询
  * pageSize
  * orderField
@@ -88,12 +88,6 @@ 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 长度
@@ -101,9 +95,6 @@ const queryRecommendRank = 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}`);
-}
 
 /**
  * 专业分类
@@ -195,36 +186,11 @@ 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,
@@ -236,10 +202,7 @@ 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,11 +111,7 @@ const getStudyContentItem = function(studyId,contentId) {
  * @returns
  */
 const studyVideoTime = function(data) {
-  return ajax.post('/xboe/school/study/course/study-video-time',data);
-}
-
-const updateStudyVideoTime = function(data) {
-  return ajax.post('/xboe/school/study/course/updateStudyVideoTime',data);
+    return ajax.post('/xboe/school/study/course/study-video-time',data);
 }
 
 /**
@@ -123,7 +119,7 @@ const updateStudyVideoTime = function(data) {
  * @returns
  */
 const lastStudy = function() {
-  return ajax.get('/xboe/school/study/course/last-study');
+    return ajax.get('/xboe/school/study/course/last-study');
 }
 
 /**
@@ -140,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);
 }
 
 /**
@@ -154,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);
 }
 
 /**
@@ -165,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);
 }
 
 /**
@@ -177,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);
 }
 
 /**
@@ -189,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);
 }
 
 /**
@@ -204,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);
 }
 /**
  * 当前课程学习记录
@@ -220,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);
 }
 
 
@@ -245,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);
 }
 
 /**
@@ -265,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);
 }
 
 /**
@@ -283,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);
 }
 
 /**
@@ -292,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);
 }
 
 /**
@@ -301,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);
 }
 
 /**
@@ -310,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);
 }
 
 /**
@@ -322,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);
 }
 
 /**
@@ -331,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});
 }
 
 /**
@@ -342,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);
 }
 
 /**
@@ -355,7 +351,7 @@ const myExamList2 = function(data) {
  }
  */
 const myAssessList = function(data) {
-  return ajax.post('/xboe/school/study/assess/list-study',data);
+    return ajax.post('/xboe/school/study/assess/list-study',data);
 }
 
 /*
@@ -364,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}`);
 }
 
 /**
@@ -393,49 +389,44 @@ 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,
-  updateStudyVideoTime,
-  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,9 +72,6 @@ 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,
@@ -83,7 +80,6 @@ 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,9 +9,7 @@ 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);
 }
@@ -219,7 +217,7 @@ export default {
     update,
     del,
     detail,
-    findByNameNew,
+    findByName,
     updateSysId,
 	has,
 	start,

src/components/AlertPopup.vue

@@ -1,7 +1,7 @@
 <template>
   <!--弹出窗口设置-->
   <div>
-    <div v-for="pop in popupList" :key="pop.id">
+    <div v-for="pop in popupList" :key="pop.id">wwww
       <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,10 +8,7 @@
 
           </div>
           <div class="article-info-date">
-            <div class="box">
-              <div class="image"></div>
-              <el-button @click="delItem(item)" type="text" style="color: #8590A6;font-size:14px">取消收藏</el-button>
-            </div>
+            <el-button @click="delItem(item)" type="text" style="color: #8590A6;font-size:14px" icon="el-icon-star-on">取消收藏</el-button>
           </div>
         </div>
         <div class="article-info-tools">
@@ -164,26 +161,6 @@
         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,9 +637,7 @@ export default {
           }
           this.teacherList = rs.result.teachers;
           this.teacherName = rs.result.teachers;
-          this.teacher = rs.result.teachers.map(item => {
-            return `${item.teacherName}(${item.userNo})`
-          });
+          this.teacher = rs.result.teachers.map(res => res.teacherName);
           this.totalContent = rs.result.contents.length; //计算总内容数
           if (this.courseInfo.tags != "") {
             this.showTags = this.courseInfo.tags.split(",");

src/components/Course/auditCourse2.vue

@@ -681,9 +681,7 @@ export default {
           }
           this.teacherList = rs.result.teachers;
           this.teacherName = rs.result.teachers;
-          this.teacher = rs.result.teachers.map(item => {
-            return `${item.teacherName}(${item.userNo})`
-          });
+          this.teacher = rs.result.teachers.map(item => item.teacherName);
           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 { data, message, code } = await apiTeacher.findByNameNew(this.teacherValues);
+            const { result, message, status } = await apiTeacher.findByName(this.teacherValues);
             this.loading = false;
-            if (code === 200) {
+            if (status === 200) {
                 let list = [];
-                data.forEach(item => {
+                result.forEach(item => {
                 list.push({
                     teacherId: item.id,
                     teacherName: item.name,
-                    teacherCode: item.mobile
+                    teacherCode: item.code
                 });
                 });
                 this.teacherDownList = list;

src/components/Course/courseExam.vue

@@ -85,28 +85,6 @@
             <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">
@@ -307,9 +285,7 @@
              return;
            }
         }
-        if(!this.examInfo.randomMode){
-          this.examInfo.qnum = 0
-        }
+
         this.$emit("save",this.examInfo);
       },
       deleteExam(){ //删除
@@ -318,8 +294,6 @@
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          this.examInfo.randomMode = false;
-          this.examInfo.qnum = 0;
           this.$emit("remove",this.examInfo);
         }).catch(() => {
 

src/components/Course/exam.vue

@@ -326,91 +326,48 @@ export default {
         return qitems;
     },
     startTest(){
-      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);
+      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.content.status=1;
             this.timer=setInterval(this.changeTimer,60000);
             this.testStart=true;
           }else{
-            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.$message.error('加载试卷内容失败，请与管理员联系，试卷是否已删除');
           }
-        }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);
+        })
+      }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;
-      // }
+        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){
@@ -575,7 +532,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),
       }
       //计划考试的时长
@@ -586,15 +543,8 @@ export default {
       apiStudy.saveExam(postData).then(res=>{
         this.thisTrue = true
          if(res.status == 200) {
-            console.log("获取数据结果 考试 res ==>",res)
             this.records.push(res.result);
-            //TODO 评分更改 最终完成
-            if(res.result.score > res.result.passLine){
-              this.content.status=9;//表已学习完，判断上级的章是否已完成
-            }else{
-              this.content.status=1;
-            }
-
+            this.content.status=9;//表已学习完，判断上级的章是否已完成
             this.studyItemId=res.result.studyItemId;//第一次保存时是没有的，所以这里要赋值
             this.$alert('您本次考试得分：'+this.lastScore, '考试成绩', {
                   confirmButtonText: '确定',

src/components/Course/homework.vue

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

src/components/Course/weikeContent.vue

@@ -401,28 +401,6 @@
               <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">
@@ -1071,7 +1049,6 @@
              this.cwareChange.curriculumData = deepClone(this.cware.curriculumData)
           }
         }else if(index==2){
-          this.homework.content.contentName = this.homework.info.name || '作业'
           postData.content=this.homework.content;
           postData.homework=this.homework.info;
           this.homeworkChange = deepClone(this.homework)
@@ -1081,14 +1058,12 @@
           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;
@@ -1111,15 +1086,10 @@
             }
             this.exam.info.paperContent=JSON.stringify(this.exam.paperJson);
           }
-          if(!this.exam.info.randomMode){
-            this.exam.info.qnum = 0
-          }
           postData.exam=this.exam.info;
-          postData.content.contentName='考试';
           this.examChange = deepClone(this.exam);
         }else if(index==4){
           this.assess.content.content=JSON.stringify(this.assess.json);
-          this.assess.content.contentName='评估';
           postData.content=this.assess.content;
         }
 
@@ -1179,8 +1149,6 @@
             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,16 +217,13 @@ export default {
         if(delIdx>-1){
           fileList.splice(delIdx,1);
         }
-        this.$emit("success", res);
       } else {
         this.isLoading = false;
-        if(this.limit == 1){
-          this.fileList = [];
-        }
+        //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,10 +8,7 @@
                     <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 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 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>
                   </p>
                   <div class="case-info-cont">
@@ -139,22 +136,6 @@
   </script>
 
   <style lang="scss" scoped>
-  .span_hidden{
-    display: flex;
-    &:hover{
-      .is_hidden{
-        background: url('../../assets/images/case/Frame(12).png');
-        background-size: 100%;
-      }
-    }
-    .is_hidden{
-      width: 18px;
-      height: 18px;
-      background: url('../../assets/images/case/Frame(5).png');
-      background-size: 100%;
-      margin-right: 10px;
-    }
-  }
     .sign-text{
       color: #666666;
       font-size: 14px;

src/components/PdfPreview/index.vue

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

src/components/Portal/authorInfo.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="item-author">
-		<div  v-if="userName" @click="toHome()">
+		<div  @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,10 +12,9 @@
         </div>
         </div>
     </div>
-		<div v-if="!onlyAvatar&&userName" style="padding-left: 14px;padding-top: 6px;font-size: 14px;">
+		<div v-if="!onlyAvatar" 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>
@@ -50,12 +49,6 @@
       onlyAvatar:{
         type:Boolean,
         default:false
-      },
-      authorTags: {
-        type:Array,
-        default(){
-          return []
-        }
       }
 		},
     data(){
@@ -126,14 +119,6 @@
       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,19 +92,11 @@
                       <div class="comment-btns">
 
                          <!-- <a><svg-icon icon-class="like"></svg-icon><span>66</span></a> -->
-                         <div style="display: flex" v-show="btnsShowRowId==com.id">
+                         <div v-show="btnsShowRowId==com.id">
 
-                           <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 @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;" 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="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 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>
@@ -968,28 +960,6 @@
         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,8 +10,7 @@
         <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> -->
-         <div class="is_comment"></div>
+         <svg-icon style="margin-right: 0;font-size: 14px;" icon-class="comment"></svg-icon>
         </el-tooltip>
         <span class="interact-bar-value"> {{ data.answers? data.answers:0}}</span>
       </div>
@@ -24,16 +23,14 @@
       </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> -->
-           <div class="is_comment"></div>
+          <svg-icon style="margin-right: 0;font-size: 14px;" icon-class="comment"></svg-icon>
         </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> -->
-           <div class="is_praise" :class="isPraise?'is_praise_a':'is_praise'"></div>
+          <svg-icon style="margin-right: 0;font-size: 14px;" :icon-class="isPraise?'praised':'like'"></svg-icon>
         </el-tooltip>
         <span class="interact-bar-value"> {{ data.praises? data.praises:0}}</span>
       </div>
@@ -41,22 +38,19 @@
       <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> -->
-           <div v-else class="is_favorite" :class="isFavorite?'is_favorite_a':'is_favorite'"></div>
+          <svg-icon v-else style="margin-right: 0;" :style="{'font-size':(size+2)+'px'}" :icon-class="isFavorite?'scactive2':'xihuan'"></svg-icon>
         </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> -->
-           <div class="is_share"></div>
+          <svg-icon icon-class="share" style="margin-right: 0;" :style="{'font-size':(size+2)+'px'}"></svg-icon>
         </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> -->
-           <div class="is_view"></div>
+          <svg-icon style="margin-right: 0; font-size:22px;" icon-class="eyes"></svg-icon>
         </el-tooltip>
         <!-- <div style="float:right;margin-left:8px"> -->
         <span  class="interact-bar-value eyes-view" > {{ formatNum(data.views)}}</span>
@@ -536,7 +530,6 @@ 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);
@@ -720,77 +713,6 @@ export default {
     justify-content: flex-end;
     .interact-bar-btn {
       margin: 0 0 0 15px;
-      display: flex;
-      justify-content: end;
-      align-items: center;
-      &:hover{
-        .is_praise{
-          background: url('../../assets/images/case/Frame\(10\).png');
-        }
-        .is_favorite{
-          background: url('../../assets/images/case/Frame\(11\).png');
-          background-size: 100%;
-        }
-        .is_share{
-          background: url('../../assets/images/case/Frame\(14\).png');
-          background-size: 100%;
-        }
-        .is_view{
-          background: url('../../assets/images/case/Frame\(12\).png');
-        background-size: 100%;
-        }
-        .is_comment{
-          background: url('../../assets/images/case/Frame\(9\).png');
-          background-size: 100%;
-        }
-      }
-      .is_comment{
-        width: 16px;
-        height: 16px;
-        background: url('../../assets/images/case/Frame.png');
-        background-size: 100%;
-        margin-right: 4px;
-      }
-      .is_view{
-        width: 17px;
-        height: 17px;
-        background: url('../../assets/images/case/Frame\(5\).png');
-        background-size: 100%;
-        margin-right: 4px;
-      }
-      .is_share{
-        width: 16px;
-        height: 16px;
-        background: url('../../assets/images/case/Frame\(7\).png');
-        background-size: 100%;
-        margin-right: 4px;
-      }
-      .is_praise{
-        width: 14px;
-        height: 14px;
-        background: url('../../assets/images/case/Frame\(1\).png');
-        margin-right: 4px;
-      }
-      .is_praise_a{
-        width: 14px;
-        height: 14px;
-        background: url('../../assets/images/case/Frame\(10\).png');
-        margin-right: 4px;
-      }
-      .is_favorite{
-        width: 16px;
-        height: 16px;
-        background: url('../../assets/images/case/Frame\(2\).png');
-        background-size: 100%;
-        margin-right: 4px;
-      }
-      .is_favorite_a{
-        width: 16px;
-        height: 16px;
-        background: url('../../assets/images/case/Frame\(11\).png');
-        background-size: 100%;
-        margin-right: 4px;
-      }
     }
     .interact-bar-value{
       //  color:#6E7B84; ui图给的颜色，但是效果于ui图效果不一样，也没有透明度，所以找一个相近的和谐的颜色

src/components/PortalHeader.vue

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

src/components/Study/manager.vue

@@ -13,7 +13,7 @@
     </div>
     <!-- <div style="color: red;">下面的表格标题及内容需要调整完善</div> -->
     <div>
-      <el-tabs style="width: 100%;" v-model="tabName" @tab-click="handleTabClick">
+      <el-tabs v-model="tabName" @tab-click="handleTabClick">
         <el-tab-pane label="报名管理" name="second">
           <!-- <div>已报名{{study.list.length}}人，共有0人报名未成功，共有{{study.list.length}}人通过审核</div> -->
           <el-row style="margin: 20px 0;" :gutter="20">
@@ -95,9 +95,9 @@
             <el-col :offset="12" :span="4">
               <div class="grid-content bg-purple">
                 <el-select v-model="learningRecords.status" clearable placeholder="状态">
-                  <el-option label="未开始" :value="1"></el-option>
-                  <el-option label="进行中" :value="2"></el-option>
                   <el-option label="已完成" :value="9"></el-option>
+                  <el-option label="未开始" :value="1"></el-option>
+                  <el-option label="进行中" :value="8"></el-option>
                 </el-select>
               </div>
             </el-col>
@@ -192,7 +192,7 @@
               </el-table-column>-->
               <el-table-column label="学习人员" width="110">
                 <template slot-scope="scope">
-                  <el-button size="mini" type="info" @click="getCatalogue(scope.row,scope.row.contentType)" >学习人员</el-button>
+                  <el-button size="mini" type="info" @click="getCatalogue(scope.row,scope.row.contentName)" >学习人员</el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -260,8 +260,8 @@
               </el-table-column>
               <el-table-column prop="status" label="状态">
                 <template slot-scope="scope">
-                  <!-- <span v-if="scope.row.contentName.split('--')[1]=='考试'">{{scope.row.status == 9? '已完成':scope.row.status == 2?'进行中':'未开始'}}</span> -->
-                  <span>{{scope.row.status == 9? '已完成':scope.row.status == 2?'进行中':'未开始'}}</span>
+                  <span v-if="scope.row.contentName.split('--')[1]=='考试'">{{scope.row.status == 9? '已完成':scope.row.status == 2?'进行中':'未开始'}}</span>
+                  <span v-else>{{scope.row.status == 9? '已完成':'未开始'}}</span>
                 </template>
               </el-table-column>
               <el-table-column prop="duration" label="进度">
@@ -285,14 +285,12 @@
         <el-form-item label="状态:">
           <el-select v-model="learningSituation.status" clearable placeholder="状态">
             <el-option label="未开始" :value="1"></el-option>
-            <el-option label="进行中" :value="3"></el-option>
-            <el-option label="已完成" :value="2"></el-option>
+            <el-option label="已开始" :value="2"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="studyContentRecordsSearch">搜索</el-button>
+          <el-button type="primary" @click="studyContentRecords">搜索</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>
@@ -336,8 +334,6 @@ 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: {
@@ -347,18 +343,11 @@ export default {
     manageStudyData: {
       type: Object,
       default: () => ({})
-    },
-    isShowDialog:{
-      type: Boolean,
-      default: false
     }
   },
   data() {
     return {
-      downParams: {},
       typePress: false,
-      isHomeWork: false,
-      isTrue: false,
       catalogRecordTree:[],
       catalogRecordList:[],
       resOwnerListMap:[],
@@ -382,9 +371,7 @@ export default {
         pageSize: 10, // 每页多少条
         count: 0,
         type: "",
-        list: [],
-        status: '',
-        name: '',
+        list: []
       },
       learningRecords: {
         pageIndex: 1, //第几页
@@ -421,21 +408,6 @@ export default {
         this.getDetail();
       }
      }
-    },
-    'study.catalogueShow'(val){
-      if(!val){
-        this.learningSituation.status = null
-        this.learningSituation.name = ''
-      }
-    },
-    isShowDialog(val){
-      if(!val){
-        this.signup.status = null
-        this.signup.name = ''
-        this.learningRecords.status = null
-        this.learningRecords.name = ''
-        this.value = ''
-      }
     }
   },
   mounted() {
@@ -507,10 +479,6 @@ export default {
         }
       });
     },
-    studyContentRecordsSearch(){
-      this.learningSituation.pageIndex = 1;
-      this.studyContentRecords()
-    },
     // 资源里的学习详情
     studyContentRecords() {
       let params = {
@@ -521,7 +489,6 @@ 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;
@@ -531,77 +498,6 @@ 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;
@@ -800,15 +696,10 @@ export default {
       this.getSignupList();
     },
     getCatalogue(row,type) {
-      if(type==61){
+      if(type=='考试'){
         this.typePress = true
       }else{
-        this.typePress = true
-      }
-      if(type == 60){
-        this.isHomeWork = true
-      }else{
-        this.isHomeWork = false
+        this.typePress = false
       }
       this.contentId = row.id;
       this.study.catalogueShow = true;
@@ -863,19 +754,4 @@ 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>