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"

src/App.vue

@@ -1,57 +1,17 @@
 <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'])
-    },
-    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);
-        }
-      }
+      ...mapGetters(['userInfo'])
     },
   mounted() {
       //从状态值中取,因为登录处理，所以移动watch中
@@ -59,16 +19,7 @@
       // 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);
 }
-
-#app {
-  pointer-events: none;
-}
-
-#app > *:not(.case-expert-dialog) {
-  pointer-events: auto;
-}
-
-.case-expert-dialog {
-  pointer-events: auto;
-}
 </style>
+

src/api/ajax.js

@@ -19,57 +19,52 @@ 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({
+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 => {
+  })
+  //发送json对象的拦截器
+  formRequest.interceptors.request.use(config => {
     //是否需要设置 token
     const isToken = (config.headers || {}).isToken === false
     if (getToken() && !isToken) {
        config.headers[TokenName] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
     }
     return config
-}, error => {
+  }, error => {
       console.log(error)
       Promise.reject(error)
-});
-formRequest.interceptors.response.use(res => {
+  });
+  formRequest.interceptors.response.use(res => {
       const code = res.data.status || 200;
-   if (code === 200) {
+       if(code===200){
            return res.data
-   } else {
-      if (code === 401) {
+       }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;
+                 location.href = this.webBaseUrl + ReLoginUrl;
               })
-      } else if (code === 403) {
-         var msg = '当前操作没有权限';
-         Message({ message: msg, type: 'error' });
+           }else if(code===403){
+              var msg='当前操作没有权限';
+              Message({message: msg, type: 'error'});
               return Promise.reject(new Error(msg))
-      } else {
+           }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;
@@ -89,22 +84,22 @@ formRequest.interceptors.response.use(res => {
       })
       return Promise.reject(error)
     }
-)
+  )
 
 /**
  * request请求,可以自定义参数
  */
-const request = formRequest.request;
+const request=formRequest.request;
 
 /**
  * get请求 ,只有url
  */
-const get = function (baseURL, url) {
+const get = function(baseURL,url){
 	return request({
         baseURL,
 		url: url,
 		method: 'get',
-      headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
+        headers:{'Content-Type':'application/x-www-form-urlencoded'}
 	})
 }
 
@@ -113,60 +108,60 @@ 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' }
+	data:postData,
+	headers:{'Content-Type':'application/x-www-form-urlencoded'}
    })
 }
 //post请求
-const postForm = function (baseURL, url, data) {
+const postForm=function(baseURL,url,data){
     return request({
         baseURL,
         url,
         data,
         method: 'post',
-      headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
+        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' },
+	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' },
+    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' },
+    data:postData,
+    headers:{'Content-Type':'application/json;charset=utf-8'},
     responseType: 'blob'
    })
 }
@@ -175,33 +170,33 @@ 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' }
+   	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' },
+   	data:data,
+       headers:{'Content-Type':'application/json;charset=utf-8'},
    })
 }
 
 
 
 export default {
-   tokenName: TokenName,
+    tokenName:TokenName,
     request,
     get,
     post,

src/api/boe/aiChat.js

@@ -1,36 +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')
-}
-export function likeMsg(data) {
-  return ajax.postJson('/xboe/m/boe/case/ai/likeMsg',data)
-}
-export function msgFeedback(data) {
-  return ajax.postJson('/xboe/m/boe/case/ai/msgFeedback',data)
-}

src/api/boe/boeAjax.js

@@ -19,61 +19,56 @@ 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({
+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 => {
+  })
+  //发送json对象的拦截器
+  formRequest.interceptors.request.use(config => {
     //是否需要设置 token
     const isToken = (config.headers || {}).isToken === false
-   let curToken = getToken();
+    let curToken=getToken();
     //curToken='eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NzIzMTE2MTIsImV4cCI6MTY3MjMxODgxMiwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.a4f41376e994c5fcd3ab537ce17572ef4c633863f87785cf7b6ffa353e2ed51c';
     if (curToken && !isToken) {
        config.headers[TokenName] = curToken // 让每个请求携带自定义token 请根据实际情况自行修改
     }
     return config
-}, error => {
+  }, error => {
       console.log(error)
       Promise.reject(error)
-});
-formRequest.interceptors.response.use(res => {
+  });
+  formRequest.interceptors.response.use(res => {
       //console.log(res);
       const code = res.data.status || 200;
-   if (code === 200) {
+       if(code===200){
            return res.data
-   } else {
-      if (code === 401) {
+       }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;
+                    location.href = this.webBaseUrl + ReLoginUrl;
                  })
-      } else if (code === 403) {
-         var msg = '当前操作没有权限';
-         Message({ message: msg, type: 'error' });
+           }else if(code===403){
+              var msg='当前操作没有权限';
+              Message({message: msg, type: 'error'});
               return Promise.reject(new Error(msg))
-      } else {
+           }else{
               //Message({message: res.data.message, type: 'error'});
               //console.log('err' + res.data.error);
               return res.data
            }
        }
-},
+    },
     error => {
-      console.log('err', error)
+      console.log('err',error)
       let { message } = error;
       if (message == "Network Error") {
         message = "网络异常，请稍后重试";
@@ -91,22 +86,22 @@ formRequest.interceptors.response.use(res => {
       })
       return Promise.reject(error)
     }
-)
+  )
 
 /**
  * request请求,可以自定义参数
  */
-const request = formRequest.request;
+const request=formRequest.request;
 
 /**
  * get请求 ,只有url
  */
-const get = function (baseURL, url) {
+const get = function(baseURL,url){
 	return request({
         baseURL,
 		url: url,
 		method: 'get',
-      headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
+        headers:{'Content-Type':'application/x-www-form-urlencoded'}
 	})
 }
 
@@ -115,48 +110,48 @@ 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' }
+	data:postData,
+	headers:{'Content-Type':'application/x-www-form-urlencoded'}
    })
 }
 //post请求
-const postForm = function (baseURL, url, data) {
+const postForm=function(baseURL,url,data){
     return request({
         baseURL,
         url,
         data,
         method: 'post',
-      headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
+        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' },
+	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' },
+	data:postData,
+    headers:{'Content-Type':'application/json;charset=utf-8'},
     responseType: 'blob'
    })
 }
@@ -165,33 +160,33 @@ 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' }
+   	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' },
+   	data:data,
+       headers:{'Content-Type':'application/json;charset=utf-8'},
    })
 }
 
 
 
 export default {
-   tokenName: TokenName,
+    tokenName:TokenName,
     request,
     get,
     post,

src/api/boe/boeApiAjax.js

@@ -18,13 +18,13 @@ 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' },
+const jsonRequest=axios.create({
+  headers:{'Content-Type':'application/json;charset=utf-8'},
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BOE_BASE_API,
   //超时
@@ -47,32 +47,27 @@ jsonRequest.interceptors.request.use(config => {
 jsonRequest.interceptors.response.use(res => {
 
     const code1 = res.data.status || 200;
-   const code = parseInt(code1);
-   if (code === 200) {
+    const code=parseInt(code1);
+     if(code===200){
          return res.data
-   } else {
-      if (code == 6001) { //对方是字符串，所以这里不要使用三个等号
+     }else{
+         if(code == 6001){ //对方是字符串，所以这里不要使用三个等号
                store.dispatch('LogOut').then(() => {
-            if (top !== window) { // 判断当前是否在iframe内
-               top.location.href = ReLoginUrl;
-            } else {
-               window.location.href = ReLoginUrl;
-            }
-            // location.href = ReLoginUrl;
+                  location.href = ReLoginUrl;
                })
-      } else if (code === 403) {
-         var msg = '当前操作没有权限';
-         Message({ message: msg, type: 'error' });
+         }else if(code===403){
+            var msg='当前操作没有权限';
+            Message({message: msg, type: 'error'});
             return Promise.reject(new Error(msg))
             //return res.data;
-      } else {
+         }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;
@@ -96,8 +91,8 @@ jsonRequest.interceptors.response.use(res => {
 )
 
 //用于普通的发送请求
-const formRequest = axios.create({
-   headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+const formRequest=axios.create({
+  headers:{'Content-Type':'application/x-www-form-urlencoded'},
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BOE_BASE_API,
   //超时
@@ -117,30 +112,25 @@ formRequest.interceptors.request.use(config => {
 });
 formRequest.interceptors.response.use(res => {
     const code = res.data.status || 200;
-   if (code === 200) {
+     if(code===200){
          return res.data
-   } else {
-      if (code == 6001) { //对方是字符串，所以这里不要使用三个等号
+     }else{
+         if(code == 6001){ //对方是字符串，所以这里不要使用三个等号
                store.dispatch('LogOut').then(() => {
-            if (top !== window) { // 判断当前是否在iframe内
-               top.location.href = ReLoginUrl;
-            } else {
-               window.location.href = ReLoginUrl;
-            }
-            // location.href = ReLoginUrl;
+                  location.href = ReLoginUrl;
                })
-      } else if (code === 403) {
-         var msg = '当前操作没有权限';
-         Message({ message: msg, type: 'error' });
+         }else if(code===403){
+            var msg='当前操作没有权限';
+            Message({message: msg, type: 'error'});
             return Promise.reject(new Error(msg))
-      } else {
+         }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;
@@ -164,44 +154,44 @@ formRequest.interceptors.response.use(res => {
 )
 
 //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 {

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

@@ -17,12 +17,12 @@ 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' },
+const jsonRequest=axios.create({
+  headers:{'Content-Type':'application/json;charset=utf-8'},
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_CESOURCE_BASE_API,
   //超时
@@ -45,30 +45,25 @@ jsonRequest.interceptors.request.use(config => {
 jsonRequest.interceptors.response.use(res => {
 
     const code = res.data.status || 200;
-   if (code === 200) {
+     if(code===200){
          return res.data
-   } else {
-      if (code === 401) {
+     }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;
+                  location.href = this.webBaseUrl + ReLoginUrl;
                })
-      } else if (code === 403) {
-         var msg = '当前操作没有权限';
-         Message({ message: msg, type: 'error' });
+         }else if(code===403){
+            var msg='当前操作没有权限';
+            Message({message: msg, type: 'error'});
             return Promise.reject(new Error(msg))
-      } else {
+         }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;
@@ -91,8 +86,8 @@ jsonRequest.interceptors.response.use(res => {
 )
 
 //用于普通的发送请求
-const formRequest = axios.create({
-   headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+const formRequest=axios.create({
+  headers:{'Content-Type':'application/x-www-form-urlencoded'},
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_CESOURCE_BASE_API,
   //超时
@@ -112,29 +107,24 @@ formRequest.interceptors.request.use(config => {
 });
 formRequest.interceptors.response.use(res => {
     const code = res.data.status || 200;
-   if (code === 200) {
+     if(code===200){
          return res.data
-   } else {
-      if (code === 401) {
+     }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;
+                  location.href = this.webBaseUrl + ReLoginUrl;
                })
-      } else if (code === 403) {
-         var msg = '当前操作没有权限';
-         Message({ message: msg, type: 'error' });
+         }else if(code===403){
+            var msg='当前操作没有权限';
+            Message({message: msg, type: 'error'});
             return Promise.reject(new Error(msg))
-      } else {
+         }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;
@@ -157,44 +147,44 @@ formRequest.interceptors.response.use(res => {
 )
 
 //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 {

src/api/event/index.js

@@ -17,12 +17,12 @@ 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' },
+const jsonRequest=axios.create({
+  headers:{'Content-Type':'application/json;charset=utf-8'},
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_STAT_BASE_API,
   //超时
@@ -45,30 +45,25 @@ jsonRequest.interceptors.request.use(config => {
 jsonRequest.interceptors.response.use(res => {
 
     const code = res.data.status || 200;
-   if (code === 200) {
+     if(code===200){
          return res.data
-   } else {
-      if (code === 401) {
+     }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;
+                  location.href = this.webBaseUrl + ReLoginUrl;
                })
-      } else if (code === 403) {
-         var msg = '当前操作没有权限';
-         Message({ message: msg, type: 'error' });
+         }else if(code===403){
+            var msg='当前操作没有权限';
+            Message({message: msg, type: 'error'});
             return Promise.reject(new Error(msg))
-      } else {
+         }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;
@@ -91,8 +86,8 @@ jsonRequest.interceptors.response.use(res => {
 )
 
 //用于普通的发送请求
-const formRequest = axios.create({
-   headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+const formRequest=axios.create({
+  headers:{'Content-Type':'application/x-www-form-urlencoded'},
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_STAT_BASE_API,
   //超时
@@ -112,29 +107,24 @@ formRequest.interceptors.request.use(config => {
 });
 formRequest.interceptors.response.use(res => {
     const code = res.data.status || 200;
-   if (code === 200) {
+     if(code===200){
          return res.data
-   } else {
-      if (code === 401) {
+     }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;
+                  location.href = this.webBaseUrl + ReLoginUrl;
                })
-      } else if (code === 403) {
-         var msg = '当前操作没有权限';
-         Message({ message: msg, type: 'error' });
+         }else if(code===403){
+            var msg='当前操作没有权限';
+            Message({message: msg, type: 'error'});
             return Promise.reject(new Error(msg))
-      } else {
+         }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;
@@ -157,44 +147,44 @@ formRequest.interceptors.response.use(res => {
 )
 
 //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 {

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

@@ -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
@@ -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

@@ -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);
 }
 
 /**

src/api/modules/courseStudy.js

@@ -114,10 +114,6 @@ 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);
-}
-
 /**
  * 获取上一次的学习内容
  * @returns
@@ -342,7 +338,7 @@ const myExamList = function(itemId) {
    contentId:''
  }
  */
-const myExamList2 = function(data) {
+ const myExamList2 = function(data) {
     return ajax.post('/xboe/school/study/exam/list-study',data);
 }
 
@@ -393,10 +389,7 @@ 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);
@@ -412,7 +405,6 @@ export default {
     studyIndex,
     studyInfo,
     studyVideoTime,
-  updateStudyVideoTime,
     lastStudy,
     studyContent,
     appendStudyTime,
@@ -433,7 +425,6 @@ export default {
     myExamList2,
 	myCourseStudy,
   myStudysFromES,
-  homeworkExport,
   findByIds,
 	deleteSignUp,
   ids,

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);
 }
@@ -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/assets/images/case/cai-yes.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1765161872024" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2317" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M256 504.021333c0 39.765333-32.213333 71.978667-72.021333 71.978667H136.021333A71.936 71.936 0 0 1 64 503.978667V136.021333c0-39.808 32.213333-72.021333 72.021333-72.021333h47.957334C223.786667 64 256 96.213333 256 136.021333v367.957334z m701.184 45.866667c-6.698667 26.112-21.077333 46.592-46.976 55.722667a131.925333 131.925333 0 0 1-41.813333 6.570666c-75.306667 0.597333-150.613333 0.213333-225.877334 0.213334-9.728 0-10.026667 0.597333-8.533333 9.898666 4.693333 27.52 8.618667 55.125333 14.037333 82.389334 7.253333 37.034667 8.192 73.813333-4.138666 109.696-11.093333 32.341333-23.68 64.213333-35.797334 96.213333-6.784 18.090667-18.176 31.317333-36.48 38.912-34.517333 14.506667-68.608 14.208-101.717333-2.986667-21.077333-11.093333-33.493333-28.714667-32.768-53.802666 0.981333-35.413333 1.194667-70.826667 2.688-106.24a58.026667 58.026667 0 0 0-7.808-32.554667c-27.306667-46.933333-47.104-83.413333-75.605333-129.621333-5.290667-8.533333-21.376-24.789333-28.288-32.085334-20.394667-21.504-30.890667-35.498667-31.018667-59.093333-0.085333-85.930667-0.298667-275.029333-0.682667-396.8a71.936 71.936 0 0 1 72.106667-72.234667c105.173333 0.128 296.277333 0.298667 389.973333 0.298667 22.4 0 44.416 1.408 66.005334 8.405333 42.794667 13.994667 69.717333 47.189333 73.088 91.989334 1.322667 17.024 0.512 33.92-5.546667 50.346666-0.938667 2.261333 0.554667 6.272 2.261333 8.576 16.896 22.613333 27.008 47.616 25.173334 76.117334-0.554667 9.813333-3.669333 19.584-6.656 29.098666-1.621333 5.12-1.621333 8.490667 1.877333 12.8 16.128 20.181333 25.898667 43.178667 25.130667 69.162667-0.426667 12.330667-4.906667 24.405333-7.253334 36.608-0.554667 2.901333-0.981333 7.210667 0.64 9.002667 13.781333 15.402667 21.504 33.621333 25.514667 53.717333a5.546667 5.546667 0 0 0 1.365333 2.005333v28.288a258.005333 258.005333 0 0 0-2.901333 9.386667z" fill="#000000" opacity=".65" p-id="2318"></path></svg>

src/assets/images/case/cai.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1765161849864" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5624" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M960 543.573333v-43.946666l-3.882667-5.12a138.24 138.24 0 0 0-19.712-44.586667c2.816-9.6 4.394667-19.541333 4.906667-29.610667 0.768-26.794667-6.912-52.48-23.125333-76.629333 2.304-7.893333 3.84-16.085333 4.394666-24.32 1.834667-28.672-5.802667-56.576-22.698666-83.072 3.2-15.104 4.010667-30.592 2.602666-45.909333-4.181333-55.466667-38.784-99.2-92.373333-116.778667-25.728-8.405333-50.773333-9.813333-72.021333-9.813333h-93.866667c-33.237333 0-66.944 0.213333-100.693333 0.213333-53.034667 0-106.325333-0.213333-159.232-0.213333h-1.109334 0.128-247.296c-39.808 0-72.021333 32.213333-72.021333 72.021333v368c0 39.808 32.213333 71.978667 72.021333 71.978667H249.173333s55.893333 6.4 82.346667 48.512c18.346667 29.312 36.053333 60.202667 53.12 90.026666l22.016 38.058667c1.792 2.986667 2.602667 6.4 2.218667 9.898667-0.896 20.736-1.28 41.6-1.706667 61.696-0.213333 11.946667-0.512 24.234667-0.810667 36.224-0.981333 36.181333 16.810667 65.706667 49.92 83.114666a140.8 140.8 0 0 0 65.792 16.469334c19.498667 0 39.253333-4.096 58.88-12.288 25.514667-10.666667 43.52-29.781333 53.717334-56.789334l8.96-23.594666c8.234667-21.333333 16.64-43.434667 24.234666-65.621334 12.288-35.712 13.909333-74.88 5.12-119.808-2.602667-13.397333-4.906667-26.794667-7.125333-40.789333h21.589333l64.128 0.085333c29.184 0 58.666667 0 87.893334-0.170666h0.810666c16.768 0 33.493333-2.730667 49.493334-8.106667 23.594667-8.405333 54.272-28.416 66.56-76.714667l1.237333-4.010666 0.853333-2.986667 1.536-5.376z m-712.021333-39.594666H136.021333V135.978667h112.042667v368z m640 28.8c0 1.536-0.981333 3.541333-1.578667 5.632-4.608 18.090667-12.501333 23.466667-20.394667 26.368-8.405333 2.816-17.066667 4.224-25.898666 4.224h-0.426667l-0.469333-0.085334-0.512-0.128c-31.018667 0.213333-61.482667 0.298667-87.296 0.298667h-32.298667l-31.786667-0.085333h-106.24l13.653334 83.626666c2.56 15.872 4.864 29.354667 7.552 43.093334 6.314667 32.170667 5.546667 59.093333-2.474667 82.474666-6.997333 20.181333-14.421333 39.808-23.424 63.317334-3.072 7.978667-6.101333 16.085333-9.088 23.978666-3.584 9.6-8.106667 13.098667-14.08 15.701334-10.709333 4.522667-21.12 6.698667-31.146667 6.698666-11.093333 0-21.674667-2.688-32.384-8.277333a24.661333 24.661333 0 0 1-9.386666-7.68c-0.512-0.853333-2.133333-3.413333-1.92-9.642667 0.341333-11.52 0.64-22.997333 0.853333-36.778666v-1.706667c0.384-18.773333 0.768-38.314667 1.450667-57.173333a86.954667 86.954667 0 0 0-11.904-50.346667c-2.56-4.394667-5.077333-8.874667-7.68-13.269333-4.608-8.021333-9.386667-16.213333-13.909334-24.234667l-0.085333-0.085333-0.085333-0.085334-0.725334-1.109333c-17.194667-29.994667-34.986667-61.013333-53.674666-91.008l-0.128-0.213333-0.085334-0.170667c-16.64-26.325333-41.088-47.701333-71.509333-62.421333l-0.597333-387.712h63.914666c55.68 0 111.872 0.341333 159.402667 0.341333 16.981333 0 33.962667-0.128 50.773333-0.128 16.725333 0 33.28-0.213333 49.92-0.213333h93.866667c16.213333 0 33.536 0.938667 49.706667 6.229333 13.013333 4.181333 23.296 11.306667 30.634666 20.48 7.168 9.130667 11.264 20.224 12.288 33.28v0.64l0.085334 0.597333c0.810667 8.192 0.298667 16.298667-1.408 24.32l-0.768 3.413334h-8.704 8.704l-5.333334 25.173333 15.786667 25.002667c8.533333 13.397333 12.330667 26.282667 11.648 39.381333-0.213333 2.986667-0.853333 5.973333-1.621333 8.917333l-9.514667 32.298667 18.816 27.989333c7.594667 11.306667 11.093333 22.016 10.922667 33.493334-0.298667 4.266667-1.024 8.618667-2.218667 12.714666l-9.301333 32.426667 18.901333 27.861333c4.394667 6.4 7.509333 13.482667 9.301333 21.12l1.877334 7.765334v13.696z" fill="#000000" opacity=".65" p-id="5625"></path></svg>

src/assets/images/case/zan-yes.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1765161882076" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2499" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M184.021333 448H136.021333c-39.808 0-72.021333 32.213333-72.021333 72.021333v367.957334c0 39.808 32.213333 72.021333 72.021333 72.021333h47.957334C223.786667 960 256 927.786667 256 887.978667v-368c0-39.765333-32.213333-71.978667-72.021333-71.978667z m773.162667 26.112c-6.698667-26.112-21.077333-46.592-46.976-55.722667a131.925333 131.925333 0 0 0-41.813333-6.570666c-75.306667-0.597333-150.613333-0.213333-225.877334-0.213334-9.728 0-10.026667-0.597333-8.533333-9.898666 4.693333-27.52 8.618667-55.125333 14.037333-82.389334 7.253333-37.034667 8.192-73.813333-4.138666-109.738666-11.093333-32.298667-23.68-64.170667-35.797334-96.170667-6.784-18.090667-18.176-31.317333-36.48-38.912-34.517333-14.506667-68.608-14.208-101.717333 2.986667-21.077333 11.093333-33.493333 28.714667-32.768 53.802666 0.981333 35.413333 1.194667 70.826667 2.688 106.24a58.026667 58.026667 0 0 1-7.808 32.554667c-27.306667 46.933333-47.104 83.413333-75.605333 129.621333-5.290667 8.533333-21.376 24.789333-28.288 32.085334-20.394667 21.504-30.890667 35.498667-31.018667 59.093333-0.085333 85.930667-0.298667 275.029333-0.682667 396.8a71.936 71.936 0 0 0 72.106667 72.234667c105.173333-0.128 296.277333-0.298667 389.973333-0.298667 22.4 0 44.416-1.408 66.005334-8.405333 42.794667-13.994667 69.717333-47.232 73.088-92.032 1.322667-16.981333 0.512-33.877333-5.546667-50.261334-0.938667-2.304 0.554667-6.314667 2.261333-8.618666 16.896-22.613333 27.008-47.616 25.173334-76.117334-0.554667-9.813333-3.669333-19.584-6.656-29.098666-1.621333-5.12-1.621333-8.490667 1.877333-12.8 16.128-20.181333 25.898667-43.178667 25.130667-69.162667-0.426667-12.330667-4.906667-24.405333-7.253334-36.608-0.554667-2.901333-0.981333-7.210667 0.64-9.002667 13.781333-15.402667 21.504-33.621333 25.514667-53.717333a5.546667 5.546667 0 0 1 1.365333-2.005333v-28.288c-0.981333-3.114667-2.005333-6.186667-2.901333-9.386667z" fill="#000000" opacity=".65" p-id="2500"></path></svg>

src/assets/images/case/zan.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1765161839692" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5444" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M958.378667 475.093333l-0.853334-2.986666c-0.512-1.621333-1.024-2.986667-1.237333-4.010667-12.288-48.384-43.008-68.394667-66.56-76.714667a154.666667 154.666667 0 0 0-49.493333-8.106666h-0.853334c-29.184-0.170667-58.581333-0.170667-87.893333-0.170667l-64.085333 0.085333h-21.589334c2.304-13.994667 4.48-27.392 7.082667-40.789333 8.789333-44.885333 7.210667-84.096-5.12-119.808-7.594667-22.186667-16.085333-44.288-24.192-65.578667l-8.96-23.594666c-10.112-27.008-28.245333-46.08-53.76-56.832a141.056 141.056 0 0 0-124.586667 3.882666c-33.066667 17.322667-50.858667 46.848-49.877333 83.114667 0.298667 12.032 0.597333 24.32 0.810667 36.224 0.426667 20.181333 0.768 41.088 1.706666 61.696a16.426667 16.426667 0 0 1-2.218666 9.898667c-7.296 12.714667-14.805333 25.514667-22.016 38.101333-17.066667 29.781333-34.773333 60.714667-53.077334 90.026667C305.066667 441.6 249.173333 448 249.173333 448H135.978667c-39.765333 0-71.978667 32.213333-71.978667 72.021333v367.957334c0 39.808 32.213333 72.021333 71.978667 72.021333h247.338666-0.128 1.109334c52.821333 0 106.24-0.213333 159.189333-0.213333 33.792 0 67.498667 0.213333 100.693333 0.213333H738.133333c21.205333 0 46.293333-1.408 72.021334-9.813333 53.589333-17.493333 88.192-61.184 92.373333-116.778667a157.269333 157.269333 0 0 0-2.56-45.909333c16.896-26.410667 24.490667-54.314667 22.656-83.114667a118.101333 118.101333 0 0 0-4.394667-24.32c16.128-23.978667 23.808-49.664 23.125334-76.544a135.594667 135.594667 0 0 0-4.906667-29.610667c9.216-13.610667 15.914667-28.586667 19.712-44.629333l3.882667-5.12v-43.946667l-1.621334-5.12z m-710.4 412.928H136.021333v-368h112.042667v367.957334z m640-383.232l-1.877334 7.808a64.426667 64.426667 0 0 1-9.301333 21.12l-18.901333 27.861334 9.301333 32.426666c1.194667 4.096 1.92 8.405333 2.218667 12.714667 0.170667 11.52-3.328 22.186667-10.922667 33.493333l-18.773333 27.989334 9.472 32.298666a38.698667 38.698667 0 0 1 1.621333 8.917334c0.682667 13.184-2.986667 26.069333-11.605333 39.381333l-15.786667 25.002667 5.290667 25.173333h-8.704 8.704l0.768 3.413333c1.706667 8.021333 2.218667 16.213333 1.408 24.32l-0.085334 0.597334v0.597333c-1.024 13.013333-5.12 24.192-12.288 33.28a63.018667 63.018667 0 0 1-30.634666 20.48c-16.085333 5.333333-33.365333 6.229333-49.664 6.229333H644.266667c-16.512 0-33.109333-0.213333-49.92-0.213333l-50.773334-0.085333c-47.616 0-103.68 0.298667-159.402666 0.298666H320.298667l0.810666-387.712c30.378667-14.762667 54.869333-36.096 71.509334-62.378666l0.085333-0.213334 0.085333-0.170666c18.730667-30.037333 36.522667-61.013333 53.717334-91.008l0.682666-1.109334 0.128-0.085333 0.085334-0.128c4.48-7.893333 9.301333-16.213333 13.909333-24.192 2.56-4.48 5.205333-8.917333 7.68-13.312 9.002667-15.274667 13.098667-32.682667 11.946667-50.304-0.853333-18.901333-1.237333-38.4-1.536-57.173333v-1.706667c-0.298667-13.696-0.512-25.301333-0.810667-36.821333-0.213333-6.058667 1.408-8.661333 1.92-9.6a23.253333 23.253333 0 0 1 9.386667-7.68c10.666667-5.589333 21.333333-8.32 32.426666-8.32 9.856 0 20.394667 2.304 31.061334 6.741333 5.973333 2.474667 10.496 5.973333 14.08 15.658667 3.029333 7.936 6.144 16 9.130666 24.021333 9.002667 23.466667 16.384 43.093333 23.424 63.317333 7.978667 23.381333 8.874667 50.346667 2.474667 82.474667a1376.853333 1376.853333 0 0 0-7.594667 43.093333l-13.781333 83.712h106.197333c10.496 0 21.077333 0 31.786667-0.085333h32.298667c25.813333 0 56.32 0 87.296 0.298667l0.512-0.128 0.469333-0.085334h0.426667c8.789333 0 17.493333 1.493333 25.898666 4.181334 7.893333 2.901333 15.786667 8.32 20.394667 26.453333 0.512 2.048 1.621333 3.968 1.621333 5.546667v13.653333z" fill="#000000" opacity=".65" p-id="5445"></path></svg>

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">
@@ -167,7 +145,7 @@
   import simplePaper from "@/components/Course/simpleTestPaper.vue";
   import apiCourse from '../../api/modules/course.js';
   import apiExamPaper from '../../api/modules/paper.js';
-  import { deepClone, safeJsonParse } from "../../utils";
+  import { deepClone } from "../../utils";
   export default{
     components:{simplePaper},
     props:{
@@ -253,7 +231,7 @@
                  this.examInfo=res.result;
                  if(res.result.paperType==1){
                    this.examInfo.paperContent=res.result.paperContent;
-                   this.examPaper = safeJsonParse(res.result.paperContent, { items: [] });
+                   this.examPaper=JSON.parse(res.result.paperContent);
                  }else{
                    apiExamPaper.detail(this.examInfo.paperId).then(rs=>{
                      if(rs.status==200){
@@ -307,9 +285,7 @@
              return;
            }
         }
-        if(!this.examInfo.randomMode){
-          this.examInfo.qnum = 0
-        }
+
         this.$emit("save",this.examInfo);
       },
       deleteExam(){ //删除
@@ -318,8 +294,6 @@
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          this.examInfo.randomMode = false;
-          this.examInfo.qnum = 0;
           this.$emit("remove",this.examInfo);
         }).catch(() => {
 

src/components/Course/courseForm.vue

@@ -41,43 +41,6 @@
         <el-button @click="toInputCourse()" type="primary">确定</el-button>
       </span> -->
     </el-dialog>
-
-    <!-- 蒙层引导组件 -->
-    <div v-if="showGuidance" class="guidance-overlay" @click="closeGuidance">
-      <div class="guidance-content">
-        <div class="guidance-title"></div> <!--新功能引导-->
-        <div class="guidance-steps">
-          <div class="guidance-step" :class="{ active: currentStep === 1 }">
-            <div class="step-number"></div>
-            <div class="step-content">
-              <div class="step-title">用标签为课程精准定位，吸引更多学员！可从以下维度构思：</div>
-              <div class="step-desc" style="padding-left: 20px;">✨ 讲领域（如：品质管理）</div>
-              <div class="step-desc" style="padding-left: 20px;">✨ 教技能（如：沟通技巧）</div>
-              <div class="step-desc" style="padding-left: 20px;">✨ 涉内容（如：5W1H分析法）</div>
-            </div>
-          </div>
-          <!--          <div class="guidance-step" :class="{ active: currentStep === 2 }">
-                      <div class="step-number">2</div>
-                      <div class="step-content">
-                        <div class="step-title">添加课程标签</div>
-                        <div class="step-desc">为课程添加相关标签,最多5个，便于搜索和分类,可回车创建新标签</div>
-                      </div>
-                    </div>-->
-        </div>
-        <!--        <div class="guidance-actions">
-                  <el-button @click="previousStep1" v-if="currentStep > 1">上一步</el-button>
-                  <el-button type="primary" @click="nextStep">
-                    {{ currentStep === 2 ? '完成' : '下一步' }}
-                  </el-button>
-                  <el-button @click="closeGuidance">跳过引导</el-button>
-                </div>-->
-      </div>
-    </div>
-
-    <!-- 高亮指引元素 -->
-    <!--    <div v-if="showGuidance" class="highlight-element" :style="highlightStyle"></div>-->
-
-
     <!--微课-->
     <el-dialog v-if="weike.dlgShow" width="980px" :title="curCourseId == '' ? '新建课程' : '编辑课程'" :visible.sync="weike.dlgShow" :close-on-click-modal="false" custom-class="g-dialog" top="8vh">
       <el-form label-width="100px" size="small" class="wei-from" style="min-height: 600px;">
@@ -101,29 +64,15 @@
                 </span>
               </div>
             </el-form-item>
-            <el-form-item label="内容分类" required >
+            <el-form-item label="内容分类" required>
               <el-cascader
                 placeholder="选择内容分类"
                 style="width: 100%;"
                 clearable
                 v-model="sysTypeList"
                 :props="{ value: 'id', label: 'name' }"
-                :options="sysTypeListMap"
-                @focus="onContentTypeFocus"
-                @change="onContentTypeChange">
-              </el-cascader>
+                :options="sysTypeListMap"></el-cascader>
             </el-form-item>
-
-            <el-form-item label="标签" required class="guidance-highlight" data-step="1" style="display: flex" >
-              <courseTag ref="courseTag" :courseId="curCourseId" :sysTypeList="sysTypeList"
-                         :initialTags="courseTags" @change="handleTagsChange"
-                         @focus="onTagFocus" style="width: 95%;">
-              </courseTag>
-              <el-tooltip content="点击查看标签新功能引导" placement="top">
-                <i class="el-icon-question" style="color: #409EFF; cursor: pointer;" @click="handleTagHelp"></i>
-              </el-tooltip>
-            </el-form-item>
-
             <el-form-item label="资源归属" required>
                 <el-input placeholder="请选择" v-model="orgName" >
                     <el-button v-if="identity==3 || identity==5" @click="showChooseOrg()" slot="append" icon="el-icon-search">选择</el-button>
@@ -269,16 +218,14 @@
                 </div>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="内容分类" required >
+                <el-form-item label="内容分类" required>
                   <el-cascader
                     placeholder="选择内容分类"
                     style="width: 100%;"
                     clearable
                     v-model="sysTypeList"
                     :props="{ value: 'id', label: 'name' }"
-                    :options="sysTypeListMap"
-                    @focus="onContentTypeFocus"
-                    @change="onContentTypeChange">
+                    :options="sysTypeListMap">
                   </el-cascader>
                 </el-form-item>
 
@@ -306,16 +253,6 @@
                   </el-select> -->
                   <choice :teacherValue="teacherValues" @getTeacherList="getTeacherList"></choice>
                 </el-form-item>
-                <el-form-item label="标签" required class="tag-from-item" data-step="1" >
-                  <courseTag ref="courseTag" :courseId="curCourseId" :sysTypeList="sysTypeList"
-                             :initialTags="courseTags" @change="handleTagsChange"
-                             @focus="onTagFocus" >
-                  </courseTag>
-                  <el-tooltip content="点击查看标签新功能引导" placement="top">
-                    <i class="el-icon-question" style="color: #409EFF; cursor: pointer;" @click="handleTagHelp"></i>
-                  </el-tooltip>
-                </el-form-item>
-
                 <el-form-item label="关键字">
                   <el-input v-model.trim="keywords" maxlength="100" @keyup.enter.native="changeKeywords"  placeholder="请输入关键字"></el-input>
                       <el-tag v-for="(tag,index) in tips" size="small" :key="index" closable type="info" @close="closeKeywordsTag(tag,index)">
@@ -465,7 +402,6 @@
   </div>
 </template>
 <script>
-import courseTag from "@/components/Course/courseTag.vue";
 import choice from '@/components/Course/choice.vue';
 import agreement from '@/components/Portal/agreement.vue';
 import weikeContent from '@/components/Course/weikeContent.vue';
@@ -482,7 +418,6 @@ import apiCourse from '../../api/modules/course.js';
 import apiCourseAudit from '../../api/modules/courseAudit.js';
 import apiOrg from '../../api/system/organiza.js';
 import apiUser from '../../api/system/user.js';
-import apiCourseTag from '../../api/modules/courseTag.js';
 import WxEditor from '@/components/Editor/index.vue';
 import catalogSort from '@/components/Course/catalogSort.vue';
 import { courseType, getType } from '../../utils/tools.js';
@@ -491,7 +426,7 @@ import filecloud from '@/components/FileCloud/index.vue';
 import chooseOrg from '@/components/System/chooseOrg.vue';
 export default {
   props: {},
-  components: { courseTag, weikeContent, catalogCourseware, imageUpload, WxEditor, catalogSort,agreement,filecloud,choice,chooseOrg},
+  components: { weikeContent, catalogCourseware, imageUpload, WxEditor, catalogSort,agreement,filecloud,choice,chooseOrg},
   data() {
     return {
       keywords:'',//关键字的定义
@@ -531,7 +466,6 @@ export default {
       orgName:'',
       orgNamePath:'',
       orgKid:'',
-      courseTags:[],
       courseInfo: {
         id: '',
         name: '',
@@ -593,13 +527,7 @@ export default {
         dlgShow: false
       },
       rightTypeId: {},
-      catalogSortDialogShow: false,
-      // 蒙层引导相关数据
-      showGuidance: false,
-      currentStep: 1,
-      highlightStyle: {},
-      guidanceElements: [],
-      isFirstCreate: false, // 标记是否为首次创建
+      catalogSortDialogShow: false
     };
   },
   created() {
@@ -653,9 +581,6 @@ export default {
     this.loadUserGroup();
   },
   methods: {
-    handleTagHelp(){
-      this.checkAndShowGuidance();
-    },
     // 关键字的更改
     changeKeywords(option){
       if(option.target.value){
@@ -667,24 +592,6 @@ export default {
     closeKeywordsTag(item,index){
       this.tips.splice(index, 1);
     },
-    // 处理标签变化事件
-    handleTagsChange(tags) {
-      console.log("父组件:",tags)
-      // 限制最多5个标签
-      if (tags.length > 5) {
-        this.$message.warning('最多只能选择5个标签')
-        // 强制限制为5个
-        tags = tags.slice(0, 5);
-        return
-      }
-      let ids = "";
-      tags.forEach(tag=>{
-        console.log("父组件name : ",tag.tagName)
-        ids += tag.id + ',';
-      })
-      this.courseInfo.tags = ids;
-      this.$emit('change', tags.slice(0, 5)); // 确保传出数据也不超过5个
-    },
     showChooseOrg(){
        this.$refs.refChooseOrg.dlgShow = true;
     },
@@ -815,7 +722,6 @@ export default {
       this.$emit('close');
     },
     initShow(editData) {
-      console.log('初始化显示内容============', editData)
       //console.log(this.$refs.weikePanel,'this.$refs.weikePanel');
       //this.$refs.weikePanel.init();
       //this.$refs.onlineCourse.resetData();
@@ -863,8 +769,6 @@ export default {
       this.tips=[];
 
       if (!editData) {
-        this.tips=[];
-        this.courseTags=[],
         //console.log("新建课程？");
         //以下为了保证初始化处理
         this.weikeReset = Math.round(Math.random()) + '';
@@ -915,7 +819,7 @@ export default {
 
     },
     resetCurCourseContent() {
-      this.curContent = { id: '', contentType: 0, contentName: '', content: '', csectionId: '', contentRefId: '', courseId: this.courseInfo.id };
+      this.curContent = { id: '', contentType: 0, contentName: '', content: '', csectionId: '', contentName: '', contentRefId: '', courseId: this.courseInfo.id };
     },
     // chooseCourseType(item, idx, open) {
     //   this.courseChooseId = item.id;
@@ -961,117 +865,16 @@ export default {
         if (rs.status == 200) {
           this.courseChooseShow = false;
           this.courseInfo = rs.result;
-          this.curCourseId = this.courseInfo.id
-          console.log('保存课程成功',this.curCourseId)
-          console.log('isTip ',this.courseInfo.isTip)
-          // if(this.courseInfo.isTip){
-          //   // 检查是否为首次创建，显示引导
-          //   this.checkAndShowGuidance();
-          // }
-
           if (this.courseChooseId == 1) {
             this.weike.dlgShow = true;
           } else {
             this.biaoke.dlgShow = true;
           }
-          // this.$nextTick(() => {
-          //   this.initTagComponent();
-          //   // 如果显示引导，初始化高亮元素
-          //   if (this.showGuidance) {
-          //     this.$nextTick(() => {
-          //       this.initGuidanceElements();
-          //       this.highlightCurrentStep();
-          //     });
-          //   }
-          // });
         } else {
           this.$message.error(rs.message);
         }
       });
     },
-    // 检查并显示引导
-    checkAndShowGuidance() {
-      // 检查本地存储，判断是否为首次创建
-      // const hasShownGuidance = localStorage.getItem('course_creation_guidance_shown');
-      // if (!hasShownGuidance) {
-      this.showGuidance = true;
-      this.currentStep = 1;
-      this.isFirstCreate = true;
-      // 标记引导已显示
-      localStorage.setItem('course_creation_guidance_shown', 'true');
-      // apiCourse.saveTip();
-      // }
-    },
-    // 初始化引导元素
-    initGuidanceElements() {
-      this.guidanceElements = Array.from(document.querySelectorAll('.guidance-highlight'));
-    },
-
-    // 高亮当前步骤对应的元素
-    highlightCurrentStep() {
-      if (this.guidanceElements.length === 0) return;
-
-      const currentElement = this.guidanceElements[this.currentStep - 1];
-      if (currentElement) {
-        currentElement.scrollIntoView({ behavior: 'smooth', block: 'center' });
-      }
-    },
-// 下一步
-    nextStep() {
-      if (this.currentStep < 2) {
-        this.currentStep++;
-        this.highlightCurrentStep();
-      } else {
-        this.closeGuidance();
-      }
-    },
-
-    // 上一步
-    previousStep1() {
-      if (this.currentStep > 1) {
-        this.currentStep--;
-        this.highlightCurrentStep();
-      }
-    },
-
-    // 关闭引导
-    closeGuidance() {
-      this.showGuidance = false;
-      this.currentStep = 1;
-      this.highlightStyle = {};
-    },
-    // 内容分类获得焦点时的处理
-    onContentTypeFocus() {
-      if (this.showGuidance && this.currentStep === 1) {
-        this.currentStep = 2;
-        this.highlightCurrentStep();
-      }
-    },
-
-    // 内容分类改变时的处理
-    onContentTypeChange() {
-      if (this.showGuidance && this.currentStep === 1) {
-        this.currentStep = 2;
-        this.highlightCurrentStep();
-      }
-    },
-
-    // 标签获得焦点时的处理
-    onTagFocus() {
-      if (this.showGuidance && this.currentStep === 2) {
-        this.closeGuidance();
-      }
-    },
-
-    // 新增初始化标签方法
-    initTagComponent() {
-      if (this.$refs.courseTag) {
-        // 确保组件已渲染后再调用搜索
-        setTimeout(() => {
-          this.$refs.courseTag.debouncedSearch('');
-        }, 100);
-      }
-    },
     //上传课程图片处理
     uploadCoverImgSuccess(res) {
       //console.log(res,'res');
@@ -1090,8 +893,6 @@ export default {
       try {
         const { result, status } = await apiCourse.detail(id);
         if (status === 200) {
-          this.courseTags = result.tagList;
-          console.log('获取课程信息成功', this.courseTags);
           //把数据附给三个对象
           if(result.course.visible==''){
             result.course.visible=false;
@@ -1157,6 +958,7 @@ export default {
                }
             });
           }
+
           this.resOwnerArray=[];
           if (result.course.resOwner1 == '') {
             this.resOwnerArray.push(result.course.resOwner1);
@@ -1218,7 +1020,7 @@ export default {
           });
           this.teacherValues = tlist;
           this.teacherDownList = tlist;
-          if (this.courseInfo.tags) {
+          if (this.courseInfo.tags != '') {
             this.showTags = this.courseInfo.tags.split(',');
           }
           this.$nextTick(function() {
@@ -1376,17 +1178,12 @@ export default {
     },
     //保存课程信息并进入下一步
     saveAndNext(btnType) {
-      console.log("courseForm 保存课程信息 btnType = " + btnType);
       //if(this.courseInfo.type)
       //console.log(this.courseCrowds,'courseCrowds');
       //标签,多个，转化为逗号分隔的
-
-      console.log("courseForm 保存课程信息 this.showTags = " + this.showTags);
-      console.log("courseForm 保存课程信息 this.courseInfo.tags = " + this.courseInfo.tags);
-      // if (this.showTags.length > 0) {
-      //   this.courseInfo.tags = this.courseInfo.tags.join();
-      // }
-      // console.log("courseForm 保存课程信息 this.courseInfo.tags = " + this.courseInfo.tags);
+      if (this.showTags.length > 0) {
+        this.courseInfo.tags = this.showTags.join();
+      }
       this.courseInfo.keywords = this.tips.join(',') || ''
       //检查输入是否合法
       //if(!this.requireSaveCourse){
@@ -1446,7 +1243,7 @@ export default {
         teachers: saveTeachers,
         crowds:crowds
       };
-      console.log(postData);
+      //console.log(postData);
       //this.btnLoading=false;
       apiCourse
         .saveBase(postData)
@@ -1569,9 +1366,6 @@ export default {
       return true;
     },
     submitCourse() {
-      console.log("courseForm 课程提交审核 this.showTags = " + this.showTags);
-      console.log("courseForm 课程提交审核 this.courseInfo.tags = " + this.courseInfo.tags);
-
       if(this.biaoke.dlgShow && !this.unsavedContent()){
         this.$message.error('您有未保存的内容，请先保存');
         return;
@@ -1609,7 +1403,7 @@ export default {
         return;
       }
       if (this.showTags.length > 0) {
-        // this.courseInfo.tags = this.showTags.join();
+        this.courseInfo.tags = this.showTags.join();
       }
       if (this.sysTypeList.length < 1) {
         this.$message.error('请选择内容分类');
@@ -1857,13 +1651,13 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.red-tip{
+  .red-tip{
     margin-top: 8px;
     color: red;
     font-size: 14px;
     float: left;
     font-weight: 600;
-}
+  }
 ::v-deep .wei-from{
   .el-form-item{
      margin-bottom: 10px;
@@ -1960,7 +1754,7 @@ export default {
 
 </style>
 <style lang="scss">
-.cusprompt{
+  .cusprompt{
       padding: 20px 30px;
       .el-message-box__content{
         margin-top: 30px;
@@ -1968,127 +1762,5 @@ export default {
 
         }
       }
-}
-
-/* 蒙层样式 */
-.guidance-overlay {
-  position: fixed;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  background: rgba(0, 0, 0, 0.6);
-  z-index: 9999;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.guidance-content {
-  position: fixed;
-  background: white;
-  border-radius: 8px;
-  padding: 24px;
-  max-width: 500px;
-  box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15);
-  z-index: 10000;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-}
-
-.guidance-title {
-  font-size: 18px;
-  font-weight: bold;
-  margin-bottom: 20px;
-  text-align: center;
-}
-
-.guidance-steps {
-  margin-bottom: 20px;
-}
-
-.guidance-step {
-  display: flex;
-  align-items: flex-start;
-  margin-bottom: 16px;
-  opacity: 0.5;
-  transition: opacity 0.3s;
-}
-
-.guidance-step.active {
-  opacity: 1;
-}
-
-.step-number {
-  //width: 24px;
-  height: 24px;
-  //background: #409EFF;
-  color: white;
-  border-radius: 50%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-right: 12px;
-  font-size: 14px;
-}
-
-.step-content {
-  flex: 1;
-}
-
-.step-title {
-  font-weight: bold;
-  margin-bottom: 4px;
-}
-
-.step-desc {
-  color: #666;
-  font-size: 14px;
-}
-
-.guidance-actions {
-  display: flex;
-  justify-content: center;
-  gap: 12px;
-}
-
-/* 高亮元素样式 */
-.highlight-element {
-  position: fixed;
-  border: 2px solid #409EFF;
-  border-radius: 4px;
-  box-shadow: 0 0 0 9999px rgba(0, 0, 0, 0.4), 0 0 15px rgba(64, 158, 255, 0.5);
-  z-index: 9998;
-  pointer-events: none;
-  transition: all 0.3s ease;
-}
-
-/* 被高亮元素的样式 */
-.guidance-highlight {
-  position: relative;
-  z-index: 10001;
-}
-//.el-form-item__content {
-//  display: flex;
-//  width: 80%;
-//  .tag-container {
-//    width: 95%;
-//  }
-//}
-.tag-from-item .el-form-item__content {
-  margin-left: 0 !important;
-  display: flex;
-  //align-items: center;
-  .tag-container {
-    width: 95%;
   }
-}
-.guidance-highlight .el-form-item__content {
-  margin-left: 0 !important;
-  display: flex;
-  width: 75%;
-}
-
 </style>
-

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

@@ -132,7 +132,6 @@ import apiCourse from '@/api/modules/course.js';
 import apiExamPaper from '@/api/modules/paper.js';
 import {formatDate,formatSeconds} from '@/utils/datetime.js';
 import {testType,correctJudgment,numberToLetter} from '@/utils/tools.js';
-import { safeJsonParse } from '@/utils/index.js';
 export default {
   props:{
       studyId: {
@@ -218,11 +217,7 @@ export default {
            if(res.status==200){
                this.info=res.result;
                if(this.showTest) {
-                      let paper = safeJsonParse(this.info.paperContent, { items: [] });
-                      if(!paper.items || paper.items.length === 0){
-                        this.viewTest = [];
-                        return;
-                      }
+                      let paper= JSON.parse(this.info.paperContent);
                       paper.items.forEach(item=>{
                         //console.log(item);
                         if(item.type==101){
@@ -331,25 +326,27 @@ 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;
+        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};
+            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){
@@ -363,6 +360,7 @@ export default {
         });
         this.total=paper.items.length;
         this.paper =paper;
+        //console.log(this.paper);
 
         this.curItem=paper.items[this.curIndex];
         this.startTime=new Date();//记录开始时间
@@ -370,52 +368,6 @@ export default {
         this.timer=setInterval(this.changeTimer,60000);
         this.testStart=true;
       }
-        }else{
-          this.$message.error('加载试卷内容失败，请与管理员联系，试卷是否已删除');
-        }
-      })
-      // if(this.info.paperType==2){
-      //   apiExamPaper.getPaperContent(this.info.paperId).then(rs=>{
-      //     if(rs.status=200){
-      //        this.examPaper.json=JSON.parse(rs.result);
-      //        //console.log(this.examPaper.json,'this.examPaper.json');
-      //        let qitems=this.convertToItems(this.examPaper.json);
-      //       this.paper ={items:qitems};
-      //       this.total=qitems.length;
-      //       this.curItem=qitems[this.curIndex];
-      //       this.startTime=new Date();//记录开始时间
-      //       this.timerValue=this.info.testDuration;
-      //       this.timer=setInterval(this.changeTimer,60000);
-      //       this.testStart=true;
-      //     }else{
-      //       this.$message.error('加载试卷内容失败，请与管理员联系，试卷是否已删除');
-      //     }
-      //   })
-      // }else{
-      //   let paper= JSON.parse(this.info.paperContent);
-      //   paper.items.forEach(item=>{
-      //     //console.log(item);
-      //     if(item.type==101){
-      //       item.userAnswer='';
-      //     }else if(item.type==102){
-      //       item.userAnswer=[];
-      //     }else{
-      //       item.userAnswer=''
-      //     }
-      //     item.options.forEach(opt=>{
-      //       opt.checked=false;
-      //     })
-      //   });
-      //   this.total=paper.items.length;
-      //   this.paper =paper;
-      //   //console.log(this.paper);
-
-      //   this.curItem=paper.items[this.curIndex];
-      //   this.startTime=new Date();//记录开始时间
-      //   this.timerValue=this.info.testDuration;
-      //   this.timer=setInterval(this.changeTimer,60000);
-      //   this.testStart=true;
-      // }
     },
     chooseOption(opt){
     	if(this.curItem.type==101 || this.curItem.type==103){
@@ -580,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),
       }
       //计划考试的时长
@@ -591,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.studyItemId=res.result.studyItemId;//第一次保存时是没有的，所以这里要赋值
             this.$alert('您本次考试得分：'+this.lastScore, '考试成绩', {
                   confirmButtonText: '确定',

src/components/Course/homework.vue

@@ -109,7 +109,7 @@ export default {
         if(res.status==200){
           this.info=res.result;
           //检查是否过期
-            if(res.result.deadTime!='' && res.result.deadTime != null){
+          if(res.result.deadTime!=''){
             var d = new Date(res.result.deadTime);
             var now=new Date();
             if(now.getTime() > d.getTime()){
@@ -210,7 +210,7 @@ export default {
 </script>
 
 <style scoped lang="scss">
-  .homework-div {
+.homework-div {
   border: 1px solid #dadada;
   min-height: 500px;
   padding: 20px;
@@ -232,5 +232,5 @@ export default {
     }
   }
 
-  }
+}
 </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">
@@ -575,7 +553,7 @@
   import apiExamPaper from '../../api/modules/paper.js';
   import audioPlayer from '@/components/AudioPlayer/index.vue';
   import {getType} from '../../utils/tools.js';
-  import { deepClone, safeJsonParse } from "../../utils";
+  import { deepClone } from "../../utils";
   export default{
     components:{WxEditor,simplePaper,FileUpload,pdfPreview,audioPlayer,chooseCourseFile},
     props: {
@@ -921,7 +899,7 @@
              if(res.status==200){
                  this.exam.info=res.result;
                  if(res.result.paperType==1){
-                   this.exam.paperJson = safeJsonParse(res.result.paperContent, { items: [] });
+                   this.exam.paperJson=JSON.parse(res.result.paperContent);
                  }else{
                    apiExamPaper.detail(this.exam.info.paperId).then(rs=>{
                      if(rs.status==200){
@@ -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/Exam/EditPaper.vue

@@ -109,7 +109,6 @@
   import imgupload from '@/components/ImageUpload/single.vue';
   import apiExamTask from '@/api/modules/examTask.js';
   import examQuestionApi from "@/api/modules/question";
-  import { safeJsonParse } from '../../utils';
   import {numberToLetter, deepCopy} from '../../utils/tools.js';
   export default {
     name: 'comEditPaper',
@@ -164,7 +163,7 @@
               if(res.status === 200) {
                   this.paper=res.result;
                   //转化试题
-                  this.qitems = safeJsonParse(res.result.paperContent, []);
+                  this.qitems=JSON.parse(res.result.paperContent);
                   //console.log(this.qitems,this.qitems)
                   this.tempItems=this.qitems;
                   this.paperCalculation();

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

@@ -1,94 +0,0 @@
-<script>
-export default {
-  name: 'LanServiceChecker',
-  props: {
-    errorMsg: {
-      type: String,
-      default: '十分抱歉，您当前的网络环境不符合观看要求。为了保障课程信息的安全，您需要接入公司内网才能观看。'
-    },
-    // 控制是否显示
-    value: {type: Boolean, default: false}
-  },
-  created() {
-    this.lanServiceCheck()
-  },
-  data() {
-    return {
-      loading: false,
-    }
-  },
-  methods: {
-    syncValue(val) {
-      this.loading = false
-      this.$emit('update:value', val)
-    },
-    /**局域网检测*/
-    lanServiceCheck() {
-      this.loading = true
-
-      // 使用 AbortController 来控制超时
-      const controller = new AbortController();
-      const timeoutId = setTimeout(() => {
-        controller.abort();
-        this.syncValue(true);
-      }, 1000);
-
-      // 拼接随机参数（时间戳+随机数，确保URL唯一，防止缓存）
-      const url = `${window.location.protocol}//uapi.boe.com.cn/500.html?t=${Date.now()}${Math.random()}`;
-
-      // 使用 fetch 发送 HEAD 请求
-      fetch(url, {
-        method: 'HEAD',
-        signal: controller.signal
-      })
-        .then(response => {
-          clearTimeout(timeoutId);
-          this.syncValue(!response.ok)
-        })
-        .catch(error => {
-          clearTimeout(timeoutId);
-          if (error.name !== 'AbortError') {
-            this.syncValue(true)
-          }
-        });
-    },
-  }
-}
-</script>
-
-<template>
-  <div class="lan-checker-container">
-      <div>
-        <span>{{ errorMsg }}</span>
-      </div>
-      <div class="check-btn" @click="lanServiceCheck">
-        <el-button v-loading="loading" type="primary">重新检测</el-button>
-      </div>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.lan-checker-container {
-  height: 100%;
-
-  & > div {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-  }
-
-  .error-msg {
-    margin-top: 40px;
-    font-weight: 700;
-    font-size: 22px;
-    color: #ccc;
-  }
-
-  .check-btn {
-    margin-top: 20px;
-    text-align: center;
-  }
-}
-
-</style>

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

@@ -1,153 +1,74 @@
 <template>
   <div class="portal-header">
-    <div class="portal-top" :style="{ color: textColor }">
+    <div class="portal-top" :style="{color:textColor}">
         <div class="portal-top-left">
           <div class="portal-top-logo">
-          <img
-            src="../assets/logo/logo-white.png"
-            v-if="textColor == '#fff' || textColor == '#ffffff'"
-            style="width: 160px; height: 27px"
-          />
-          <img
-            src="../assets/logo/logo.png"
-            v-else
-            style="width: 160px; height: 27px"
-          />
+            <img src="../assets/logo/logo-white.png" v-if="textColor == '#fff' || textColor == '#ffffff'" style="width:160px;height: 27px;" />
+            <img src="../assets/logo/logo.png" v-else style="width:160px;height: 27px;" />
           </div>
           <div class="portal-top-nav" v-if="userInfo.role === 1">
-          <div
-            class="top-nav"
-            :style="{ color: textColor }"
-            :class="current == 'index' ? activeNav : ''"
-          >
-            <router-link to="/index"
-              >首页
+            <div class="top-nav" :style="{color:textColor}" :class="current == 'index' ? activeNav : ''">
+              <router-link to="/index" >首页
                 <div :class="current == 'index' ? 'nav-bottbor' : ''"></div>
               </router-link>
             </div>
-          <div
-            class="top-nav"
-            :style="{ color: textColor }"
-            :class="current == 'course' ? activeNav : ''"
-          >
-            <a @click="handleChangeCourse"
-              >课程
+            <div class="top-nav" :style="{color:textColor}" :class="current == 'course' ? activeNav : ''">
+              <router-link to="/course">课程
                 <div :class="current == 'course' ? 'nav-bottbor' : ''"></div>
-            </a>
+              </router-link>
             </div>
-          <div
-            class="top-nav"
-            :style="{ color: textColor }"
-            :class="current == 'case' ? activeNav : ''"
-          >
-            <router-link to="/case"
-              >案例
+            <div class="top-nav" :style="{color:textColor}" :class="current == 'case' ? activeNav : ''">
+              <router-link to="/case">案例
                   <div :class="current == 'case' ? 'nav-bottbor' : ''"></div>
               </router-link>
             </div>
-          <div
-            class="top-nav"
-            :style="{ color: textColor }"
-            :class="current == 'article' ? activeNav : ''"
-          >
-            <router-link to="/article"
-              >文章
+            <div class="top-nav" :style="{color:textColor}" :class="current == 'article' ? activeNav : ''">
+              <router-link to="/article">文章
                 <div :class="current == 'article' ? 'nav-bottbor' : ''"></div>
               </router-link>
             </div>
-          <div
-            class="top-nav"
-            :style="{ color: textColor }"
-            :class="current == 'qa' ? activeNav : ''"
-          >
-            <router-link to="/qa"
-              >问答
+            <div class="top-nav" :style="{color:textColor}" :class="current == 'qa' ? activeNav : ''">
+              <router-link to="/qa" >问答
                 <div :class="current == 'qa' ? 'nav-bottbor' : ''"></div>
               </router-link>
             </div>
             <div class="top-nav">
               <el-dropdown placement="bottom" @command="handleCommand">
-              <span
-                class="el-dropdown-link"
-                style="font-size: 16px; cursor: pointer"
-                :style="{ color: textColor }"
-                >专区</span
-              >
+                <span class="el-dropdown-link" style="font-size:16px;cursor: pointer;" :style="{color:textColor}">专区</span>
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item command="zero">热点论坛</el-dropdown-item>
-                <el-dropdown-item command="one" divided
-                  >BOE系列公开课</el-dropdown-item
-                >
-                <el-dropdown-item command="two" divided
-                  >Grow180</el-dropdown-item
-                >
-                <el-dropdown-item command="three" divided
-                  >管理者进阶</el-dropdown-item
-                >
-                <el-dropdown-item command="four" divided
-                  >U选小课堂</el-dropdown-item
-                >
-                <el-dropdown-item command="five" divided
-                  >社招新员工</el-dropdown-item
-                >
+                  <el-dropdown-item command="one" divided>BOE系列公开课</el-dropdown-item>
+                  <el-dropdown-item command="two" divided>Grow180</el-dropdown-item>
+                  <el-dropdown-item command="three" divided>管理者进阶</el-dropdown-item>
+                  <el-dropdown-item command="four" divided>U选小课堂</el-dropdown-item>
+                  <el-dropdown-item command="five" divided>社招新员工</el-dropdown-item>
                   <!-- <el-dropdown-item command="six" divided>贡献者专区</el-dropdown-item> -->
-                <el-dropdown-item command="seven" divided
-                  >教师专区</el-dropdown-item
-                >
+                  <el-dropdown-item command="seven" divided>教师专区</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </div>
             <div class="top-nav">
               <el-dropdown placement="bottom" @command="handleContributor">
-              <span
-                class="el-dropdown-link"
-                style="font-size: 16px; cursor: pointer"
-                :style="{ color: textColor }"
-                >贡献者大会</span
-              >
+                <span class="el-dropdown-link" style="font-size:16px;cursor: pointer;" :style="{color:textColor}">贡献者大会</span>
                 <el-dropdown-menu slot="dropdown">
-<!--                <el-dropdown-item command="four">2025</el-dropdown-item>-->
-                <el-dropdown-item command="three" divided>2024</el-dropdown-item>
-                <el-dropdown-item command="one" divided>2023</el-dropdown-item>
+                  <el-dropdown-item command="one">2023</el-dropdown-item>
                   <el-dropdown-item command="two" divided>2022</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </div>
 
-          <div
-            class="top-nav"
-            :style="{ color: textColor }"
-            :class="current == 'follow' ? activeNav : ''"
-          >
-            <router-link to="/follow"
-              >我的关注
+            <div class="top-nav" :style="{color:textColor}" :class="current == 'follow' ? activeNav : ''">
+              <router-link to="/follow">我的关注
                 <div :class="current == 'follow' ? 'nav-bottbor' : ''"></div>
               </router-link>
             </div>
+
           </div>
         </div>
         <div class="portal-top-right">
-        <div
-          v-if="goSearch != 10 && userInfo.role === 1"
-          style="position: relative"
-        >
-          <el-input
-            class="portal-input"
-            v-show="!hideSearch"
-            placeholder="搜索全部"
-            style="border-radius: 20px !important"
-            @keyup.enter.native="searchJump()"
-            clearable
-            maxlength="50"
-            v-model="keyword"
-          >
-            <el-select
-              v-if="current == 'index'"
-              v-model="findType"
-              style="width: 75px; border-radius: 20px !important"
-              slot="prepend"
-              placeholder="请选择"
-            >
+          <div  v-if="goSearch !=10 && userInfo.role === 1" style="position: relative;">
+            <el-input class="portal-input" v-show="!hideSearch" placeholder="搜索全部" style="border-radius: 20px !important; " @keyup.enter.native="searchJump()" clearable maxlength="50" v-model="keyword" >
+              <el-select v-if="current == 'index'"  v-model="findType" style="width: 75px; border-radius:20px !important;" slot="prepend" placeholder="请选择">
                 <el-option label="课程" value="1"></el-option>
                 <el-option label="案例" value="2"></el-option>
                 <el-option label="文章" value="3"></el-option>
@@ -155,14 +76,7 @@
                 <!-- <el-option label="专区" value="5"></el-option> -->
               </el-select>
             </el-input>
-          <el-button
-            v-show="!hideSearch"
-            class="sear-but"
-            @click="searchJump()"
-            type="primary"
-            size="mini"
-            >搜索</el-button
-          >
+             <el-button v-show="!hideSearch" class="sear-but"  @click="searchJump()" type="primary" size="mini">搜索</el-button>
           </div>
 
           <div class="person-action">
@@ -171,25 +85,11 @@
             <el-link v-else class="person-action-index" type="primary" style="margin-right:10px; color:#fff;" :href="`${webBaseUrl}${isTiao ? '/uc/study/task' : '/uc/study/courses'}`" :underline="false">个人中心</el-link> -->
             <!-- <el-link type="primary" @click="logout()" icon="el-icon-switch-button" :underline="false">退出</el-link> -->
             <div class="person-action-item">
-            <el-badge
-              class="person-action-index"
-              :value="userMsg"
-              :hidden="userMsg == 0"
-            >
-              <el-tooltip
-                content="消息"
-                placement="bottom"
-                effect="light"
-                :visible-arrow="false"
-                popper-class="text-tooltip"
-              >
+              <el-badge class="person-action-index"  :value="userMsg" :hidden="userMsg == 0">
+                <el-tooltip   content="消息" placement="bottom" effect="light" :visible-arrow="false" popper-class="text-tooltip">
                    <!-- <el-link  type="primary" :href="`${webBaseUrl}/message/center/index`" :underline="false"> -->
                     <router-link to="/message/center/index">
-                  <svg-icon
-                    :style="{ color: textColor }"
-                    style="margin-right: 0; font-size: 22px"
-                    icon-class="messfff"
-                  ></svg-icon>
+                        <svg-icon :style="{color:textColor}" style="margin-right: 0;font-size:22px;" icon-class="messfff"></svg-icon>
                     </router-link>
                    <!-- </el-link> -->
                 </el-tooltip>
@@ -198,94 +98,40 @@
             <div class="person-action-item">
                 <el-dropdown class="person-action-index">
                   <span class="el-dropdown-link">
-                <span :style="{ color: textColor }">学员</span>
-                <i
-                  :style="{ color: textColor }"
-                  class="el-icon-arrow-down el-icon--right"
-                ></i>
+                    <span :style="{color:textColor}">学员</span>
+                    <i :style="{color:textColor}" class="el-icon-arrow-down el-icon--right"></i>
                   </span>
                   <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item
-                  ><router-link to="/index">学员</router-link></el-dropdown-item
-                >
-                <el-dropdown-item
-                  v-if="identity == 2 || identity == 5"
-                  @click.native="setCurIdentity(2)"
-                  ><router-link to="/need/waitaudit"
-                    >教师</router-link
-                  ></el-dropdown-item
-                >
-                <el-dropdown-item v-if="identity == 3 || identity == 5"
-                  ><a :href="managerPath + '/learningpath'"
-                    >管理员</a
-                  ></el-dropdown-item
-                >
+                    <el-dropdown-item><router-link to="/index">学员</router-link></el-dropdown-item>
+                    <el-dropdown-item v-if="identity == 2 || identity == 5" @click.native="setCurIdentity(2)"><router-link to="/need/waitaudit">教师</router-link></el-dropdown-item>
+                    <el-dropdown-item v-if="identity == 3 || identity == 5" ><a :href="managerPath+'/learningpath'">管理员</a></el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
              </div>
              <div class="person-action-item">
                 <el-dropdown>
-              <div
-                class="el-dropdown-link"
-                style="display: flex"
-                :style="{ color: textColor }"
-              >
+                  <div class="el-dropdown-link" style="display:flex" :style="{color:textColor}">
                     <div class="person-action-index">
-                  <div v-if="userInfo.avatar !== ''" class="user-avatar">
-                    <img
-                      :src="userInfo.avatar"
-                      style="width: 35px; height: 35px"
-                    />
+                      <div v-if="userInfo.avatar !== '' " class="user-avatar">
+                          <img :src="userInfo.avatar"  style="width: 35px;height: 35px;"/>
                       </div>
                       <div v-else class="uavatar">
-                    <div v-if="sex === 1">
-                      <img
-                        src="../../public/images/Avatarman.png"
-                        alt=""
-                        style="width: 30px; height: 30px"
-                      />
-                    </div>
-                    <div v-else>
-                      <img
-                        src="../../public/images/Avatarwoman.png"
-                        alt=""
-                        style="width: 30px; height: 30px"
-                      />
+                          <div v-if="sex === 1 "><img src="../../public/images/Avatarman.png" alt="" style="width: 30px;height: 30px;"></div>
+                          <div v-else><img src="../../public/images/Avatarwoman.png" alt="" style="width: 30px;height: 30px;"></div>
                       </div>
                     </div>
-                </div>
-                <div style="font-weight: 400; font-size: 16px; margin-top: 8px">
-                  {{ userInfo.name }}
-                </div>
+                    <div style="font-weight: 400;font-size: 16px; margin-top: 8px;">{{userInfo.name}}</div>
                   </div>
                   <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item @click.native="setCurIdentity(1)"
-                  ><a
-                    :href="`${webBaseUrl}${
-                      isTiao ? '/uc/study/task' : '/uc/study/courses'
-                    }`"
-                    >个人中心</a
-                  ></el-dropdown-item
-                >
-                <el-dropdown-item
-                  ><router-link :to="'/home/' + userInfo.aid"
-                    >个人主页</router-link
-                  ></el-dropdown-item
-                >
+                    <el-dropdown-item @click.native="setCurIdentity(1)"><a :href="`${webBaseUrl}${isTiao ? '/uc/study/task' : '/uc/study/courses'}`">个人中心</a></el-dropdown-item>
+                    <el-dropdown-item><router-link :to="'/home/'+userInfo.aid">个人主页</router-link></el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
             </div>
             <div class="person-action-item">
-            <div
-              class="person-action-index pointer"
-              :style="{ color: textColor }"
-              @click="logout()"
-            >
-              <svg-icon
-                style="margin-right: 4px; font-size: 16px"
-                icon-class="white-out"
-              ></svg-icon
-              >登出
+
+              <div class="person-action-index pointer" :style="{color:textColor}" @click="logout()">
+                <svg-icon  style="margin-right: 4px;font-size:16px;" icon-class="white-out"></svg-icon>登出
               </div>
             </div>
           </div>
@@ -295,110 +141,89 @@
   </div>
 </template>
 <script>
-import { mapGetters, mapActions } from "vuex";
-import apiMessage from "@/api/system/message.js";
-import popup from "@/components/AlertPopup.vue";
-import yearMedal from "@/components/Popup/China2023.vue";
-import apiBoeCourse from "@/api/boe/course.js";
-import { userAvatarText } from "@/utils/tools.js";
+import { mapGetters, mapActions } from 'vuex';
+import apiMessage from '@/api/system/message.js';
+import popup from '@/components/AlertPopup.vue';
+import yearMedal from '@/components/Popup/China2023.vue';
+import apiBoeCourse from '@/api/boe/course.js';
+import {userAvatarText} from "@/utils/tools.js";
 import apiCase from "@/api/modules/cases.js";
 export default {
   props: {
     current: {
       type: String,
-      default: "",
+      default: '',
     },
-    hideSearch: {
+    hideSearch:{
       type: Boolean,
       default: false,
     },
-    textColor: {
+    textColor:{
       type: String,
-      default: "",
+      default: '',
     },
-    goSearch: {
+    goSearch:{
       type: Number,
       default: 0,
     },
-    keywords: {
-      type: String,
-      default: "",
+    keywords:{
+      type:String,
+      default:''
     },
   },
-  components: { popup, yearMedal },
+  components:{popup,yearMedal},
   computed: {
-    ...mapGetters([
-      "userInfo",
-      "curIdentity",
-      "userMsg",
-      "identity",
-      "studyTaskCount",
-    ]),
+    ...mapGetters(['userInfo','curIdentity', 'userMsg','identity','studyTaskCount']),
 
-    avatarText() {
+    avatarText(){
       return userAvatarText(this.userInfo.name);
     },
-    activeNav() {
+    activeNav(){
         return {
-        "top-nav-active-blue": this.textColor == "#000000",
-        "top-nav-active-white":
-          this.textColor == "#fff" || this.textColor == "#ffffff",
-      };
-    },
-  },
-  watch: {
-    keywords(newval) {
-      console.log(newval, 9999);
-      if (this.findType == "1") {
-        this.keyword = newval;
+          'top-nav-active-blue': this.textColor=='#000000',
+          'top-nav-active-white': this.textColor=='#fff' || this.textColor=='#ffffff',
+        }
     }
   },
-    "$route.query.keyword": {
-      handler(newval) {
-        if (newval && this.current == "case") {
-          this.keyword = newval;
+  watch:{
+    keywords(newval){
+      console.log(newval,9999);
+      if(this.findType == '1'){
+        this.keyword = newval
+      }
     }
-      },
-      immediate: true,
-    },
   },
   data() {
     return {
-      popupConfig: {},
-      ctx: process.env.VUE_APP_PUBLIC_PATH,
-      managerPath: process.env.VUE_APP_MANAGER_PATH,
+      popupConfig:{},
+      ctx:process.env.VUE_APP_PUBLIC_PATH,
+      managerPath:process.env.VUE_APP_MANAGER_PATH,
       fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
-      findType: "1",
-      keyword: "",
+      findType: '1',
+      keyword: '',
       isTiao: false,
-      sex: "",
+      sex:'',
     };
   },
   mounted() {
     this.sex = this.userInfo.sex;
-    this.$store.dispatch("refrashMsg");
+    this.$store.dispatch('refrashMsg');
     this.loadBoeData();
-    // console.log('this.userInfo::',this.userInfo)
+    console.log('this.userInfo::',this.userInfo)
     //this.loadPopupConfig();
   },
   methods: {
-    handleChangeCourse() {
-      const paths = ["/course", "/qualityCourse"];
-      // 如果是 课程 和 精品课程， 那么就不再重定向
-      const needReload = paths.findIndex((e) => e === this.$route.path) === -1;
-      if (needReload) this.$router.push({ path: paths[0] });
-    },
 
-    setCurIdentity(iden) {
-      this.$store.dispatch("SetCurIdentity", iden);
+    setCurIdentity(iden){
+        this.$store.dispatch('SetCurIdentity',iden);
       },
-    tomy() {
-      console.log("lll");
+    tomy(){
+      console.log('lll')
     },
     loadBoeData() {
-      if (this.studyTaskCount > 0) {
+      if(this.studyTaskCount>0){
         this.isTiao = true;
-      } else {
+      }else{
         this.isTiao = false;
       }
       // let params = {
@@ -416,19 +241,17 @@ export default {
       //   }
       // });
     },
-    handleContributor(val) {
+    handleContributor(val){
       let urlPre = window.location.protocol + "//" + window.location.host;
       let obj = {
           one: urlPre + "/web/contributornew/index",
           two: urlPre + "/web/contributor/index",
-        three: urlPre + "/web/contributor_2024/index",
-        four: urlPre + "/web/contributor_2025/index",
         };
         window.open(obj[val]);
     },
     handleCommand(val) {
       if (val === "four") {
-        window.open("https://m.qingxuetang.com/x/?appId=qxtcorp306130");
+        window.open("https://m.qingxuetang.com/x/?appId=qxtcorp306130")
           // this.$emit('showClass',true)
       }  else {
         let urlPre = window.location.protocol + "//" + window.location.host;
@@ -441,104 +264,83 @@ export default {
           // four: 'https://m.qingxuetang.com/x/?appId=qxtcorp306130',
           five: urlPre + "/boe/new-employee/index.html",
           six: urlPre + "/web/contributor/index",
-          seven: this.webBaseUrl + "/grateful/index",
+          seven: this.webBaseUrl + '/grateful/index'
         };
         window.open(obj[val]);
       }
     },
     handleUcCommand(val) {
-      if (val == "uc") {
-        window.location.href = `${this.webBaseUrl}${
-          this.isTiao ? "/uc/study/task" : "/uc/study/courses"
-        }`;
-      } else if (val == "logout") {
+      if (val == 'uc') {
+        window.location.href = `${this.webBaseUrl}${this.isTiao ? '/uc/study/task' : '/uc/study/courses'}`;
+      } else if (val == 'logout') {
         this.logout();
       }
     },
     searchJump() {
-      this.$emit("type1", "");
-      if (this.current == "index") {
-        if (this.findType == "1") {
-          if (this.keyword == "") {
-            return;
-          }
+      this.$emit('type1', '')
+  if(this.current == 'index') {
+    if (this.findType == '1') {
+          if(this.keyword==''){return;}
           // 课程
-          location.href = `${this.webBaseUrl}/course?keyword=${this.keyword}`;
+          location.href=`${this.webBaseUrl}/course?keyword=${this.keyword}`;
           //window.open(`${this.webBaseUrl}/course?keyword=${this.keyword}`);
-        } else if (this.findType == "2") {
-          if (this.keyword == "") {
-            return;
-          }
+        } else if (this.findType == '2') {
+          if(this.keyword==''){return;}
           // 案例
-          location.href = `${this.webBaseUrl}/case?keyword=${this.keyword}`;
+          location.href=`${this.webBaseUrl}/case?keyword=${this.keyword}`;
           //window.open(`${this.webBaseUrl}/case?keyword=${this.keyword}`);
-        } else if (this.findType == "3") {
-          if (this.keyword == "") {
-            return;
-          }
+        } else if (this.findType == '3') {
+          if(this.keyword==''){return;}
           //文章
-          location.href = `${this.webBaseUrl}/article?keyword=${this.keyword}`;
+          location.href=`${this.webBaseUrl}/article?keyword=${this.keyword}`;
           //window.open(`${this.webBaseUrl}/article?keyword=${this.keyword}`);
-        } else if (this.findType == "4") {
-          if (this.keyword == "") {
-            return;
-          }
+        } else if (this.findType == '4') {
+          if(this.keyword==''){return;}
           // 问答
-          location.href = `${this.webBaseUrl}/qa?keyword=${this.keyword}`;
+          location.href=`${this.webBaseUrl}/qa?keyword=${this.keyword}`;
           //window.open(`${this.webBaseUrl}/qa?keyword=${this.keyword}`);
-        } else if (this.findType == "5") {
+        } else if (this.findType == '5') {
           // 专区,专区要单独的写，因为不是一个系统呀
           window.open(`${this.webBaseUrl}/zone?keyword=${this.keyword}`);
         }
-      } else {
-        this.$emit("emitInput", this.keyword);
-        if (this.goSearch == 1) {
-          if (this.keyword == "") {
-            return;
-          }
+} else {
+  this.$emit('emitInput',this.keyword)
+  if(this.goSearch == 1) {
+    if(this.keyword==''){return;}
           // 课程
-          location.href = `${this.webBaseUrl}/course?keyword=${this.keyword}`;
+          location.href=`${this.webBaseUrl}/course?keyword=${this.keyword}`;
   } else if (this.goSearch == 2) {
-          if (this.keyword == "") {
-            return;
-          }
+          if(this.keyword==''){return;}
           // 案例
           // location.href=`${this.webBaseUrl}/case?keyword=${this.keyword}`;
-          this.$router.push(`/case?keyword=${this.keyword}`);
+          this.$router.push(`/case?keyword=${this.keyword}`)
           //window.open(`${this.webBaseUrl}/case?keyword=${this.keyword}`);
         } else if (this.goSearch == 3) {
-          if (this.keyword == "") {
-            return;
-          }
+          if(this.keyword==''){return;}
           //文章
-          location.href = `${this.webBaseUrl}/article?keyword=${this.keyword}`;
+          location.href=`${this.webBaseUrl}/article?keyword=${this.keyword}`;
           //window.open(`${this.webBaseUrl}/article?keyword=${this.keyword}`);
         } else if (this.goSearch == 4) {
-          if (this.keyword == "") {
-            return;
-          }
+          if(this.keyword==''){return;}
           // 问答
-          location.href = `${this.webBaseUrl}/qa?keyword=${this.keyword}`;
+          location.href=`${this.webBaseUrl}/qa?keyword=${this.keyword}`;
           //window.open(`${this.webBaseUrl}/qa?keyword=${this.keyword}`);
         } else if (this.goSearch == 5) {
           // 专区,专区要单独的写，因为不是一个系统呀
           window.open(`${this.webBaseUrl}/zone?keyword=${this.keyword}`);
         }
-      }
+}
+
     },
     logout() {
-      this.$confirm("您确定要退出系统吗？", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$store.dispatch("LogOut").then(() => {
+      this.$confirm('您确定要退出系统吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+          this.$store.dispatch('LogOut').then(() => {
             //location.href = this.webBaseUrl + '/login';
-            sessionStorage.setItem(
-              "dialog_session_show" + this.userInfo.aid,
-              null
-            ); // 清除兴趣采集的"关闭"缓存
+            sessionStorage.setItem('dialog_session_show'+this.userInfo.aid,null); // 清除兴趣采集的"关闭"缓存
             location.href = process.env.VUE_APP_LOGIN_URL;
           });
         })
@@ -546,52 +348,49 @@ export default {
     },
     //获取未读消息数量
     getMsgNum() {
-      apiMessage.isRead().then((res) => {
+      apiMessage.isRead().then(res => {
         if (res.status == 200) {
           this.msgNum = res.result;
         }
       });
-    },
-  },
+    }
+  }
 };
 </script>
 
 <style scoped rel="stylesheet/scss" lang="scss">
-::v-deep .el-dropdown-menu__item:not(.is-disabled):hover {
+
+::v-deep .el-dropdown-menu__item:not(.is-disabled):hover{
     background-color: #fff !important;
-  color: #0059ff !important;
+    color: #0059FF !important;
 }
 ::v-deep.el-dropdown-menu {
-  text-align: center;
+text-align: center;
   border: none !important;
 }
-//定义消息的图标的样式，按ui，未完成
-.msg-icon {
-  font-size: 16px;
-  background-color: #fff;
-  border-radius: 50%;
+  //定义消息的图标的样式，按ui，未完成
+.msg-icon{
+  font-size:16px;
+  background-color:#fff;
+  border-radius:50%;
 }
-.top-nav-active-blue {
-  color: #387df7;
-  a {
-    color: #387df7;
-  }
-  div {
+.top-nav-active-blue{
+    color: #387DF7;
+    a{color:#387DF7;}
+    div{
       width: 75%;
       height: 4px;
       top: 75%;
       left: 13%;
-    background: #387df7;
+      background: #387DF7;
       border-radius: 5px;
       position: absolute;
     }
 }
-.top-nav-active-white {
+.top-nav-active-white{
     color: #fff;
-  a {
-    color: #fff;
-  }
-  div {
+    a{color:#fff;}
+    div{
       width: 75%;
       height: 4px;
       top: 75%;
@@ -602,15 +401,15 @@ export default {
     }
 }
 
-.sear-but {
+.sear-but{
   position: absolute;
   bottom: 10%;
   right: 5px;
 }
-::v-deep .el-input__inner {
+  ::v-deep .el-input__inner{
     border-radius: 6px;
     border-right: none;
-}
+  }
 ::v-deep .el-badge__content.is-fixed {
   right: 10px;
 }
@@ -619,41 +418,42 @@ export default {
   // margin: 0 87px;
   height: 72px;
   display: flex;
-  background: rgba(255, 255, 255, 0.1);
-  border: 1px solid rgba(61, 61, 61, 0.15);
+  background: rgba(255,255,255,0.1);
+  border: 1px solid rgba(61,61,61,0.15);
   backdrop-filter: blur(10px);
 }
-.portal-top {
+.portal-top{
   width: 100%;
   margin: 0px 40px;
   display: flex;
-  justify-content: space-between;
-  .portal-top-left {
+  justify-content:space-between;
+  .portal-top-left{
     display: flex;
     justify-content: flex-start;
     align-items: center;
-    .portal-top-logo {
+    .portal-top-logo{
+
     }
-    .portal-top-nav {
+    .portal-top-nav{
       display: flex;
       justify-content: space-around;
       margin-left: 20px;
     }
   }
-  .portal-top-right {
-    flex: 1;
+  .portal-top-right{
+    flex:1;
     display: flex;
     justify-content: flex-end;
     align-items: center;
   }
   //width: 1050px;
-  .person-action {
+  .person-action{
     display: flex;
     justify-content: flex-end;
     align-items: center;
     margin-left: 10px;
 
-    .person-action-index {
+    .person-action-index{
       //margin-left: 40px;
       font-size: 16px;
       font-weight: 400;
@@ -668,20 +468,20 @@ export default {
     // //     right: 48px;
     // //   }
     // }
-    ::v-deep.el-avatar {
+  ::v-deep.el-avatar{
       margin-right: 8px;
-      img {
+       img{
             width: 100% !important;
          }
     }
-    .el-button {
+    .el-button{
       margin-left: 15px;
       margin-top: 1px;
       // font-size: 14px;
     }
   }
 }
-.person-action-item {
+.person-action-item{
     margin-left: 30px;
 }
 .top-nav {
@@ -691,42 +491,42 @@ export default {
   color: #000000;
   line-height: 72px;
   padding: 0px 10px;
-  white-space: nowrap;
+  white-space:nowrap;
   position: relative;
 }
 
 //此处理应该移到单独的一个样式中比较好
 
-@media screen and (max-width: 1366px) {
+@media screen and (max-width: 1366px){
   .top-nav {
     padding: 0px 10px;
   }
-  .person-action-item {
+  .person-action-item{
       margin-left: 20px;
   }
 }
-@media screen and (max-width: 1680px) and (min-width: 1367px) {
+@media screen and (max-width: 1680px) and (min-width:1367px){
   .top-nav {
     padding: 0px 15px;
   }
-  .person-action-item {
+  .person-action-item{
       margin-left: 30px;
   }
 }
-@media screen and (max-width: 1920px) and (min-width: 1681px) {
+@media screen and (max-width: 1920px) and (min-width: 1681px){
   .top-nav {
     padding: 0px 30px;
   }
-  .person-action-item {
+  .person-action-item{
       margin-left: 40px;
   }
 }
 
-@media screen and (min-width: 1921px) {
+@media screen and (min-width: 1921px){
   .top-nav {
     padding: 0px 40px;
   }
-  .person-action-item {
+  .person-action-item{
       margin-left: 45px;
   }
 }
@@ -734,6 +534,7 @@ export default {
 ::v-deep .el-badge {
   .el-badge__content {
     top: 0px;
+
   }
 }
 
@@ -744,7 +545,7 @@ export default {
   // border: 1px solid #333333;
   border-radius: 0 20px 20px 0;
   border-left: none;
-  background: rgba(255, 255, 255, 0.12);
+  background: rgba(255,255,255,0.12);
 }
 
 .message-count a {
@@ -754,6 +555,7 @@ export default {
 }
 ::v-deep .el-badge {
   margin-top: 0 !important;
+
 }
 ::v-deep .el-link.el-link--primary:hover {
   color: #588afc;
@@ -762,10 +564,10 @@ export default {
   cursor: pointer;
   color: #000000;
 }
-.uavatar {
-  div {
+ .uavatar{
+   div{
      border-radius: 50%;
-    img {
+     img{
        border-radius: 50%;
        width: 30px;
        height: 30px;
@@ -777,11 +579,11 @@ export default {
     font-size: 14px;
     margin-right: 8px;
     border-radius: 50%;
-}
-.user-avatar {
+  }
+  .user-avatar{
     display: inline-block;
     border-radius: 50%;
-  img {
+    img{
         border-radius: 50%;
         width: 30px;
         height: 30px;
@@ -793,5 +595,5 @@ export default {
      font-size: 14px;
      margin-right: 8px;
      border-radius: 50%;
-}
+   }
 </style>