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

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

.env.development

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

.env.preview

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

.env.production

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

.env.testing

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

package.json

@@ -15,7 +15,6 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "@mermaid-js/parser": "^0.6.3",
     "axios": "^0.21.4",
     "core-js": "^3.6.5",
     "driver.js": "^0.9.8",
@@ -24,15 +23,9 @@
     "element-ui": "^2.15.7",
     "file-saver": "^2.0.5",
     "fuse.js": "^6.4.6",
-    "highlight.js": "^11.11.1",
     "image-conversion": "^2.1.1",
     "jsencrypt": "^3.2.1",
     "json-bigint": "^1.0.0",
-    "katex": "^0.16.25",
-    "markdown-it": "^14.1.0",
-    "markdown-it-highlightjs": "^4.2.0",
-    "markdown-it-mermaid": "^0.2.5",
-    "mermaid": "^8.13.10",
     "mockjs": "^1.1.0",
     "moment": "^2.29.1",
     "nprogress": "^0.2.0",
@@ -50,7 +43,6 @@
     "vue": "^2.6.11",
     "vue-awesome-swiper": "^3.1.3",
     "vue-cookies": "^1.7.4",
-    "vue-katex": "^0.5.0",
     "vue-pdf": "^4.2.0",
     "vue-quill-editor": "^3.0.6",
     "vue-router": "^3.5.2",
@@ -68,7 +60,6 @@
     "html-webpack-plugin": "^5.5.0",
     "less": "^4.1.1",
     "less-loader": "^6.2.0",
-    "null-loader": "^4.0.1",
     "sass": "^1.32.13",
     "sass-loader": "^10.1.0",
     "vue-template-compiler": "^2.6.11"

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

@@ -2,73 +2,24 @@
   <div id="app">
     <keep-alive :include="['case']">
       <router-view />
-      12312
     </keep-alive>
-    <!-- 添加AI Call组件 -->
-    <AICall 
-      :dialogVisible="showAICall" 
-      @close="onCloseAICall"
-      @restore="onRestoreAICall"
-    />
   </div>
 </template>
 
 <script>
-  import { mapGetters, mapState } from 'vuex';
+  import { mapGetters } from 'vuex';
-  import AICall from '@/views/portal/case/AICall.vue';
-  
   export default{
     name:  'App',
-    components: {
-      AICall
-    },
     computed: {
-      ...mapGetters(['userInfo']),
+      ...mapGetters(['userInfo'])
-      ...mapState('app', ['showAICall', 'showAICallMinimized'])
     },
-    methods: {
+  mounted() {
-      onCloseAICall() {
-        // 通过Vuex关闭AI Call组件
-        this.$store.dispatch('app/setShowAICall', false);
-      },
-      
-      onRestoreAICall() {
-        // 通过Vuex显示AI Call组件
-        this.$store.dispatch('app/setShowAICall', true);
-      },
-      
-      // 检查当前路由是否应该显示AI弹窗
-      checkRouteForAICall() {
-        const currentRoute = this.$route.name;
-        // 只在case或caseDetail路由显示弹窗
-        if (currentRoute === 'case' || currentRoute === 'caseDetail') {
-          // 设置最小化窗口显示状态为true
-          this.$store.dispatch('app/setShowAICallMinimized', true);
-          // 注意：这里不再强制设置showAICall为true，保留用户之前的操作状态
-        } else {
-          // 其他路由关闭弹窗
-          this.$store.dispatch('app/setShowAICall', false);
-          // 设置最小化窗口显示状态为false
-          this.$store.dispatch('app/setShowAICallMinimized', false);
-        }
-      }
-    },
-    mounted() {
       //从状态值中取,因为登录处理，所以移动watch中
       // console.log(this.userInfo);
       // if(this.userInfo && this.userInfo.name!=''){
       //   this.$watermark.set(this.userInfo.name+this.userInfo.loginName);
       // }
-      
-      // 初始化检查路由
-      this.checkRouteForAICall();
     },
-    watch: {
-      // 监听路由变化
-      $route(to, from) {
-        this.checkRouteForAICall();
-      }
-    }
     // watch:{
     //   userInfo(newVal,oldVal){
     //     if(newVal && newVal.name!=''){
@@ -87,4 +38,5 @@
     border: 1px solid #e7e7e7 !important;
     box-shadow: 0px 1px 5px 1px rgba(92,98,111,.3);
 }
-</style>
+</style>
+

src/api/boe/aiChat.js

@@ -1,30 +0,0 @@
-import ajax from '@/utils/xajax.js'
-
-/**
- * AI聊天对话接口
- * @param {Object} data - 请求参数
- * @param {string} data.conversationId - 会话ID，如果为空则创建新会话
- * @param {string} data.query - 用户提问内容
- * @returns {Promise} - 返回SSE流
- */
-export function aiChat(data) {
-  return ajax.postJson('http://192.168.3.178/xboe/m/boe/case/ai/chat', data)
-}
-
-/**
- * 查询会话消息记录接口
- * @param {string} conversationId - 会话ID
- * @returns {Promise} - 返回会话历史记录
- */
-export function getChatMessages(conversationId) {
-  return ajax.get('/xboe/m/boe/case/ai/messages?conversationId=' + conversationId)
-}
-
-/**
- * 案例专家功能入口显示权限判断接口
- * 判断当前登录用户是否显示"案例专家"功能入口
- * @returns {Promise} - 返回是否显示功能入口的布尔值
- */
-export function showCaseAiEntrance() {
-  return ajax.get('/xboe/m/boe/case/ai/show-entrance')
-}

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,63 +60,13 @@ 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}&pageNo=${data.pageNo}&pageSize=${data.pageSize}`);
-}
 
-/**
- * 导出授课记录
- *
- * @param {Object} data
- */
-const courseRecordExport2 = function(data) {
-  return axios.request({
-    baseURL: "/manageApi",
-    url: '/admin/export/exportInTeacherRecord',
-    method: 'get',
-    data:data,
-    headers:{'Content-Type':'application/json;charset=utf-8'},
-    responseType: 'blob'
-  })
-}
-
-/**
- * 导出课程下的学员信息
- *
- */
-const exportStudentOfCourse2 = function(courseId,courseType) {
-  return axios.request({
-    baseURL: "/manageApi",
-    url: '/admin/export/exportTeacherRecordStudentInfo?courseId='+courseId+'&courseType='+courseType,
-    method: 'get'
-    // headers:{'Content-Type':'application/json;charset=utf-8'},
-    // responseType: 'blob'
-  })
-}
-
-/**
- * 导出教师下的所有授课记录下的学员信息
- *
- */
-const exportStudentOfTearcher2 = function(userId) {
-  return axios.request({
-    baseURL: "/manageApi",
-    url: '/b1/system/teacher/teacher-course-student-export?userId='+userId,
-    method: 'post',
-    headers:{'Content-Type':'application/json;charset=utf-8'},
-    responseType: 'blob'
-  })
-}
 
 
 export default {
     courseRecordExport,
-    courseRecordExport2,
     courseRecordList,
-    getListByToken,
     exportStudentOfCourse,
-    exportStudentOfCourse2,
+    exportStudentOfTearcher
-    exportStudentOfTearcher,
-    exportStudentOfTearcher2,
 
 }

src/api/growth/growthpath.js

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

src/api/growth/index.js

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

src/api/httpAjax.js

@@ -1,208 +0,0 @@
-import axios from 'axios'
-import qs from 'qs'
-import {Notification, MessageBox, Message} from 'element-ui'
-import store from '@/store'
-import {getToken} from '@/utils/token'
-import errorCode from '@/utils/errorCode'
-
-/**
- *request请求 axios.request(config)
- *requestJson请求 axios.request(config)
- *get请求 axios.get(url[, config])
- *post请求 axios.post(url[, data[, config]])
- *postJson请求 axios.post(url[, data[, config]])
- *put请求 axios.put(url[, data[, config]])
- *putJson请求 axios.put(url[, data[, config]])
- *patch请求 axios.patch(url[, data[, config]])
- *patchJson请求 axios.patch(url[, data[, config]])
- *delete请求 axios.delete(url[, config])
- */
-
-
-// const ReLoginUrl=process.env.VUE_APP_LOGIN_URL;
-const TokenName = 'token';
-/**axios.defaults.headers['Content-Type'] = 'application/x-www-form-urlencoded'**/
-//只是用于发送json对象数据时使用post,put,patch
-/**axios.defaults.headers['Content-Type'] = 'application/x-www-form-urlencoded'**/
-//只是用于发送json对象数据时使用post,put,patch
-//用于普通的发送请求
-const formRequest = axios.create({
-  //headers:{'Content-Type':'application/x-www-form-urlencoded'},
-  // axios中请求配置有baseURL选项，表示请求URL公共部分
-  // baseURL: process.env.VUE_APP_CESOURCE_BASE_API,
-  //超时
-  timeout: 10000,
-})
-//发送json对象的拦截器
-formRequest.interceptors.request.use(config => {
-  //是否需要设置 token
-  const isToken = (config.headers || {}).isToken === false
-  let curToken = getToken();
-  //curToken='eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NzIzMTE2MTIsImV4cCI6MTY3MjMxODgxMiwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.a4f41376e994c5fcd3ab537ce17572ef4c633863f87785cf7b6ffa353e2ed51c';
-  if (curToken && !isToken) {
-    config.headers[TokenName] = curToken // 让每个请求携带自定义token 请根据实际情况自行修改
-  }
-  return config
-}, error => {
-  console.log(error)
-  Promise.reject(error)
-});
-formRequest.interceptors.response.use(res => {
-    //console.log(res);
-    const code = res.data.status || 200;
-    if (code === 200) {
-      return res.data
-    } else {
-      if (code === 401) {
-        // store.dispatch('LogOut').then(() => {
-        //    location.href = this.webBaseUrl + ReLoginUrl;
-        // })
-        console.error('', res.data);
-        return Promise.reject(new Error('接口返回未登录'))
-      } else if (code === 403) {
-        var msg = '当前操作没有权限';
-        Message({message: msg, type: 'error'});
-        return Promise.reject(new Error(msg))
-      } else {
-        //Message({message: res.data.message, type: 'error'});
-        //console.log('err' + res.data.error);
-        return res.data
-      }
-    }
-  },
-  error => {
-    console.log('err', error)
-    let {message} = error;
-    if (message == "Network Error") {
-      message = "网络异常，请稍后重试";
-    } else if (message.includes("timeout")) {
-      message = "网络异常或接口错误，请求超时";
-    } else if (message.includes("Request failed with status code")) {
-      message = "系统接口" + message.substr(message.length - 3) + "异常";
-    }
-    Message({
-      message: message,
-      type: 'error',
-      duration: 5 * 1000
-    })
-    return Promise.reject(error)
-  }
-)
-
-/**
- * request请求,可以自定义参数
- */
-const request = formRequest.request;
-
-/**
- * get请求 ,只有url
- */
-const get = function (baseURL, url) {
-  return request({
-    baseURL,
-    url: url,
-    method: 'get',
-    headers: {'Content-Type': 'application/json'}
-  })
-}
-
-/**
- * post请求
- * @param {Object} url
- * @param {Object} postData
- */
-const post = function (baseURL, url, postData) {
-  // if (postData) {
-  //   postData = qs.stringify(postData);
-  // }
-  return request({
-    baseURL,
-    url: url,
-    method: 'post',
-    data: postData,
-    headers: {'Content-Type': 'application/json'}
-  })
-}
-//post请求
-const postForm = function (baseURL, url, data) {
-  return request({
-    baseURL,
-    url,
-    data,
-    method: 'post',
-    headers: {'Content-Type': 'application/x-www-form-urlencoded'}
-  });
-}
-//  const postJson=jsonRequest.post;
-
-const postJson = function (baseURL, url, postData) {
-  return request({
-    baseURL,
-    url: url,
-    method: 'post',
-    data: postData,
-    headers: {'Content-Type': 'application/json;charset=utf-8'},
-  })
-}
-
-// 导出文件请求定义
-const postJsonToFile = function (baseURL, url, postData) {
-  return request({
-    baseURL,
-    url: url,
-    method: 'post',
-    data: postData,
-    headers: {'Content-Type': 'application/json;charset=utf-8'},
-    responseType: 'blob'
-  })
-}
-
-const getJsonToFile = function (baseURL, url, postData) {
-  return request({
-    baseURL,
-    url: url,
-    method: 'get',
-    data: postData,
-    headers: {'Content-Type': 'application/json;charset=utf-8'},
-    responseType: 'blob'
-  })
-}
-
-/**
- * put请求
- */
-const put = function (baseURL, url, data) {
-  if (data) {
-    data = qs.stringify(data);
-  }
-  return request({
-    baseURL,
-    url: url,
-    method: 'put',
-    data: data,
-    headers: {'Content-Type': 'application/x-www-form-urlencoded'}
-  })
-}
-
-const putJson = function (baseURL, url, data) {
-  return request({
-    baseURL,
-    url: url,
-    method: 'put',
-    data: data,
-    headers: {'Content-Type': 'application/json;charset=utf-8'},
-  })
-}
-
-
-export default {
-  tokenName: TokenName,
-  request,
-  get,
-  post,
-  postJson,
-  postJsonToFile,
-  put,
-  putJson,
-  getJsonToFile
-}

src/api/manage/manage.js

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

src/api/modules/cases.js

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

src/api/modules/course.js

@@ -1,7 +1,7 @@
 /**
  * 课程的操作，课程的添加，修改，列表查询，课程的审核发布等操作。
  * 针对于管理员，教师的功能
- *
+ * 
  **/
 import ajax from '@/utils/xajax.js'
 
@@ -170,9 +170,7 @@ const updateContentOrders = function(cid,items) {
 const detail = function(id) {
     return ajax.get('/xboe/m/course/manage/detail?id=' + id);
 }
-const getDictIds = function(pid,type) {
+
-  return ajax.get(`/xboe/m/course/manage/getDictIds?pid=${pid}&type=${type}`);
-}
 /**
  * 更新内容的名称
  * @param {Object} data
@@ -276,7 +274,7 @@ const countWaitAudit = function() {
 }
 
 /**
- * [已用courseAudit中的hrbpAuditList替换]
+ * [已用courseAudit中的hrbpAuditList替换]
  * 当前用户需要审核的课程列表
  * @param {Object} query 同pageList
  */
@@ -285,9 +283,9 @@ const auditList = function(query) {
 }
 
 
-/**
+/**
- * 【已移到courseAudit中】
+ * 【已移到courseAudit中】
- * 教师需要审核的课程列表
+ * 教师需要审核的课程列表
  */
 const teacherAuditList = function(query) {
     return ajax.post('/xboe/m/course/audit/teacher-course', query);
@@ -448,7 +446,6 @@ export default {
     findUpdateLogs,
     getUpdateLog,
     detail,
-    getDictIds,
     saveContent,
     pageList,
     setEnabled,

src/api/modules/courseFile.js

@@ -22,7 +22,7 @@ const pageList = function(data) {
 
 /**
  * 选择课件的查询，这里也是分页查询，只是返回的内容，字段会很少，用于课件制作那选择已有课件内容。
- *
+ * 
  * @param {Object} data
  * 查询参数如上面pageList方法
  */
@@ -47,9 +47,7 @@ const findList = function(data) {
  }
  */
 const saveUpload = function(data) {
-    return ajax.post('/xboe/m/course/file/upload/save', data, {
+    return ajax.post('/xboe/m/course/file/upload/save', data);
-      timeout: 60000
-    });
 }
 
 /**
@@ -90,4 +88,4 @@ export default {
     batchUpdate,
     detail,
     delFile
-}
+}

src/api/modules/courseStudy.js

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

src/api/modules/courseTag.js

@@ -1,64 +0,0 @@
-/**课程标签模块的相关处理*/
-import ajax from '@/utils/xajax.js'
-
-/**
- * 分页查询：标签列表
- * @param {Object} query
- */
-const portalPageList = function(query) {
-  return ajax.post('/xboe/m/coursetag/page', query);
-}
-
-//改变标签的公共属性
-const changeTagPublic = function (row){
-  // 返回 Promise 的 API 调用
-  return ajax.post('/xboe/m/coursetag/changePublicStatus', {
-    id: row.id,
-    isPublic: row.isPublic
-  });
-}
-
-//改变标签的热点属性
-const changeTagHot = function (row){
-  // 返回 Promise 的 API 调用
-  return ajax.post('/xboe/m/coursetag/changeHotStatus', {
-    id: row.id,
-    isHot: row.isHot
-  });
-}
-
-//查询指定id的标签关联的所有课程
-const showCourseByTag = function (query){
-  return ajax.post('/xboe/m/coursetag/showCourseByTag', query);
-}
-
-//解除指定id的课程和某个标签之间的关联关系
-const unbindCourseTagRelation = function (params){
-  return ajax.post('/xboe/m/coursetag/unbind', params);
-}
-
-//编辑课程：标签模糊查询
-const searchTags = function (params){
-  return ajax.post('/xboe/m/coursetag/searchTags', params);
-}
-
-//编辑课程：创建标签(与当前课程关联)
-const createTag = function (params){
-  return ajax.post('/xboe/m/coursetag/createTag', params);
-}
-
-//获取最新前10个热点标签
-const getHotTagList = function (params){
-  return ajax.post('/xboe/m/coursetag/getHotTagList', params);
-}
-
-export default {
-  portalPageList,
-  changeTagPublic,
-  changeTagHot,
-  showCourseByTag,
-  unbindCourseTagRelation,
-  searchTags,
-  createTag,
-  getHotTagList
-}

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);
 }
@@ -38,7 +36,7 @@ const detailTeacher=function (id){
  * tlevelId级别
  * salaryId发薪地
  * tsystemId
-
+ 
  * } query
  * @returns
  */
@@ -219,7 +217,7 @@ export default {
     update,
     del,
     detail,
-    findByNameNew,
+    findByName,
     updateSysId,
 	has,
 	start,

src/api/phase2/index.js

@@ -1,7 +1,5 @@
 import ajax from '@/utils/xajax.js'
 import http from '../unionAjax'
-import httpAjax from '../httpAjax'
-
 const baseURL = process.env.VUE_APP_MANAGER_API_PATH;
 
 
@@ -49,18 +47,6 @@ const articlelist=function (type){
 const courselist=function (data){
   return ajax.post('/xboe/portal/index/courselist',data);
 }
-// 精品课信息列表
-const qualitylist=function (data){
-  return httpAjax.post(baseURL,'/quality/home/qualityItem',data);
-}
-// 精品课分页查询
-export const qualityPageList=function (data){
-  return httpAjax.post(baseURL,'/quality/home/qualityPages',data);
-}
-// 课程精品课标记时间年份列表
-export const qualityCourseTimeMark=function (){
-  return httpAjax.post(baseURL,'/quality/manage/qualityYearList',{});
-}
 /**
  * 首页新课程推荐列表
  */
@@ -75,7 +61,5 @@ export default {
   articlelist,
   courselist,
   newCases,
-  getRecommendList,
+  getRecommendList
-  qualitylist,
-  qualityPageList
 }