修改15秒超时，并且删除打印

.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/ajax.js

@@ -41,7 +41,7 @@ const formRequest=axios.create({
     }
     return config
   }, error => {
-      console.log(error)
+      // console.log(error)
       Promise.reject(error)
   });
   formRequest.interceptors.response.use(res => {
@@ -66,7 +66,7 @@ const formRequest=axios.create({
        }
     },
     error => {
-      console.log('err' + error)
+      // console.log('err' + error)
       let { message } = error;
       if (message == "Network Error") {
         message = "网络异常，请稍后重试";

src/api/boe/boeAjax.js

@@ -30,7 +30,7 @@ const formRequest=axios.create({
     // axios中请求配置有baseURL选项，表示请求URL公共部分
     // baseURL: process.env.VUE_APP_CESOURCE_BASE_API,
     //超时
-    timeout: 10000,
+    timeout: 15000,
   })
   //发送json对象的拦截器
   formRequest.interceptors.request.use(config => {
@@ -43,7 +43,7 @@ const formRequest=axios.create({
     }
     return config
   }, error => {
-      console.log(error)
+      // console.log(error)
       Promise.reject(error)
   });
   formRequest.interceptors.response.use(res => {
@@ -68,7 +68,7 @@ const formRequest=axios.create({
        }
     },
     error => {
-      console.log('err',error)
+      // console.log('err',error)
       let { message } = error;
       if (message == "Network Error") {
         message = "网络异常，请稍后重试";

src/api/boe/boeApiAjax.js

@@ -28,7 +28,7 @@ const jsonRequest=axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BOE_BASE_API,
   //超时
-  timeout: 10000,
+  timeout: 15000,
 });
 //发送json对象的拦截器
 jsonRequest.interceptors.request.use(config => {
@@ -39,7 +39,7 @@ jsonRequest.interceptors.request.use(config => {
   }
   return config
 }, error => {
-    console.log(error)
+   //  console.log(error)
     Promise.reject(error)
 })
 
@@ -69,7 +69,7 @@ jsonRequest.interceptors.response.use(res => {
      }
   },
   error => {
-    console.log('err' + error)
+   //  console.log('err' + error)
     let { message } = error;
     if (message == "Network Error") {
       message = "网络异常，请稍后重试";
@@ -96,7 +96,7 @@ const formRequest=axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BOE_BASE_API,
   //超时
-  timeout: 10000,
+  timeout: 15000,
 })
 //发送json对象的拦截器
 formRequest.interceptors.request.use(config => {
@@ -107,7 +107,7 @@ formRequest.interceptors.request.use(config => {
   }
   return config
 }, error => {
-    console.log(error)
+   //  console.log(error)
     Promise.reject(error)
 });
 formRequest.interceptors.response.use(res => {
@@ -132,7 +132,7 @@ formRequest.interceptors.response.use(res => {
      }
   },
   error => {
-    console.log('err' + error)
+   //  console.log('err' + error)
     let { message } = error;
     if (message == "Network Error") {
       message = "网络异常，请稍后重试";

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/cesource/index.js

@@ -26,7 +26,7 @@ const jsonRequest=axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_CESOURCE_BASE_API,
   //超时
-  timeout: 10000,
+  timeout: 15000,
 });
 //发送json对象的拦截器
 jsonRequest.interceptors.request.use(config => {
@@ -37,7 +37,7 @@ jsonRequest.interceptors.request.use(config => {
   }
   return config
 }, error => {
-    console.log(error)
+   //  console.log(error)
     Promise.reject(error)
 })
 
@@ -65,7 +65,7 @@ jsonRequest.interceptors.response.use(res => {
      }
   },
   error => {
-    console.log('err' + error)
+   //  console.log('err' + error)
     let { message } = error;
     if (message == "Network Error") {
       message = "网络异常，请稍后重试";
@@ -91,7 +91,7 @@ const formRequest=axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_CESOURCE_BASE_API,
   //超时
-  timeout: 10000,
+  timeout: 15000,
 })
 //发送json对象的拦截器
 formRequest.interceptors.request.use(config => {
@@ -102,7 +102,7 @@ formRequest.interceptors.request.use(config => {
   }
   return config
 }, error => {
-    console.log(error)
+   //  console.log(error)
     Promise.reject(error)
 });
 formRequest.interceptors.response.use(res => {
@@ -126,7 +126,7 @@ formRequest.interceptors.response.use(res => {
      }
   },
   error => {
-    console.log('err' + error)
+   //  console.log('err' + error)
     let { message } = error;
     if (message == "Network Error") {
       message = "网络异常，请稍后重试";

src/api/event/index.js

@@ -26,7 +26,7 @@ const jsonRequest=axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_STAT_BASE_API,
   //超时
-  timeout: 10000,
+  timeout: 15000,
 });
 //发送json对象的拦截器
 jsonRequest.interceptors.request.use(config => {
@@ -37,7 +37,7 @@ jsonRequest.interceptors.request.use(config => {
   }
   return config
 }, error => {
-    console.log(error)
+   //  console.log(error)
     Promise.reject(error)
 })
 
@@ -65,7 +65,7 @@ jsonRequest.interceptors.response.use(res => {
      }
   },
   error => {
-    console.log('err' + error)
+   //  console.log('err' + error)
     let { message } = error;
     if (message == "Network Error") {
       message = "网络异常，请稍后重试";
@@ -91,7 +91,7 @@ const formRequest=axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_STAT_BASE_API,
   //超时
-  timeout: 10000,
+  timeout: 15000,
 })
 //发送json对象的拦截器
 formRequest.interceptors.request.use(config => {
@@ -102,7 +102,7 @@ formRequest.interceptors.request.use(config => {
   }
   return config
 }, error => {
-    console.log(error)
+   //  console.log(error)
     Promise.reject(error)
 });
 formRequest.interceptors.response.use(res => {
@@ -126,7 +126,7 @@ formRequest.interceptors.response.use(res => {
      }
   },
   error => {
-    console.log('err' + error)
+   //  console.log('err' + error)
     let { message } = error;
     if (message == "Network Error") {
       message = "网络异常，请稍后重试";

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/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,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 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);
 }
 
 /*
@@ -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,48 +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,
-  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/api/unionAjax.js

@@ -31,7 +31,7 @@ const formRequest = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   // baseURL: process.env.VUE_APP_CESOURCE_BASE_API,
   //超时
-  timeout: 10000,
+  timeout: 15000,
 })
 //发送json对象的拦截器
 formRequest.interceptors.request.use(config => {
@@ -44,7 +44,7 @@ formRequest.interceptors.request.use(config => {
   }
   return config
 }, error => {
-  console.log(error)
+  // console.log(error)
   Promise.reject(error)
 });
 formRequest.interceptors.response.use(res => {
@@ -71,7 +71,7 @@ formRequest.interceptors.response.use(res => {
     }
   },
   error => {
-    console.log('err', error)
+    // console.log('err', error)
     let {message} = error;
     if (message == "Network Error") {
       message = "网络异常，请稍后重试";

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/Breadcrumb/index.vue

@@ -29,7 +29,7 @@ export default {
   created() {
     this.getBreadcrumb();
     this.levelList.forEach(function(one){
-       console.log(one);
+      //  console.log(one);
     })
   },
   methods: {

src/components/Case/caseItems.vue

@@ -100,7 +100,7 @@ export default {
         })
       }
          }
-         console.log(item)
+        //  console.log(item)
       
       this.$router.push({path:'/case/detail',query:{id:item.cases.id}})
      // window.open(`${this.webBaseUrl}/article/detail?id=${item.objId}`)

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">
@@ -68,7 +65,7 @@
       return item.cases.summary;
     },
      changeIsAll(item,idx) {
-      console.log(item.isAll)
+      // console.log(item.isAll)
       item.isAll = !item.isAll;
       this.$set(this.items, idx, item);
     },
@@ -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

@@ -425,28 +425,28 @@ export default {
       return this.sysTypeMap.get(code);
     },
     onPlayerPlay() {
-      console.log("开始播放");
+      // console.log("开始播放");
     },
     onPlayerPause() {
-      console.log("暂停");
+      // console.log("暂停");
     },
     onPlayerEnded() {
-      console.log("播放结束");
+      // console.log("播放结束");
     },
     onPlayerPlaying(itme) {
-      console.log("当前播放" + itme);
+      // console.log("当前播放" + itme);
     },
     audioPlaying(item) {
-      console.log("当前播放" + item);
+      // console.log("当前播放" + item);
     },
     audioPlay() {
-      console.log("开始播放");
+      // console.log("开始播放");
     },
     audioPause() {
-      console.log("暂停");
+      // console.log("暂停");
     },
     audioEnd() {
-      console.log("播放结束");
+      // console.log("播放结束");
     },
     // 场景过滤
     sceneFilter(forScene) {
@@ -541,7 +541,7 @@ export default {
             this.tagList = result;
           }
         } catch (error) {
-          console.log(error);
+          // console.log(error);
         }
       } else {
         this.tagList = [];
@@ -555,7 +555,7 @@ export default {
           this.sceneList = result;
         }
       } catch (error) {
-        console.log(error);
+        // console.log(error);
       }
     },
     // 教师列标，远程查询
@@ -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

@@ -462,28 +462,28 @@ export default {
       return this.sysTypeMap.get(code);
     },
     onPlayerPlay(){
-      console.log("开始播放");
+      // console.log("开始播放");
     },
     onPlayerPause(){
-      console.log("暂停");
+      // console.log("暂停");
     },
     onPlayerEnded(){
-      console.log("播放结束");
+      // console.log("播放结束");
     },
     onPlayerPlaying(itme){
-      console.log("当前播放"+itme);
+      // console.log("当前播放"+itme);
     },
     audioPlaying(item){
-      console.log("当前播放"+item);
+      // console.log("当前播放"+item);
     },
     audioPlay(){
-       console.log("开始播放");
+      //  console.log("开始播放");
     },
     audioPause(){
-      console.log("暂停");
+      // console.log("暂停");
     },
     audioEnd(){
-      console.log("播放结束");
+      // console.log("播放结束");
     },
     // 场景过滤
     sceneFilter(forScene) {
@@ -583,7 +583,7 @@ export default {
             this.tagList = result;
           }
         } catch (error) {
-          console.log(error);
+          // console.log(error);
         }
       } else {
         this.tagList = [];
@@ -597,7 +597,7 @@ export default {
           this.sceneList = result;
         }
       } catch (error) {
-        console.log(error);
+        // console.log(error);
       }
     },
     // 教师列标，远程查询
@@ -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/auditCourseEdit.vue

@@ -284,7 +284,7 @@
         this.type = 0;
       },
       handleChange(val) {
-        console.log(val);
+        // console.log(val);
       },
       formatChoose(format) {
         let text = '';

src/components/Course/catalogCourseware.vue

@@ -470,13 +470,13 @@
         }
       },
       updateName(value){
-        console.log(value);
+        // console.log(value);
         if(this.content.id==''){
           return;
         }
         apiCourse.updateContentName({id:this.content.id,name:value}).then(rs=>{
           if(rs.status!=200){
-             console.log('更新名称失败：'+rs.message);
+            //  console.log('更新名称失败：'+rs.message);
           }
         })
       },

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
@@ -84,19 +84,19 @@
         },
             // 教师列标，远程查询
         async remoteFindTeacher() {
-          console.log("2222");
+          // console.log("2222");
           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/courseForm.vue

@@ -1029,7 +1029,7 @@ export default {
           //this.requireSaveCourse=false;//不需要保存
         }
       } catch (error) {
-        console.log(error);
+        // console.log(error);
       }
     },
     changeTeachers(t) {
@@ -1162,7 +1162,7 @@ export default {
             this.tagList = result;
           }
         } catch (error) {
-          console.log(error);
+          // console.log(error);
         }
       } else {
         this.tagList = [];
@@ -1580,7 +1580,7 @@ export default {
           this.sceneList = result;
         }
       } catch (error) {
-        console.log(error);
+        // console.log(error);
       }
     },
     setCurContent(item) {

src/components/Course/exam.vue

@@ -322,95 +322,52 @@ export default {
              }
              qitems.push(q);
         });
-        console.log(qitems,'qitems')
+        // console.log(qitems,'qitems')
         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){
@@ -465,7 +422,7 @@ export default {
     present(){ //提交前处理
     	let $this=this;
     	let score=this.countTest();
-      console.log('score='+score);
+      // console.log('score='+score);
     	if(this.noAnswers.length>0){
          this.$confirm('还有未答试题,您确定要提交吗?', '提示', {
                   confirmButtonText: '确定',
@@ -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

@@ -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;
-        width: 100%;
-      }
+.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/myNote.vue

@@ -236,7 +236,7 @@ export default {
             // }, 10000);
         },
         noteEdit(note) {
-            console.log(note)
+            // console.log(note)
             this.isEdit = true;
             this.mynoteData = note;
             this.editNodeOpenType = note.openType;

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">
@@ -1081,14 +1059,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,9 +1087,6 @@
             }
             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);
@@ -1179,8 +1152,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/Editor/index.vue

@@ -164,7 +164,7 @@ export default {
     change(e) {
       let file = e.target.files[0]
       const formData = new FormData()
-      console.log(file,'file');
+      // console.log(file,'file');
       formData.append('file', file)
       upload(formData)
         .then(res => {

src/components/Exam/EditPaper.vue

@@ -285,7 +285,7 @@
             }
 
             if(hasItem!=null){
-              console.log(hasItem);
+              // console.log(hasItem);
               this.$message.error('选择的试题重复：'+hasItem.title)
               return
             }

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/Follow/button.vue

@@ -51,7 +51,7 @@
     watch:{
       has(newVal,oldVal){
          this.has=newVal;
-         console.log(newVal,oldVal,'测试问题');
+        //  console.log(newVal,oldVal,'测试问题');
          this.hasFollow=newVal;
          if(newVal!=oldVal && this.auto){
            this.autoCheck();

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/HomePage/followList.vue

@@ -290,7 +290,7 @@ import apiUser from "@/api/system/user.js";
                //console.log(this.mypageList,'this.mypageList');
                $this.getUserData(res.result.list,2);
             }else{
-              console.log('加载关注我数据错误:'+res.message);
+              // console.log('加载关注我数据错误:'+res.message);
             }
         })
        },

src/components/PdfPreview/view.vue

@@ -102,13 +102,13 @@ export default {
      document.documentElement.scrollTop = 0;
     },
     loadProgress(e){
-       console.log(e,'loadProgress');
+      //  console.log(e,'loadProgress');
     },
     loadedPageHandle(e){
        this.pdfpage = e;
     },
     loadPdfHandle(e){
-       console.log(e,'loadPdfHandle');
+      //  console.log(e,'loadPdfHandle');
     },
     clickMore(){
        if(this.totalPages>this.showPages){

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>
@@ -431,7 +423,7 @@
               })
             });
           }else{
-            console.log('加载用户头像信息:'+res.error);
+            // console.log('加载用户头像信息:'+res.error);
             //this.$message.error(res.message);
           }
         });
@@ -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/course/couresinteract.vue

@@ -268,7 +268,7 @@ export default {
         conType,
       }
       apiMessage.save(message).then(res=>{
-        if(res.status!=200){ console.log('发送消息失败') }
+        // if(res.status!=200){ console.log('发送消息失败') }
       })
     },
     checkHas(){
@@ -301,7 +301,7 @@ export default {
     },
     addPraise(){
      if(this.type==0){
-       console.log('未设置type值,1表课程,2表文章，3表案例，4表问答,6笔记')
+      //  console.log('未设置type值,1表课程,2表文章，3表案例，4表问答,6笔记')
        return;
       }
       //需要判断是否已点赞，已点赞的不再加
@@ -359,7 +359,7 @@ export default {
               }
               this.$message({message:'取消点赞',type:'success'})
             }else{
-              console.log('取消失败：'+res.message);
+              // console.log('取消失败：'+res.message);
             }
           })
         } else {
@@ -430,7 +430,7 @@ export default {
                 this.$store.dispatch("userTrigger", event);
               }
             }else{
-              console.log('点赞失败：'+res.message);
+              // console.log('点赞失败：'+res.message);
             }
           })
         }
@@ -443,7 +443,7 @@ export default {
         return
       }
       if(this.type==0){
-        console.log('未设置type值,1表课程,2表文章，3表案例，4表问答')
+        // console.log('未设置type值,1表课程,2表文章，3表案例，4表问答')
         return;
        }
       //需要判断是否已点赞，已点赞的不再加
@@ -479,7 +479,7 @@ export default {
           this.$message({message:'已取消收藏',type:'success'});
           //this.$emit('addFavorite',res.result);//添加收藏,如果是true代表添加成功，false代表已存在
         }else{
-          console.log('取消收藏失败：'+res.message);
+          // console.log('取消收藏失败：'+res.message);
         }
       })
       } else {
@@ -499,7 +499,7 @@ export default {
           this.$message({message:'已加入收藏',type:'success'});
           //this.$emit('addFavorite',res.result);//添加收藏,如果是true代表添加成功，false代表已存在
         }else{
-          console.log('加入收藏失败：'+res.message);
+          // console.log('加入收藏失败：'+res.message);
         }
       })
       }

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>
@@ -327,7 +321,7 @@ export default {
         conType,
       }
       apiMessage.save(message).then(res=>{
-        if(res.status!=200){ console.log('发送消息失败') }
+        // if(res.status!=200){ console.log('发送消息失败') }
       })
     },
     checkHas(){
@@ -360,7 +354,7 @@ export default {
     },
     addPraise(){
      if(this.type==0){
-       console.log('未设置type值,1表课程,2表文章，3表案例，4表问答,6笔记')
+      //  console.log('未设置type值,1表课程,2表文章，3表案例，4表问答,6笔记')
        return;
       }
       //需要判断是否已点赞，已点赞的不再加
@@ -418,7 +412,7 @@ export default {
               }
               this.$message({message:'取消点赞',type:'success'})
             }else{
-              console.log('取消失败：'+res.message);
+              // console.log('取消失败：'+res.message);
             }
           })
         } else {
@@ -489,7 +483,7 @@ export default {
                 this.$store.dispatch("userTrigger", event);
               }
             }else{
-              console.log('点赞失败：'+res.message);
+              // console.log('点赞失败：'+res.message);
             }
           })
         }
@@ -502,7 +496,7 @@ export default {
         return
       }
       if(this.type==0){
-        console.log('未设置type值,1表课程,2表文章，3表案例，4表问答')
+        // console.log('未设置type值,1表课程,2表文章，3表案例，4表问答')
         return;
        }
       //需要判断是否已点赞，已点赞的不再加
@@ -536,10 +530,9 @@ 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);
+          // console.log('取消收藏失败：'+res.message);
         }
       })
       } else {
@@ -559,7 +552,7 @@ export default {
           this.$message({message:'已加入收藏',type:'success'});
           //this.$emit('addFavorite',res.result);//添加收藏,如果是true代表添加成功，false代表已存在
         }else{
-          console.log('加入收藏失败：'+res.message);
+          // 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/Portal/noteComment.vue

@@ -309,7 +309,7 @@
                 })
               });
             }else{
-              console.log('加载用户头像信息:'+res.error);
+              // console.log('加载用户头像信息:'+res.error);
               //this.$message.error(res.message);
             }
           });

src/components/PortalFloatTools.vue

@@ -245,7 +245,7 @@ export default {
     },
     toNeedCourse(){
       // 需要先切换标签
-      console.log('this.identity='+this.identity);
+      // console.log('this.identity='+this.identity);
       if(this.identity==5 || this.identity==2){
         this.$store.dispatch('SetCurIdentity',2);
         // this.$router.push('/need/course?open=new');

src/components/PortalHeader.vue

@@ -51,8 +51,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>
@@ -188,7 +187,7 @@ export default {
   },
   watch:{
     keywords(newval){
-      console.log(newval,9999);
+      // console.log(newval,9999);
       if(this.findType == '1'){
         this.keyword = newval
       }
@@ -219,7 +218,7 @@ export default {
         this.$store.dispatch('SetCurIdentity',iden);
       },
     tomy(){
-      console.log('lll')
+      // console.log('lll')
     },
     loadBoeData() {
       if(this.studyTaskCount>0){
@@ -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]);
     },

src/components/Qa/addQuestion.vue

@@ -95,7 +95,7 @@
         this.askForm.images=file.result.filePath
         this.imageShowUrl= this.fileBaseUrl + file.result.filePath;
         // console.log(this.fileBaseUrl)
-        console.log(file)
+        // console.log(file)
       },
       handleRemoveSuccess(file) {
         this.imageShowUrl=''

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">
@@ -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>
@@ -292,7 +292,6 @@
         <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>
@@ -336,8 +335,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: {
@@ -355,10 +352,7 @@ export default {
   },
   data() {
     return {
-      downParams: {},
       typePress: false,
-      isHomeWork: false,
-      isTrue: false,
       catalogRecordTree:[],
       catalogRecordList:[],
       resOwnerListMap:[],
@@ -383,8 +377,8 @@ export default {
         count: 0,
         type: "",
         list: [],
-        status: '',
         name: '',
+        status: '',
       },
       learningRecords: {
         pageIndex: 1, //第几页
@@ -521,7 +515,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 +524,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,16 +722,11 @@ 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.contentId = row.id;
       this.study.catalogueShow = true;
       this.learningSituation.pageIndex = 1;//重置为第一页
@@ -863,19 +780,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>

src/components/ThemePicker/index.vue

@@ -35,7 +35,7 @@ export default {
       if (typeof val !== 'string') return
       const themeCluster = this.getThemeCluster(val.replace('#', ''))
       const originalCluster = this.getThemeCluster(oldVal.replace('#', ''))
-      console.log(themeCluster, originalCluster)
+      // console.log(themeCluster, originalCluster)
 
       const $message = this.$message({
         message: '  Compiling the theme',

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

src/components/VideoPlayer/index.vue

@@ -18,6 +18,7 @@
       @keydown.right.prevent="forwardCurrentTime"
       @keydown.up.prevent="increaseVolume"
       @keydown.down.prevent="lowerVolume"
+      @keydown.esc.prevent="toggleFullScreen"
       tabindex="0"
       width="100%"
       height="100%"
@@ -39,12 +40,12 @@
             :isPlaying="isPlaying"
             :biBarrageXml="biBarrageXml"
     />
-    <!-- 加载动画(应该当前视频没有缓存时显示加载动画)   && isCrowd && isShowPlayer -->
-    <div v-show="isShowLoading" class="player-loading" @click="videoDom.focus({preventScroll: true})">
+    <!-- 加载动画 -->
+    <div v-show="isShowLoading  && isCrowd && isShowPlayer" class="player-loading" @click="videoDom.focus({preventScroll: true})">
       <img src="@/components/VideoPlayer/images/loading.svg"  alt="loading"/>
     </div>
     <!-- 控制栏 -->
-    <div v-show="isCrowd" class="player-controls-container" @click="videoDom.focus({preventScroll: true})">
+    <div v-show="!isShowLoading && 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>
@@ -70,7 +71,6 @@
       <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,11 +241,6 @@ export default {
       type: String,
       default: null,
     },
-    // 视频链接对应的content Id
-    blobId: {
-      type: String,
-      default: null,
-    },
     // 主题色
     primaryColor: {
       type: String,
@@ -271,7 +266,7 @@ export default {
     },
     isDrag:{
       type: Boolean,
-      default: true,
+      default: null,
     },
     isCrowd:{
       type: Boolean,
@@ -317,17 +312,6 @@ 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 =
@@ -372,50 +356,20 @@ 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("F", () => {
+    window.addEventListener("fullscreenchange", () => {
       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
+      // console.log('触发了onWairing');
       this.$emit('onPlayerPause', {})
     },
     //当音频/视频在已因缓冲而暂停或停止后已就绪时
     onPlaying(){
-      console.log('触发缓存结束onPlaying');
-      this.isShowLoading = false
+      // console.log('触发缓存结束onPlaying');
       if(this.videoDom.paused){
         this.$emit('onPlayerPause', {})
       }else{
@@ -436,7 +390,7 @@ export default {
         this.isPlaying = true;
         this.isInit = true;
         this.$emit('onPlayerPlay', {});//播放(播放时会调用)
-        console.log('播放');
+        // console.log('播放');
       } else {
         this.videoDom.pause();
         this.isPlaying = false;
@@ -556,7 +510,6 @@ export default {
     /* 切换“全屏”和“非全屏”模式
      */
     toggleFullScreen() {
-      console.log("toggleFullScreen 执行 ",this.isFullScreen())
       let element = this.$refs.area;
       if (!this.isFullScreen()) {
         if (element.requestFullscreen) {
@@ -613,24 +566,6 @@ 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/player-barrage-screen.vue

@@ -48,7 +48,7 @@
           
           let info = this.barrageList[this.barragedTag];
           if(info){
-            console.log(info);
+            // console.log(info);
             if (info.start_time < this.videoDom.currentTime) {
               // 标记下一条弹幕的索引
               this.barragedTag++;
@@ -101,7 +101,7 @@
             }
           }
           this.barrageList = array;
-          console.log( this.barrageList);
+          // console.log( this.barrageList);
         });
       },
       /* 新建一个弹幕

src/components/VideoPlayer/progress-bar.vue

@@ -38,9 +38,6 @@ export default {
     isDrag:{
       type: Boolean,
       default: true,
-    },
-    blobId:{
-      type: String,
     }
   },
   data() {
@@ -60,12 +57,10 @@ 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() {
@@ -73,7 +68,7 @@ export default {
   },
   methods: {
     down(e) {
-      // if(this.isDrag) {
+      if(this.isDrag) {
         this.$emit("getMouseDownStatus", true);
         this.is_mousedown_progress = true;
         // 获取完整进度条的clientX（dom左上角）
@@ -81,50 +76,30 @@ export default {
         // 计算调整后的当前进度条的长度
         this.current_width_px = e.clientX - init_clientX;
         // 设置当前的播放进度（同时作用于当前进度条的样式）
-        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;
-
+        let current =
+            (e.clientX - init_clientX) / this.dom_full.clientWidth;
         this.$emit("updateProgress", current);
-      // }
-
+      }
+      
     },
     move(e) {
-      if (this.is_mousedown_progress) {
+      if (this.is_mousedown_progress && this.isDrag) {
         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;
-        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;
+        let current =
+          (e.clientX - init_clientX) / this.dom_full.clientWidth;
         this.$emit("updateProgress", current);
       }
     },
     up() {
-      if (this.is_mousedown_progress) {
+      if (this.is_mousedown_progress && this.isDrag) {
         // 标记鼠标不处于按下的状态了
         this.is_mousedown_progress = false;
         // 松开鼠标后，即调整进度条后，此时的进度（0-1）
-        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;
+        let current =
+          this.current_width_px / this.dom_full.clientWidth;
         this.$emit("updateProgress", current);
-
+        this.$emit("getMouseDownStatus", false);
       }
     },
   },
@@ -176,4 +151,4 @@ export default {
 .progress-bar:hover .progress-current::after {
   opacity: 1;
 }
-</style>
+</style>

src/components/processStatus.vue

@@ -33,7 +33,7 @@ export default {
     teacherId: {
       handler(newVal) {
         if (newVal) {
-          console.log(newVal)
+          // console.log(newVal)
           this.getCertificationProcess()
         }
       }
@@ -108,7 +108,7 @@ export default {
     },
     getCertificationProcess1(){
       getCertificationProcess({teacherId:this.pid}).then(res=>{
-        console.log(res)
+        // console.log(res)
         let data=res.data
         if(data.secondResult==0){
           this.status.secondResult=0

src/data/pages.js

@@ -82,9 +82,6 @@ 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,10 +6,7 @@
         <!-- <div style="height: 20px;"></div> -->
       </div>
       <!-- width: 990px; -->
-      <div class="main-body" :style="{
-             backgroundColor: bgColor,
-             padding
-            }" style="flex:1; margin-left: 20px;">
+      <div class="main-body" style="padding: 30px 20px;flex:1; background-color: #fff;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>
@@ -18,12 +15,10 @@
         <!-- </div> -->
         <transition name="fade-transform" mode="out-in">
           <keep-alive :include="cachedViews">
-            <div :style="{
-             backgroundColor: bgColor
-            }" style="min-height: 600px;padding-bottom: 50px;">
+            <div style="background-color: #FFFFFF;min-height: 600px;padding-bottom: 50px;">
             <router-view :key="key" />
             </div>
-          </keep-alive> 
+          </keep-alive>
         </transition>
       </div>
     </div>
@@ -44,14 +39,7 @@ export default {
       return this.$route.meta.title;
     },
     key() {
-      console.log(this.$route)
       return this.$route.path
-    },
-    bgColor() {
-     return this.$route.path === "/growth/growthPage" ? "rgba(0,0,0,0)" : "#fff";
-    },
-    padding(){
-      return this.$route.path === "/growth/growthPage" ? "0" : "30px 20px";
     }
   }
 }

src/layout/index.vue

@@ -85,7 +85,7 @@ export default {
   },
   methods: {
     toggleSideBar(){
-      console.log(this.aside.collapse);
+      // console.log(this.aside.collapse);
       this.aside.collapse=!this.aside.collapse;
     }
   }

src/router/index.js

@@ -193,20 +193,6 @@ 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/security.js

@@ -65,7 +65,7 @@ router.beforeEach((to, from, next) => {
               });
 
             }).catch(err => {
-                console.log(err);
+                // console.log(err);
                 store.commit('app/SET_INITDATA',false);
                 //如果初始化错误，就不再执行了，不然会一直循环下去
                 next({ path: '/500' })

src/store/modules/majorType.js

@@ -80,7 +80,7 @@ const  mutations={
                     sessionStorage.setItem('majorTypeMap',JSON.stringify(res.result));
                     context.commit('setMajorTypeMap', map);
                 } else {
-                    console.log('专业分类获取失败！');
+                    // console.log('专业分类获取失败！');
                 }
               });
           }

src/store/modules/orgDomain.js

@@ -78,7 +78,7 @@ const  mutations={
                     sessionStorage.setItem('OrgDomainMap',JSON.stringify(res.result));
                     context.commit('setOrgDomainMap', map);
                 } else {
-                    console.log('组织机构获取失败！');
+                    // console.log('组织机构获取失败！');
                 }
               });
           }