0119新分支测试

.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

@@ -1,74 +1,25 @@
 <template>
-  <div id="app" style="width: 100vw">
+  <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 AICall from '@/views/portal/case/AICall.vue';
-
+  import { mapGetters } from 'vuex';
   export default{
     name:  'App',
-    components: {
-      AICall
-    },
     computed: {
-      ...mapGetters(['userInfo']),
-      ...mapState('app', ['showAICall', 'showAICallMinimized'])
+      ...mapGetters(['userInfo'])
     },
-    methods: {
-      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() {
+  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,16 +38,5 @@
     border: 1px solid #e7e7e7 !important;
     box-shadow: 0px 1px 5px 1px rgba(92,98,111,.3);
 }
+</style>
 
-#app {
-  pointer-events: none;
-}
-
-#app > *:not(.case-expert-dialog) {
-  pointer-events: auto;
-}
-
-.case-expert-dialog {
-  pointer-events: auto;
-}
-</style>

src/api/ajax.js

@@ -3,7 +3,7 @@ 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'
+import errorCode from '@/utils/errorCode' 
 /**
  *request请求 axios.request(config)
  *requestJson请求 axios.request(config)
@@ -19,93 +19,88 @@ import errorCode from '@/utils/errorCode'
 
 
 // const ReLoginUrl=process.env.VUE_APP_LOGIN_URL;
-const TokenName = 'XBOE-Access-Token';
+const TokenName='XBOE-Access-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: 60000,
-})
-//发送json对象的拦截器
-formRequest.interceptors.request.use(config => {
-   //是否需要设置 token
-   const isToken = (config.headers || {}).isToken === false
-   if (getToken() && !isToken) {
-      config.headers[TokenName] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-   }
-   return config
-}, error => {
-   console.log(error)
-   Promise.reject(error)
-});
-formRequest.interceptors.response.use(res => {
-   const code = res.data.status || 200;
-   if (code === 200) {
-      return res.data
-   } else {
-      if (code === 401) {
-         //Message({message: msg, type: 'error'});
-         store.dispatch('LogOut').then(() => {
-            if (top !== window) { // 判断当前是否在iframe内
-               top.location.href = this.webBaseUrl + ReLoginUrl;
-            } else {
-               window.location.href = this.webBaseUrl + ReLoginUrl;
-            }
-            //   location.href = this.webBaseUrl + ReLoginUrl;
-         })
-      } 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 => {
+const formRequest=axios.create({
+    // headers:{'Content-Type':'application/x-www-form-urlencoded'},
+    // axios中请求配置有baseURL选项，表示请求URL公共部分
+    // baseURL: process.env.VUE_APP_CESOURCE_BASE_API,
+    //超时
+    timeout: 60000,
+  })
+  //发送json对象的拦截器
+  formRequest.interceptors.request.use(config => {
+    //是否需要设置 token
+    const isToken = (config.headers || {}).isToken === false
+    if (getToken() && !isToken) {
+       config.headers[TokenName] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+    }
+    return config
+  }, error => {
+      console.log(error)
+      Promise.reject(error)
+  });
+  formRequest.interceptors.response.use(res => {
+      const code = res.data.status || 200;
+       if(code===200){
+           return res.data
+       }else{
+           if(code === 401){
+              //Message({message: msg, type: 'error'});
+              store.dispatch('LogOut').then(() => {
+                 location.href = this.webBaseUrl + ReLoginUrl;
+              })
+           }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 = "网络异常，请稍后重试";
+        message = "网络异常，请稍后重试";
       }
       else if (message.includes("timeout")) {
-         message = "网络异常或接口错误，请求超时";
+        message = "网络异常或接口错误，请求超时";
       }
       else if (message.includes("Request failed with status code")) {
-         message = "系统接口" + message.substr(message.length - 3) + "异常";
+        message = "系统接口" + message.substr(message.length - 3) + "异常";
       }
       Message({
-         message: message,
-         type: 'error',
-         duration: 5 * 1000
+        message: message,
+        type: 'error',
+        duration: 5 * 1000
       })
       return Promise.reject(error)
-   }
-)
+    }
+  )
 
 /**
  * request请求,可以自定义参数
  */
-const request = formRequest.request;
+const request=formRequest.request;
 
 /**
  * get请求 ,只有url
  */
-const get = function (baseURL, url) {
-   return request({
-      baseURL,
-      url: url,
-      method: 'get',
-      headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
-   })
+const get = function(baseURL,url){
+	return request({
+        baseURL,
+		url: url,
+		method: 'get',
+        headers:{'Content-Type':'application/x-www-form-urlencoded'}
+	})
 }
 
 /**
@@ -113,61 +108,61 @@ const get = function (baseURL, url) {
  * @param {Object} url
  * @param {Object} postData
  */
-const post = function (baseURL, url, postData) {
-   if (postData) {
-      postData = qs.stringify(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/x-www-form-urlencoded' }
+    baseURL,
+   	url: url,
+   	method: 'post',
+	data:postData,
+	headers:{'Content-Type':'application/x-www-form-urlencoded'}
    })
 }
 //post请求
-const postForm = function (baseURL, url, data) {
-   return request({
-      baseURL,
-      url,
-      data,
-      method: 'post',
-      headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
-   });
-}
+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) {
+const postJson=function(baseURL,url,postData){
    return request({
-      baseURL,
-      url: url,
-      method: 'post',
-      data: postData,
-      headers: { 'Content-Type': 'application/json;charset=utf-8' },
+    baseURL,
+   	url: url,
+   	method: 'post',
+	data:postData,
+    headers:{'Content-Type':'application/json;charset=utf-8'},
    })
 }
 
 
-const postPdf = function (baseURL, url, postData) {
+const postPdf=function(baseURL,url,postData){
    return request({
-      baseURL,
-      url: url,
-      responseType: 'blob',
-      method: 'post',
-      data: postData,
-      headers: { 'Content-Type': 'application/pdf' },
+    baseURL,
+   	url: url,
+    responseType: 'blob',
+   	method: 'post',
+    data:postData,
+    headers:{'Content-Type':'application/pdf'},
    })
 }
 
 // 导出文件请求定义
-const postJsonToFile = function (baseURL, url, postData) {
+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'
+    baseURL,
+   	url: url,
+   	method: 'post',
+    data:postData,
+    headers:{'Content-Type':'application/json;charset=utf-8'},
+    responseType: 'blob'
    })
 }
 
@@ -175,39 +170,39 @@ const postJsonToFile = function (baseURL, url, postData) {
 /**
  * put请求
  */
-const put = function (baseURL, url, data) {
-   if (data) {
-      data = qs.stringify(data);
+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' }
+    baseURL,
+   	url: url,
+   	method: 'put',
+   	data:data,
+   	headers:{'Content-Type':'application/x-www-form-urlencoded'}
    })
 }
 
-const putJson = function (baseURL, url, data) {
+const putJson=function(baseURL,url,data){
    return request({
-      baseURL,
-      url: url,
-      method: 'put',
-      data: data,
-      headers: { 'Content-Type': 'application/json;charset=utf-8' },
+    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,
-   postPdf,
+    tokenName:TokenName,
+    request,
+    get,
+    post,
+    postJson,
+    postJsonToFile,
+    put,
+    putJson,
+    postPdf,
 }

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

@@ -19,95 +19,90 @@ import errorCode from '@/utils/errorCode'
 
 
 // const ReLoginUrl=process.env.VUE_APP_LOGIN_URL;
-const TokenName = 'token';
+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(() => {
-            if (top !== window) { // 判断当前是否在iframe内
-               top.location.href = this.webBaseUrl + ReLoginUrl;
-            } else {
-               window.location.href = this.webBaseUrl + ReLoginUrl;
-            }
-            //   location.href = this.webBaseUrl + ReLoginUrl;
-         })
-      } 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)
+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;
+                 })
+           }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 = "网络异常，请稍后重试";
+        message = "网络异常，请稍后重试";
       }
       else if (message.includes("timeout")) {
-         message = "网络异常或接口错误，请求超时";
+        message = "网络异常或接口错误，请求超时";
       }
       else if (message.includes("Request failed with status code")) {
-         message = "系统接口" + message.substr(message.length - 3) + "异常";
+        message = "系统接口" + message.substr(message.length - 3) + "异常";
       }
       Message({
-         message: message,
-         type: 'error',
-         duration: 5 * 1000
+        message: message,
+        type: 'error',
+        duration: 5 * 1000
       })
       return Promise.reject(error)
-   }
-)
+    }
+  )
 
 /**
  * request请求,可以自定义参数
  */
-const request = formRequest.request;
+const request=formRequest.request;
 
 /**
  * get请求 ,只有url
  */
-const get = function (baseURL, url) {
-   return request({
-      baseURL,
-      url: url,
-      method: 'get',
-      headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
-   })
+const get = function(baseURL,url){
+	return request({
+        baseURL,
+		url: url,
+		method: 'get',
+        headers:{'Content-Type':'application/x-www-form-urlencoded'}
+	})
 }
 
 /**
@@ -115,49 +110,49 @@ const get = function (baseURL, url) {
  * @param {Object} url
  * @param {Object} postData
  */
-const post = function (baseURL, url, postData) {
-   if (postData) {
-      postData = qs.stringify(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/x-www-form-urlencoded' }
+    baseURL,
+   	url: url,
+   	method: 'post',
+	data:postData,
+	headers:{'Content-Type':'application/x-www-form-urlencoded'}
    })
 }
 //post请求
-const postForm = function (baseURL, url, data) {
-   return request({
-      baseURL,
-      url,
-      data,
-      method: 'post',
-      headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
-   });
-}
+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) {
+const postJson=function(baseURL,url,postData){
    return request({
-      baseURL,
-      url: url,
-      method: 'post',
-      data: postData,
-      headers: { 'Content-Type': 'application/json' },
+    baseURL,
+   	url: url,
+   	method: 'post',
+	data:postData,
+    headers:{'Content-Type':'application/json'},
    })
 }
 
 // 导出文件请求定义
-const postJsonToFile = function (baseURL, url, postData) {
+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'
+    baseURL,
+   	url: url,
+   	method: 'post',
+	data:postData,
+    headers:{'Content-Type':'application/json;charset=utf-8'},
+    responseType: 'blob'
    })
 }
 
@@ -165,38 +160,38 @@ const postJsonToFile = function (baseURL, url, postData) {
 /**
  * put请求
  */
-const put = function (baseURL, url, data) {
-   if (data) {
-      data = qs.stringify(data);
+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' }
+    baseURL,
+   	url: url,
+   	method: 'put',
+   	data:data,
+   	headers:{'Content-Type':'application/x-www-form-urlencoded'}
    })
 }
 
-const putJson = function (baseURL, url, data) {
+const putJson=function(baseURL,url,data){
    return request({
-      baseURL,
-      url: url,
-      method: 'put',
-      data: data,
-      headers: { 'Content-Type': 'application/json;charset=utf-8' },
+    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,
+    tokenName:TokenName,
+    request,
+    get,
+    post,
+    postJson,
+    postJsonToFile,
+    put,
+    putJson,
 }

src/api/boe/boeApiAjax.js

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

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,
-    exportStudentOfTearcher2,
+    exportStudentOfTearcher
 
 }

src/api/cesource/index.js

@@ -16,196 +16,186 @@ import errorCode from '@/utils/errorCode'
  *patchJson请求 axios.patch(url[, data[, config]])
  *delete请求 axios.delete(url[, config])
  */
-
-const ReLoginUrl = "/login";
-const TokenName = 'XBOE-Access-Token';
+  
+const ReLoginUrl="/login";
+const TokenName='XBOE-Access-Token';
 /**axios.defaults.headers['Content-Type'] = 'application/x-www-form-urlencoded'**/
 //只是用于发送json对象数据时使用post,put,patch
-const jsonRequest = axios.create({
-   headers: { 'Content-Type': 'application/json;charset=utf-8' },
-   // axios中请求配置有baseURL选项，表示请求URL公共部分
-   baseURL: process.env.VUE_APP_CESOURCE_BASE_API,
-   //超时
-   timeout: 10000,
+const jsonRequest=axios.create({
+  headers:{'Content-Type':'application/json;charset=utf-8'},
+  // axios中请求配置有baseURL选项，表示请求URL公共部分
+  baseURL: process.env.VUE_APP_CESOURCE_BASE_API,
+  //超时
+  timeout: 10000,
 });
 //发送json对象的拦截器
 jsonRequest.interceptors.request.use(config => {
-   //是否需要设置 token
-   const isToken = (config.headers || {}).isToken === false
-   if (getToken() && !isToken) {
-      config.headers[TokenName] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-   }
-   return config
+  //是否需要设置 token
+  const isToken = (config.headers || {}).isToken === false
+  if (getToken() && !isToken) {
+     config.headers[TokenName] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+  }
+  return config
 }, error => {
-   console.log(error)
-   Promise.reject(error)
+    console.log(error)
+    Promise.reject(error)
 })
 
 // 响应拦截器
 jsonRequest.interceptors.response.use(res => {
 
-   const code = res.data.status || 200;
-   if (code === 200) {
-      return res.data
-   } else {
-      if (code === 401) {
-         store.dispatch('LogOut').then(() => {
-            if (top !== window) { // 判断当前是否在iframe内
-               top.location.href = this.webBaseUrl + ReLoginUrl;
-            } else {
-               window.location.href = this.webBaseUrl + ReLoginUrl;
-            }
-            // location.href = this.webBaseUrl + ReLoginUrl;
-         })
-      } 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;
-         //return Promise.reject(new Error(res.data.message))
-      }
-   }
-},
-   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)
-   }
+    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;
+               })
+         }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;
+            //return Promise.reject(new Error(res.data.message))
+         }
+     }
+  },
+  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)
+  }
 )
 
 //用于普通的发送请求
-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,
+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
-   if (getToken() && !isToken) {
-      config.headers[TokenName] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-   }
-   return config
+  //是否需要设置 token
+  const isToken = (config.headers || {}).isToken === false
+  if (getToken() && !isToken) {
+     config.headers[TokenName] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+  }
+  return config
 }, error => {
-   console.log(error)
-   Promise.reject(error)
+    console.log(error)
+    Promise.reject(error)
 });
 formRequest.interceptors.response.use(res => {
-   const code = res.data.status || 200;
-   if (code === 200) {
-      return res.data
-   } else {
-      if (code === 401) {
-         store.dispatch('LogOut').then(() => {
-            if (top !== window) { // 判断当前是否在iframe内
-               top.location.href = this.webBaseUrl + ReLoginUrl;
-            } else {
-               window.location.href = this.webBaseUrl + ReLoginUrl;
-            }
-            // location.href = this.webBaseUrl + ReLoginUrl;
-         })
-      } 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);
+    const code = res.data.status || 200;
+     if(code===200){
          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)
-   }
+     }else{
+         if(code === 401){
+               store.dispatch('LogOut').then(() => {
+                  location.href = this.webBaseUrl + ReLoginUrl;
+               })
+         }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 = function (cfg) {
-   if (cfg.data) {
-      cfg.data = qs.stringify(cfg.data);
+const request=function(cfg){
+   if(cfg.data){
+      cfg.data=qs.stringify(cfg.data);
    }
 };
 //requestJson请求
-const requestJson = jsonRequest.request;
+const requestJson=jsonRequest.request;
 //get请求
-const get = formRequest.request;
+const get=formRequest.request;
 //post请求
-const post = function (url, data, config) {
-   if (data) {
-      data = qs.stringify(data);
+const post=function(url,data,config){
+   if(data){
+      data=qs.stringify(data);
    }
-   return formRequest.post(url, data, config);
+   return formRequest.post(url,data,config);
 }
 //postJson请求
-const postJson = jsonRequest.post;
+const postJson=jsonRequest.post;
 //put请求
-const put = function (url, data, config) {
-   if (data) {
-      data = qs.stringify(data);
+const put=function(url,data,config){
+   if(data){
+      data=qs.stringify(data);
    }
-   return formRequest.put(url, data, config);
+   return formRequest.put(url,data,config);
 }
 //putJson请求
-const putJson = jsonRequest.put;
+const putJson=jsonRequest.put;
 //patch请求
-const patch = function (url, data, config) {
-   if (data) {
-      data = qs.stringify(data);
+const patch=function(url,data,config){
+   if(data){
+      data=qs.stringify(data);
    }
-   return formRequest.patch(url, data, config);
+   return formRequest.patch(url,data,config);
 }
 //patchJson请求
-const patchJson = jsonRequest.patch;
+const patchJson=jsonRequest.patch;
 //delete请求
-const del = formRequest.delete;
+const del=formRequest.delete;
 
 
 export default {
-   request,
-   requestJson,
-   get,
-   post,
-   postJson,
-   put,
-   putJson,
-   patch,
-   patchJson,
-   del
+    request,
+    requestJson,
+    get,
+    post,
+    postJson,
+    put,
+    putJson,
+    patch,
+    patchJson,
+    del
 }

src/api/event/index.js

@@ -17,195 +17,185 @@ import errorCode from '@/utils/errorCode'
  *delete请求 axios.delete(url[, config])
  */
 
-const ReLoginUrl = "/login";
-const TokenName = 'XBOE-Access-Token';
+const ReLoginUrl="/login";
+const TokenName='XBOE-Access-Token';
 /**axios.defaults.headers['Content-Type'] = 'application/x-www-form-urlencoded'**/
 //只是用于发送json对象数据时使用post,put,patch
-const jsonRequest = axios.create({
-   headers: { 'Content-Type': 'application/json;charset=utf-8' },
-   // axios中请求配置有baseURL选项，表示请求URL公共部分
-   baseURL: process.env.VUE_APP_STAT_BASE_API,
-   //超时
-   timeout: 10000,
+const jsonRequest=axios.create({
+  headers:{'Content-Type':'application/json;charset=utf-8'},
+  // axios中请求配置有baseURL选项，表示请求URL公共部分
+  baseURL: process.env.VUE_APP_STAT_BASE_API,
+  //超时
+  timeout: 10000,
 });
 //发送json对象的拦截器
 jsonRequest.interceptors.request.use(config => {
-   //是否需要设置 token
-   const isToken = (config.headers || {}).isToken === false
-   if (getToken() && !isToken) {
-      config.headers[TokenName] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-   }
-   return config
+  //是否需要设置 token
+  const isToken = (config.headers || {}).isToken === false
+  if (getToken() && !isToken) {
+     config.headers[TokenName] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+  }
+  return config
 }, error => {
-   console.log(error)
-   Promise.reject(error)
+    console.log(error)
+    Promise.reject(error)
 })
 
 // 响应拦截器
 jsonRequest.interceptors.response.use(res => {
 
-   const code = res.data.status || 200;
-   if (code === 200) {
-      return res.data
-   } else {
-      if (code === 401) {
-         store.dispatch('LogOut').then(() => {
-            if (top !== window) { // 判断当前是否在iframe内
-               top.location.href = this.webBaseUrl + ReLoginUrl;
-            } else {
-               window.location.href = this.webBaseUrl + ReLoginUrl;
-            }
-            // location.href = this.webBaseUrl + ReLoginUrl;
-         })
-      } 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;
-         //return Promise.reject(new Error(res.data.message))
-      }
-   }
-},
-   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)
-   }
+    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;
+               })
+         }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;
+            //return Promise.reject(new Error(res.data.message))
+         }
+     }
+  },
+  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)
+  }
 )
 
 //用于普通的发送请求
-const formRequest = axios.create({
-   headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-   // axios中请求配置有baseURL选项，表示请求URL公共部分
-   baseURL: process.env.VUE_APP_STAT_BASE_API,
-   //超时
-   timeout: 10000,
+const formRequest=axios.create({
+  headers:{'Content-Type':'application/x-www-form-urlencoded'},
+  // axios中请求配置有baseURL选项，表示请求URL公共部分
+  baseURL: process.env.VUE_APP_STAT_BASE_API,
+  //超时
+  timeout: 10000,
 })
 //发送json对象的拦截器
 formRequest.interceptors.request.use(config => {
-   //是否需要设置 token
-   const isToken = (config.headers || {}).isToken === false
-   if (getToken() && !isToken) {
-      config.headers[TokenName] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
-   }
-   return config
+  //是否需要设置 token
+  const isToken = (config.headers || {}).isToken === false
+  if (getToken() && !isToken) {
+     config.headers[TokenName] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
+  }
+  return config
 }, error => {
-   console.log(error)
-   Promise.reject(error)
+    console.log(error)
+    Promise.reject(error)
 });
 formRequest.interceptors.response.use(res => {
-   const code = res.data.status || 200;
-   if (code === 200) {
-      return res.data
-   } else {
-      if (code === 401) {
-         store.dispatch('LogOut').then(() => {
-            if (top !== window) { // 判断当前是否在iframe内
-               top.location.href = this.webBaseUrl + ReLoginUrl;
-            } else {
-               window.location.href = this.webBaseUrl + ReLoginUrl;
-            }
-            // location.href = this.webBaseUrl + ReLoginUrl;
-         })
-      } 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);
+    const code = res.data.status || 200;
+     if(code===200){
          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)
-   }
+     }else{
+         if(code === 401){
+               store.dispatch('LogOut').then(() => {
+                  location.href = this.webBaseUrl + ReLoginUrl;
+               })
+         }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 = function (cfg) {
-   if (cfg.data) {
-      cfg.data = qs.stringify(cfg.data);
+const request=function(cfg){
+   if(cfg.data){
+      cfg.data=qs.stringify(cfg.data);
    }
 };
 //requestJson请求
-const requestJson = jsonRequest.request;
+const requestJson=jsonRequest.request;
 //get请求
-const get = formRequest.request;
+const get=formRequest.request;
 //post请求
-const post = function (url, data, config) {
-   if (data) {
-      data = qs.stringify(data);
+const post=function(url,data,config){
+   if(data){
+      data=qs.stringify(data);
    }
-   return formRequest.post(url, data, config);
+   return formRequest.post(url,data,config);
 }
 //postJson请求
-const postJson = jsonRequest.post;
+const postJson=jsonRequest.post;
 //put请求
-const put = function (url, data, config) {
-   if (data) {
-      data = qs.stringify(data);
+const put=function(url,data,config){
+   if(data){
+      data=qs.stringify(data);
    }
-   return formRequest.put(url, data, config);
+   return formRequest.put(url,data,config);
 }
 //putJson请求
-const putJson = jsonRequest.put;
+const putJson=jsonRequest.put;
 //patch请求
-const patch = function (url, data, config) {
-   if (data) {
-      data = qs.stringify(data);
+const patch=function(url,data,config){
+   if(data){
+      data=qs.stringify(data);
    }
-   return formRequest.patch(url, data, config);
+   return formRequest.patch(url,data,config);
 }
 //patchJson请求
-const patchJson = jsonRequest.patch;
+const patchJson=jsonRequest.patch;
 //delete请求
-const del = formRequest.delete;
+const del=formRequest.delete;
 
 
 export default {
-   request,
-   requestJson,
-   get,
-   post,
-   postJson,
-   put,
-   putJson,
-   patch,
-   patchJson,
-   del
+    request,
+    requestJson,
+    get,
+    post,
+    postJson,
+    put,
+    putJson,
+    patch,
+    patchJson,
+    del
 }

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/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/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);
@@ -440,12 +438,6 @@ const queryCrowd=function(query){
 const ids=function (data){
   return ajax.postJson('/xboe/m/course/manage/ids',data);
 }
-
-const saveTip = function() {
-  return ajax.postJson('/xboe/m/course/manage/saveTip');
-}
-
-
 export default {
     saveBase,
     submitCourse,
@@ -454,7 +446,6 @@ export default {
     findUpdateLogs,
     getUpdateLog,
     detail,
-    getDictIds,
     saveContent,
     pageList,
     setEnabled,
@@ -488,7 +479,6 @@ export default {
 	exportCourseAudit,
 	exportCourse,
 	queryCrowd,
-  ids,
-  saveTip
+  ids
 
 }

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

src/api/modules/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,
-  qualitylist,
-  qualityPageList
+  getRecommendList
 }

src/components/AlertPopup.vue

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

src/components/Case/collectList.vue

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

src/components/Course/auditCourse1.vue

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

src/components/Course/auditCourse2.vue

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

src/components/Course/choice.vue

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

src/components/Course/chooseCourseFile.vue

@@ -50,7 +50,7 @@
               <el-input-number v-model="duration" size="mini" :min="1" :max="100"></el-input-number>
             </span>
           </div>
-          <el-upload ref="uploadRef" class="upload-demo" :headers="headers" :data="data" drag :action="uploadFileUrl" :on-success="handleUploadSuccess" :before-upload="handleBeforeUpload">
+          <el-upload class="upload-demo" :headers="headers" :data="data" drag :action="uploadFileUrl" :on-success="handleUploadSuccess" :before-upload="handleBeforeUpload">
             <i class="el-icon-upload"></i>
             <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
             <div class="el-upload__tip" slot="tip">文件大小限制：{{curComType.maxSizeName}},支持的文件类型：{{curComType.fileTypes.join(',')}}</div>
@@ -195,7 +195,6 @@
                 // this.cware.content.content=result.filePath;
               }else{
                 this.$message.error(rs.message);
-                this.$refs.uploadRef.clearFiles();
               }
           });
         }else{

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

@@ -1,400 +0,0 @@
-<template>
-  <div class="tag-container"  @click="handleContainerClick">
-    <el-select style="width: 100%;"
-               v-model="selectedTags"
-               multiple
-               filterable
-               value-key="id"
-               remote
-               reserve-keyword
-               :remote-method="debouncedSearch"
-               :loading="loading"
-               :placeholder="'回车创建新标签'"
-               :no-data-text="'无此标签，按回车键创建'"
-               @remove-tag="handleTagRemove"
-               @change="handleSelectionChange"
-               @keyup.enter.native="handleEnterKey"
-               @keyup.delete.native="handleDeleteKey"
-               @focus="handleFocus"
-               ref="tagSelect"
-    >
-      <el-option
-        v-for="item in searchResults"
-        :key="item.id"
-        :label="item.tagName"
-        :value="item"
-        :disabled="isTagDisabled(item)"
-      />
-    </el-select>
-    <!-- 添加标签计数显示 -->
-    <div class="tag-count">
-      {{ selectedTags.length }}/5
-    </div>
-  </div>
-</template>
-
-<script>
-import { debounce } from 'lodash'
-import apiCourseTag from '@/api/modules/courseTag.js'
-import { mapGetters } from 'vuex';
-
-export default {
-  props: {
-    courseId:{
-      type:String,
-      require:true,
-    },
-    sysTypeList:{
-      type:Array,
-      require:true,
-      default: []
-    },
-    maxTags: {
-      type: Number,
-      default: 5
-    },
-    // 添加：接收初始标签数据的props
-    initialTags: {
-      type: Array,
-      default: () => []
-    }
-  },
-  data() {
-    return {
-      selectedTags: [],
-      searchResults: [],
-      loading: false,
-      tagMap: new Map(),
-      inputBuffer: '',
-      params: {},
-      tag: {},
-      // 添加临时存储用于回滚
-      previousTags: []
-    }
-  },
-  computed: {
-    ...mapGetters(['userInfo']),
-    displayTags() {
-      return this.selectedTags.map(tag =>
-        typeof tag === 'object' ? tag : this.tagMap.get(tag)
-      ).filter(Boolean)
-    }
-  },
-  created() {
-    this.debouncedSearch = debounce(this.doSearch, 500)
-    console.log("----------sysTypeList.length---------->"+this.sysTypeList.length)
-    console.log("----------sysTypeList.length---------->"+(this.sysTypeList.length===0))
-  },
-  // 添加：挂载时初始化标签数据
-  mounted() {
-    if (this.initialTags && this.initialTags.length > 0) {
-      this.selectedTags = this.initialTags;
-      this.searchResults = this.initialTags;
-      // 将初始标签添加到tagMap中，确保删除功能正常
-      this.initialTags.forEach(tag => {
-        if (tag.id) {
-          this.tagMap.set(tag.id, tag);
-        }
-      });
-    }
-  },
-  watch: {
-    // 监听课程ID变化，重置所有状态
-    courseId(newVal) {
-      this.resetTagState();
-    },
-    // 监听初始标签变化，重新加载
-    initialTags(newVal) {
-      this.selectedTags = newVal || [];
-      this.searchResults = newVal || [];
-      this.tagMap.clear(); // 清空旧缓存
-      newVal.forEach(tag => {
-        if (tag.id) this.tagMap.set(tag.id, tag);
-      });
-    },
-    // 监听分类变化，重新加载搜索结果
-    sysTypeList: {
-      handler() {
-        // 只有在已选择分类且有焦点时才重新加载
-        if (this.sysTypeList.length > 0 && this.$refs.tagSelect && this.$refs.tagSelect.visible) {
-          this.doSearch('');
-        }
-      },
-      deep: true
-    }
-  },
-  methods: {
-    // 新增：检查标签是否应该被禁用
-    isTagDisabled(tag) {
-      // 如果标签已经被选中，不应该禁用（允许取消选择）
-      const isSelected = this.selectedTags.some(selectedTag => selectedTag.id === tag.id);
-      if (isSelected) {
-        return false;
-      }
-      // 如果标签未被选中且已达到最大数量，则禁用
-      return this.selectedTags.length >= this.maxTags;
-    },
-    // 新增：处理输入框获得焦点事件
-    async handleFocus() {
-      this.previousTags = [...this.selectedTags];
-      // 当输入框获得焦点时，加载默认的搜索结果
-      if (this.sysTypeList.length > 0) {
-        await this.doSearch('');
-      }
-      this.$emit('focus');
-    },
-    handleContainerClick() {
-      // 容器点击时也触发焦点事件
-      this.$emit('focus');
-    },
-    // 新增：重置标签状态的方法
-    resetTagState() {
-      this.selectedTags = [];
-      this.searchResults = [];
-      this.tagMap.clear();
-      this.loading = false;
-      this.params = {};
-    },
-    handleTagRemove(tagId) {
-      this.selectedTags = this.selectedTags.filter(id => id !== tagId)
-      this.$emit('change', this.displayTags)
-      this.clearInput();
-    },
-    removeTag(tagId) {
-      this.handleTagRemove(tagId)
-    },
-
-    // 新增：处理删除键事件
-    handleDeleteKey(event) {
-      // 如果输入框内容为空，不执行任何搜索
-      if (!event.target.value.trim()) {
-        this.searchResults = []
-      }
-    },
-
-    //按回车键，创建新标签
-    handleEnterKey(event) {
-      const inputVal = event.target.value?.trim()
-      if (!inputVal) return;
-      // 检查是否与已选择的标签重复
-      const isDuplicate = this.selectedTags.some(tag => tag.tagName === inputVal);
-      if (isDuplicate) {
-        this.$message.warning('该标签已存在，无需重复创建');
-        event.target.value = '';
-        return;
-      }
-      if (!isDuplicate && inputVal && this.selectedTags.length < this.maxTags) {
-        this.createNewTag(event.target.value.trim())
-        this.clearInput();
-      } else if (this.selectedTags.length >= this.maxTags) {
-        this.$message.warning('最多只能添加5个标签')
-        this.clearInput();
-      } else {
-        this.clearInput();
-      }
-    },
-
-    // 新增：处理选择变化事件
-    handleSelectionChange(newValues) {
-
-      // 检查每个标签对象是否完整
-      newValues.forEach((tag, index) => {
-        if (!tag.tagName) {
-          console.error(`第${index}个标签缺少tagName:`, tag);
-        }
-      });
-
-      // 检查数量限制
-      if (newValues.length > this.maxTags) {
-        this.$message.warning(`最多只能选择${this.maxTags}个标签`);
-        // 回滚到之前的状态
-        this.selectedTags = [...this.previousTags];
-        return;
-      }
-
-      // 更新前保存当前状态
-      this.previousTags = [...newValues];
-      this.$emit('change', this.displayTags);
-
-      this.clearInput();
-      this.$nextTick(() => {
-        this.$refs.tagSelect.visible = false;
-      });
-    },
-
-    clearInput() {
-      if (this.$refs.tagSelect) {
-        const input = this.$refs.tagSelect.$refs.input;
-        if (input) {
-          input.value = '';
-        }
-      }
-    },
-
-    //创建新标签
-    async createNewTag(tagName) {
-      // 标签不能超过八个字
-      if (tagName.length > 8) {
-        this.$message.error('标签不能超过8个字')
-        return;
-      }
-      // 检查标签是否在下拉框中已存在
-      const isExistInSearch = this.searchResults.some(tag => tag.tagName === tagName);
-      if (isExistInSearch) {
-        this.$message.warning('已存在此标签，请选择');
-        return;
-      }
-      // 首先检查是否与已选择的标签重复
-      const isDuplicate = this.selectedTags.some(tag => tag.tagName === tagName);
-      if (isDuplicate) {
-        this.$message.warning('该标签已存在，无需重复创建');
-        return;
-      }
-      // 标签格式验证：仅支持中文、英文、数字、下划线、中横线
-      const tagPattern = /^[\u4e00-\u9fa5a-zA-Z0-9_-]+$/;
-      if (!tagPattern.test(tagName)) {
-        this.$message.error('标签名称仅支持中文、英文、数字、下划线(_)和中横线(-)，不支持空格、点和特殊字符');
-        return;
-      }
-      // 添加标签数量限制检查
-      if (this.selectedTags.length >= this.maxTags) {
-        this.$message.warning('最多只能添加5个标签')
-        return;
-      }
-      this.loading = true
-      try {
-        this.params.courseId = this.courseId;
-        this.params.tagName = tagName;
-        // 分类
-        if (this.sysTypeList.length > 0) {
-          this.params.sysType1 = this.sysTypeList[0]; //一级的id
-        }
-        if (this.sysTypeList.length > 1) {
-          this.params.sysType2 = this.sysTypeList[1]; //二级的id
-        }
-        if (this.sysTypeList.length > 2) {
-          this.params.sysType3 = this.sysTypeList[2]; //三级的id
-        }
-        const {result:newTag} = await apiCourseTag.createTag(this.params)
-        this.$message.success('标签创建成功',newTag);
-
-        this.selectedTags = [...this.selectedTags, newTag];
-        // 更新搜索结果的逻辑保持不变
-        this.searchResults = [newTag, ...this.searchResults];
-        this.tagMap.set(newTag.id, newTag)
-        this.$emit('change', this.displayTags)
-
-        this.$nextTick(() => {
-          // 强制重新设置selectedTags来触发更新
-          const tempTags = [...this.selectedTags];
-          this.selectedTags = [];
-          this.$nextTick(() => {
-            this.selectedTags = tempTags;
-          });
-          this.$refs.tagSelect.visible = false;
-        });
-      } finally {
-        this.loading = false
-      }
-    },
-    // 修改doSearch方法，添加搜索结果为空时的提示
-    async doSearch(query) {
-      // 不再在空查询时清空搜索结果
-      // if (!query.trim()) {
-      //   this.searchResults = []
-      //   return
-      // }
-      console.log("---- doSearch ------ query = " + query )
-      this.loading = true
-      try {
-        // 获取 typeId：取 sysTypeList 最后一个有效的值
-        const typeId =  this.sysTypeList.length > 2 ? this.sysTypeList[2] :
-          this.sysTypeList.length > 1 ? this.sysTypeList[1] :
-            this.sysTypeList.length > 0 ? this.sysTypeList[0] : null;
-        console.log("---- doSearch searchTags ------ query = " + query + " , typeId = " + typeId )
-        const {result:tags} = await apiCourseTag.searchTags({tagName:query,typeId:typeId})
-        console.log("-- searchTags 查询结果 tags = " + tags )
-
-        tags.forEach(item => {
-          this.tagMap.set(item.id, item)
-        })
-        this.searchResults = tags
-        // 当搜索结果为空时，提示用户可以按回车键创建标签
-        if (tags.length === 0) {
-          // this.$message.info('无此标签，按回车键创建')
-        }
-      } finally {
-        this.loading = false
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-.tag-container {
-  position: relative;
-}
-.tag-preview {
-  margin-top: 8px;
-}
-.el-tag {
-  margin-right: 6px;
-  margin-bottom: 6px;
-}
-
-/* 添加标签计数样式 */
-.tag-count {
-  position: absolute;
-  right: 10px;
-  top: 47%;
-  transform: translateY(-40%);
-  font-size: 12px;
-  color: #999;
-  background: white;
-  padding: 0 5px;
-  pointer-events: none;
-  /* 添加高度限制 */
-  height: 25px;
-  line-height: 25px; /* 垂直居中文字 */
-  box-sizing: border-box; /* 确保padding包含在height内 */
-}
-
-
-
-::v-deep(.el-select__tags) {
-  display: flex;
-  flex-wrap: wrap;
-  align-items: center;
-}
-/*
-::v-deep(.el-tag) {
-  flex: 0 0 calc(50% - 8px);
-  max-width: calc(50% - 8px);
-  box-sizing: border-box;
-  margin-right: 8px;
-  margin-bottom: 4px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}*/
-
-::v-deep(.el-tag) {
-  flex: 1 1 auto; /* 自动调整宽度 */
-  min-width: 30%; /* 设置最小宽度 */
-  max-width: 48%; /* 设置最大宽度，留出边距 */
-  box-sizing: border-box;
-  margin-right: 8px;
-  margin-bottom: 4px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  justify-content: center;
-  text-align: center;
-}
-
-::v-deep(.el-select__input) {
-  flex: 1;
-  min-width: 60px;
-}
-</style>

src/components/Course/exam.vue

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

src/components/Course/homework.vue

@@ -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!='' && res.result.deadTime != null){
-               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/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/FileUpload/index.vue

@@ -217,16 +217,13 @@ export default {
         if(delIdx>-1){
           fileList.splice(delIdx,1);
         }
-        this.$emit("success", res);
       } else {
         this.isLoading = false;
-        if(this.limit == 1){
-          this.fileList = [];
-        }
+        //this.fileList = [];
         this.$message({message:"上传失败",type:'error',offset:100});
       }
 
-      // this.$emit("success", res);
+      this.$emit("success", res);
     },
     // 删除文件
     handleDelete(index) {

src/components/HomePage/caseList.vue

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

src/components/Portal/authorInfo.vue

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

src/components/Portal/comments.vue

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

src/components/Portal/interactBar.vue

@@ -10,8 +10,7 @@
         <el-tooltip  effect="light" :content="type == 4 || type == 5 ?'回答':'回复'" placement="left" :visible-arrow="false" popper-class="text-tooltip">
           <!-- <svg-icon style="margin-right: 0;"  icon-class="comment"></svg-icon> -->
          <!-- <img style="width:16px;height:14px;vertical-align: middle;" :src="require('@/assets/images/icon/answers.png')"> -->
-         <!-- <svg-icon style="margin-right: 0;font-size: 14px;" icon-class="comment"></svg-icon> -->
-         <div class="is_comment"></div>
+         <svg-icon style="margin-right: 0;font-size: 14px;" icon-class="comment"></svg-icon>
         </el-tooltip>
         <span class="interact-bar-value"> {{ data.answers? data.answers:0}}</span>
       </div>
@@ -24,16 +23,14 @@
       </div>
       <div v-if="comments" class="interact-bar-btn" :style="`min-width: ${nodeWidth};`" :class="{cursor:!readonly}">
         <el-tooltip  effect="light" content="评论" placement="left" :visible-arrow="false" popper-class="text-tooltip">
-          <!-- <svg-icon style="margin-right: 0;font-size: 14px;" icon-class="comment"></svg-icon> -->
-           <div class="is_comment"></div>
+          <svg-icon style="margin-right: 0;font-size: 14px;" icon-class="comment"></svg-icon>
         </el-tooltip>
         <span class="interact-bar-value"> {{data.comments? data.comments:0}}</span>
       </div>
 
       <div v-if="praises" @click="addPraise()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
         <el-tooltip effect="light" content="点赞" placement="top" :visible-arrow="false" popper-class="text-tooltip">
-          <!-- <svg-icon style="margin-right: 0;font-size: 14px;" :icon-class="isPraise?'praised':'like'"></svg-icon> -->
-           <div class="is_praise" :class="isPraise?'is_praise_a':'is_praise'"></div>
+          <svg-icon style="margin-right: 0;font-size: 14px;" :icon-class="isPraise?'praised':'like'"></svg-icon>
         </el-tooltip>
         <span class="interact-bar-value"> {{ data.praises? data.praises:0}}</span>
       </div>
@@ -41,22 +38,19 @@
       <div v-if="favorites"  @click.stop="addFavorite()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
         <el-tooltip effect="light" content="收藏" placement="top" :visible-arrow="false" popper-class="text-tooltip">
           <svg-icon v-if="courseExclusive" style="font-size: 32px;margin-right: 0;" :icon-class="isFavorite?'collectedCourse':'collectionCourse'"></svg-icon>
-          <!-- <svg-icon v-else style="margin-right: 0;" :style="{'font-size':(size+2)+'px'}" :icon-class="isFavorite?'scactive2':'xihuan'"></svg-icon> -->
-           <div v-else class="is_favorite" :class="isFavorite?'is_favorite_a':'is_favorite'"></div>
+          <svg-icon v-else style="margin-right: 0;" :style="{'font-size':(size+2)+'px'}" :icon-class="isFavorite?'scactive2':'xihuan'"></svg-icon>
         </el-tooltip>
-        <span v-if="!courseExclusive" class="interact-bar-value"> {{ data.favorites? data.favorites:data.hasCollect?number(data.hasCollect):1}}</span>
+        <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>
@@ -114,8 +108,6 @@ export default {
             shares:0,
             praises:0,
             views:0,
-             courseId:'',
-            courseName:''
           }
       }
     },
@@ -236,7 +228,7 @@ export default {
   created(){
   },
   mounted() {
-    if(this.data && (this.data.id||this.data.courseId) && !this.readonly){
+    if(this.data && this.data.id && !this.readonly){
        this.checkHas();
     }
 
@@ -310,7 +302,7 @@ export default {
         }
       let msgPageParams=this.pageParams;
       if(!msgPageParams){
-        msgPageParams=this.data.id ?this.data.id: this.data.courseId;
+        msgPageParams=this.data.id;
       }
       let message={
         content,
@@ -333,9 +325,9 @@ export default {
       })
     },
     checkHas(){
-      if(this.type>0 && !this.readonly && (this.data.id||this.data.courseId)){
+      if(this.type>0 && !this.readonly && this.data.id){
         if(this.favorites){
-          apiFavorites.has(this.type,(this.data.id || this.data.courseId)).then(rs=>{
+          apiFavorites.has(this.type,this.data.id).then(rs=>{
             if(rs.status==200 && rs.result){
               this.isFavorite=true;
             }else{
@@ -508,11 +500,9 @@ export default {
         return;
        }
       //需要判断是否已点赞，已点赞的不再加
-      console.log(this.data,'---------------');
-      
       let postData={
         objType:this.type,
-        objId:this.data.id ?this.data.id: this.data.courseId,
+        objId:this.data.id,
         title:'',
       }
       if(this.loading) {
@@ -520,7 +510,7 @@ export default {
         }
         this.loading=true;
       if(this.type==1){
-        postData.title=this.data.name?this.data.name:this.data.courseName;
+        postData.title=this.data.name;
       }else if(this.type==60){
         postData.title=this.data.content;
       } else if(this.type==5){
@@ -529,7 +519,7 @@ export default {
         postData.title=this.data.title;
       }
       if(this.isFavorite) {// 已经收藏，再次点击取消收藏
-        apiFavorites.remove(this.type,this.data.id ?this.data.id: this.data.courseId).then(res=>{
+        apiFavorites.remove(this.type,this.data.id).then(res=>{
           this.loading=false;
         if(res.status==200){
           this.isFavorite=false;
@@ -540,7 +530,6 @@ export default {
             this.$store.dispatch("unicomFavorites",false)
           }
           this.$message({message:'已取消收藏',type:'success'});
-          this.$emit('deleteFavorite',true)
           //this.$emit('addFavorite',res.result);//添加收藏,如果是true代表添加成功，false代表已存在
         }else{
           console.log('取消收藏失败：'+res.message);
@@ -558,7 +547,7 @@ export default {
             this.$store.dispatch("unicomFavorites",true)
           }
           //if(this.type===2||this.type===4){
-            this.messageSave(this.data.id ?this.data.id: this.data.courseId,this.data.title,this.userInfo.name,this.data.sysCreateBy,this.data.sysCreateAid,'收藏了我发布的');
+            this.messageSave(this.data.id,this.data.title,this.userInfo.name,this.data.sysCreateBy,this.data.sysCreateAid,'收藏了我发布的');
           //}
           this.$message({message:'已加入收藏',type:'success'});
           //this.$emit('addFavorite',res.result);//添加收藏,如果是true代表添加成功，false代表已存在
@@ -724,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/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/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');

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.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 =
@@ -364,11 +348,6 @@ export default {
       }
       // 根据视频的readyState判断下一帧是否已加载，并控制loading的显示
       this.isShowLoading = this.videoDom.readyState < 3;
-      console.log("当前缓存:"+this.videoDom.readyState)
-      if (this.videoDom.readyState < 3){
-        console.log("详细信息",this.videoDom)
-        console.log("卡了",this.videoDom.readyState)
-      }
       //if()
       //console.log(this.videoDom.readyState,'this.videoDom.readyState');
     }, 1000);
@@ -377,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
       this.$emit('onPlayerPause', {})
     },
     //当音频/视频在已因缓冲而暂停或停止后已就绪时
     onPlaying(){
       console.log('触发缓存结束onPlaying');
-      this.isShowLoading = false
       if(this.videoDom.paused){
         this.$emit('onPlayerPause', {})
       }else{
@@ -511,14 +460,6 @@ export default {
     updateProgressBySetTime(newCurrentTime) {
       this.currentProgress = newCurrentTime / this.videoDom.duration;
     },
-    /* 点击进度条更新视频播放进度2
-    */
-    updateProgressByClickBar2(newCurrentTime,progressVideo) {
-      this.currentProgress = progressVideo;
-      this.barrageTimelineStart = newCurrentTime;
-      this.videoDom.currentTime = newCurrentTime;
-      this.updateProgressText();
-    },
     /* 提高视频音量
      */
     increaseVolume() {
@@ -569,7 +510,6 @@ export default {
     /* 切换“全屏”和“非全屏”模式
      */
     toggleFullScreen() {
-      console.log("toggleFullScreen 执行 ",this.isFullScreen())
       let element = this.$refs.area;
       if (!this.isFullScreen()) {
         if (element.requestFullscreen) {
@@ -626,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/progress-bar.vue

@@ -37,9 +37,7 @@ export default {
     },
     isDrag:{
       type: Boolean,
-    },
-    blobId:{
-      type: String,
+      default: true,
     }
   },
   data() {
@@ -59,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() {
@@ -72,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左上角）
@@ -80,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);
       }
     },
   },
@@ -175,4 +151,4 @@ export default {
 .progress-bar:hover .progress-current::after {
   opacity: 1;
 }
-</style>
+</style>

src/components/processStatus.vue

@@ -1,4 +1,4 @@
-<script>
+<script setup>
 import {getCertificationProcess} from "@/api/modules/lecturer";
 
 export default {