Merge branch 'master' into ebiz-uat-2025-11-06

src/App.vue

@@ -87,4 +87,16 @@
     border: 1px solid #e7e7e7 !important;
     box-shadow: 0px 1px 5px 1px rgba(92,98,111,.3);
 }
-</style>
+
+#app {
+  pointer-events: none;
+}
+
+#app > *:not(.case-expert-dialog) {
+  pointer-events: auto;
+}
+
+.case-expert-dialog {
+  pointer-events: auto;
+}
+</style>

src/api/ajax.js

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

src/api/boe/boeAjax.js

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

src/api/boe/boeApiAjax.js

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

src/api/cesource/index.js

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

src/api/event/index.js

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

src/security.js

@@ -11,16 +11,16 @@ import xpage from '@/utils/xpage'
 
 NProgress.configure({ showSpinner: false })
 
-const whiteList = ['/login','/logout','/loading','/pc/loading','/500','/auth-redirect','/forget','/reset/password']
+const whiteList = ['/login', '/logout', '/loading', '/pc/loading', '/500', '/auth-redirect', '/forget', '/reset/password']
 
 router.beforeEach((to, from, next) => {
   watermark.set("");
   //动态计算文件的路径
-  let configPath=process.env.VUE_APP_FILE_RELATIVE_PATH;
-  if(configPath.startsWith('http')){
-    xpage.constants.fileBaseUrl=configPath;
-  }else{
-    xpage.constants.fileBaseUrl=window.location.protocol+'//'+window.location.host+configPath;
+  let configPath = process.env.VUE_APP_FILE_RELATIVE_PATH;
+  if (configPath.startsWith('http')) {
+    xpage.constants.fileBaseUrl = configPath;
+  } else {
+    xpage.constants.fileBaseUrl = window.location.protocol + '//' + window.location.host + configPath;
   }
 
   NProgress.start();
@@ -28,66 +28,71 @@ router.beforeEach((to, from, next) => {
   if (whiteList.indexOf(to.path) !== -1) {
     // 在免登录白名单，直接进入
     next()
-  }else{
-    if(getToken()){
-      if(to.path === '/login'){
+  } else {
+    if (getToken()) {
+      if (to.path === '/login') {
         // 如果是外部用户，把配置的路由跳转到个人中心
-        if(store.getters.userInfo.role === 2){
-          next({ path: process.env.VUE_APP_PUBLIC_PATH+'/uc/study/courses' })
-        }else{
-          next({ path: process.env.VUE_APP_PUBLIC_PATH+'/index' })
+        if (store.getters.userInfo.role === 2) {
+          next({ path: process.env.VUE_APP_PUBLIC_PATH + '/uc/study/courses' })
+        } else {
+          next({ path: process.env.VUE_APP_PUBLIC_PATH + '/index' })
         }
         NProgress.done();
       } else {
         //console.log('store.getters.userInfo:',store.getters.userInfo.role)
         // 如果是外部用户，把配置的路由跳转到个人中心
-        if(store.getters.userInfo.role === 2){
-          if(to.path === '/index' || to.path === '/course' || to.path === '/case' || to.path === '/article' ) location.href = '/pc/uc/study/task'
+        if (store.getters.userInfo.role === 2) {
+          if (to.path === '/index' || to.path === '/course' || to.path === '/case' || to.path === '/article') location.href = '/pc/uc/study/task'
         }
         //后续这里需要增加一定的控制
-          if (!store.getters.init) {
-            sessionStorage.removeItem(xpage.constants.localCaseFiltersKey);
-            sessionStorage.removeItem(xpage.constants.localCourseFiltersKey);
-            // 判断当前控制台是否已拉取完数据
-            store.dispatch('InitData').then(res => {
-              //加载白名单信息
-              //testUser.init();
-              //加载信息资源归属，系统分类信息
-              store.dispatch('resOwner/loadResOwners');
-              store.dispatch('sysType/loadSysTypes');
+        if (!store.getters.init) {
+          sessionStorage.removeItem(xpage.constants.localCaseFiltersKey);
+          sessionStorage.removeItem(xpage.constants.localCourseFiltersKey);
+          // 判断当前控制台是否已拉取完数据
+          store.dispatch('InitData').then(res => {
+            //加载白名单信息
+            //testUser.init();
+            //加载信息资源归属，系统分类信息
+            store.dispatch('resOwner/loadResOwners');
+            store.dispatch('sysType/loadSysTypes');
 
-              store.commit('app/SET_INITDATA',true);
-              //routers数据先使用固定的，以后在初始化接口中返回
-              let myRouters=routers();
-              store.dispatch('GenerateRoutes',{routers:myRouters}).then(accessRoutes=>{
-                 router.addRoutes(accessRoutes) // 动态添加可访问路由表
-                 next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
-              });
+            store.commit('app/SET_INITDATA', true);
+            //routers数据先使用固定的，以后在初始化接口中返回
+            let myRouters = routers();
+            store.dispatch('GenerateRoutes', { routers: myRouters }).then(accessRoutes => {
+              router.addRoutes(accessRoutes) // 动态添加可访问路由表
+              next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
+            });
 
-            }).catch(err => {
-                console.log(err);
-                store.commit('app/SET_INITDATA',false);
-                //如果初始化错误，就不再执行了，不然会一直循环下去
-                next({ path: '/500' })
-                //NProgress.done();
-            })
-          } else {
-            to.meta.keepAlive = true
-            next();
-          }
+          }).catch(err => {
+            console.log(err);
+            store.commit('app/SET_INITDATA', false);
+            //如果初始化错误，就不再执行了，不然会一直循环下去
+            next({ path: '/500' })
+            //NProgress.done();
+          })
+        } else {
+          to.meta.keepAlive = true
+          next();
+        }
 
       }
       //next();
-    }else{
+    } else {
 
-        //next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
-        //设置之前的路径
-        //store.commit('portal/SetBackUrl',location.href);
-        //console.log(location.href,'location.href');
-        //let urlPre=window.location.protocol+'//'+window.location.host;
-        //let backUrl=location.href.substring(urlPre.length); encodeURIComponent()
-        location.href=process.env.VUE_APP_LOGIN_URL+"?returnUrl="+encodeURIComponent(location.href);
-        NProgress.done()
+      //next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
+      //设置之前的路径
+      //store.commit('portal/SetBackUrl',location.href);
+      //console.log(location.href,'location.href');
+      //let urlPre=window.location.protocol+'//'+window.location.host;
+      //let backUrl=location.href.substring(urlPre.length); encodeURIComponent()
+      if (top !== window) { // 判断当前是否在iframe内
+        top.location.href = process.env.VUE_APP_LOGIN_URL + "?returnUrl=" + encodeURIComponent(location.href);
+      } else {
+        window.location.href = process.env.VUE_APP_LOGIN_URL + "?returnUrl=" + encodeURIComponent(location.href);
+      }
+      // location.href=process.env.VUE_APP_LOGIN_URL+"?returnUrl="+encodeURIComponent(location.href);
+      NProgress.done()
 
     }
   }

src/utils/xajax.js

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

src/views/Index.vue

@@ -153,28 +153,29 @@
       </div>
     </div>
     <div class="xindex-content">
-      
+
       <!-- 推荐课程 -->
       <div class="modules xcontent2">
         <!-- <div class="xcontent2-main"> -->
           <!--内容块-->
-        
+
           <!-- </div> -->
            <!-- 精品课模块 -->
         <div class="xcontent2-main">
           <div class="modules-title xindex-main" v-if="this.qusisityList.list.length > 0">
-            <!-- <span class="modules-text" style="color: #3D86F4;">精品课</span> -->
+            <!-- <span class="jin-text">精品课</span> -->
+             <div class="jin-zhe"></div>
             <span class="quyer-tag" style="margin-left: 0px;">
-              <!-- <img src="../assets/images/tutoring1.pn" alt=""> -->
               <img class="modules-text" style="height: 28px;" src="../assets/images/course/courseTitle.png" alt="">
             </span>
+
             <span class="more">
               <router-link to="/qualityCourse">查看更多>></router-link>
             </span>
           </div>
 
 
-          
+
           <div
               v-for="(course, eIndex) in exquisiteList"
               :key="'cc' + eIndex"
@@ -231,7 +232,7 @@
             </div>
 
 
-        
+
           <!--内容块-->
           <div class="modules-title xindex-main">
             <span class="modules-text">推荐课程</span>
@@ -1308,7 +1309,7 @@ export default {
       return this.courseList.list.slice(3)
     },
     // 精品课展示
-    exquisiteList() { 
+    exquisiteList() {
       return this.qusisityList.list.slice(0,3)
     },
   },
@@ -1567,7 +1568,7 @@ export default {
       let course = {
         aid: this.userInfo.aid,
       }
-      apiIndex.qualitylist(course).then((res) => { 
+      apiIndex.qualitylist(course).then((res) => {
          let courseIds = [];
           res.data.result.forEach((item) => {
             item.authorInfo = {
@@ -2826,6 +2827,15 @@ export default {
   display: flex;
 
   .modules-title {
+    position: relative;
+    .jin-zhe{
+      width: 410px;
+      height: 30px;
+      background: #f7f7f9;
+      position: absolute;
+      left: 86px;
+
+}
     .modules-text {
       height: 28px;
       font-size: 20px;
@@ -3136,4 +3146,13 @@ export default {
   border: 1px solid #d9edf7;
   //overflow: hidden;
 }
+.jin-text{
+  font-family: "Source Han Sans CN", "SourceHanSansCN", sans-serif !important;
+  font-weight: bold;
+  font-size: 20px;
+  color: #3E87F5;
+  // line-height: 29px;/
+  text-align: justify;
+  font-style: normal;
+}
 </style>

src/views/Loading.vue

@@ -5,56 +5,61 @@
 </template>
 
 <script>
-  import Cookies from 'vue-cookies'
-  import apiLogin from '@/api/login.js'
-  import { getToken,setToken } from '@/utils/token'
-  export default{
-    mounted(){
-      this.toUrl=this.$route.query.returnUrl;
-      let token=getToken();
-      let $this=this;
-      if(!token){
-        //console.log(token,'未获取token');
-        setTimeout(function(){
-          $this.curToken=getToken();
-          if(!$this.curToken){
-            //console.log(token,'第二次未获取token');
-            location.href = process.env.VUE_APP_LOGIN_URL;
-          }else{
-            $this.boeLogin();
+import Cookies from "vue-cookies";
+import apiLogin from "@/api/login.js";
+import { getToken, setToken } from "@/utils/token";
+export default {
+  mounted() {
+    this.toUrl = this.$route.query.returnUrl;
+    let token = getToken();
+    let $this = this;
+    if (!token) {
+      //console.log(token,'未获取token');
+      setTimeout(function () {
+        $this.curToken = getToken();
+        if (!$this.curToken) {
+          //console.log(token,'第二次未获取token');
+          if (top !== window) {
+            // 判断当前是否在iframe内
+            top.location.href = process.env.VUE_APP_LOGIN_URL;
+          } else {
+            window.location.href = process.env.VUE_APP_LOGIN_URL;
           }
-
-        },500);
-      }else{
-        this.curToken=token;
-        this.boeLogin();
-      }
-    },
-    data(){
-      return {
-        curToken:'',
-        toUrl:''
-      }
-    },
-    methods:{
-       boeLogin(){
-           apiLogin.boeLogin(this.curToken).then(rs=>{
-             if(rs.status==200){
-               //setToken(rs.result.access_token);
-               localStorage.setItem(this.$xpage.constants.newLoginKey,1);
-               if(this.toUrl){
-                 location.href=this.toUrl;
-               }else{
-                 this.$router.push({ path: "/index" })
-               }
-               //this.$router.push({ path: "/index" })
-             }else{
-               this.$message.error("登录失败："+rs.message);
-             }
-           })
-       }
+          // location.href = process.env.VUE_APP_LOGIN_URL;
+        } else {
+          $this.boeLogin();
+        }
+      }, 500);
+    } else {
+      this.curToken = token;
+      this.boeLogin();
     }
-  }
+  },
+  data() {
+    return {
+      curToken: "",
+      toUrl: "",
+    };
+  },
+  methods: {
+    boeLogin() {
+      apiLogin.boeLogin(this.curToken).then((rs) => {
+        if (rs.status == 200) {
+          //setToken(rs.result.access_token);
+          localStorage.setItem(this.$xpage.constants.newLoginKey, 1);
+          if (this.toUrl) {
+            location.href = this.toUrl;
+          } else {
+            this.$router.push({ path: "/index" });
+          }
+          //this.$router.push({ path: "/index" })
+        } else {
+          this.$message.error("登录失败：" + rs.message);
+        }
+      });
+    },
+  },
+};
 </script>
 
 <style>

src/views/portal/case/AICall.vue

@@ -2,17 +2,15 @@
   <div>
     <!-- 最大化状态的弹窗 -->
     <el-dialog
-      v-show=" windowState === 'maximized'"
-      v-if="dialogVisible"
+      v-if="dialogVisible && windowState === 'maximized'"
       :visible="true"
       :close-on-click-modal="false"
       :show-close="true"
       @close="onClose"
       class="case-expert-dialog"
       :modal="false"
-      :append-to-body="true"
       :fullscreen="false"
-      top="10vh"
+      top="0"
       v-resizeable
       v-draggable
     >
@@ -35,6 +33,7 @@
           class="welcome-message"
           ref="messageContainer"
           @scroll="handleScroll"
+          @wheel="handleWheel"
         >
           <div class="message-text" v-for="(item, index) in messageList" :key="index">
             <messages :messageData="item" :suggestions="suggestions" @getMinWindow="minimizeWindow"></messages>
@@ -193,7 +192,7 @@ export default {
               left: parseInt(dialogEl.style.left),
               top: parseInt(dialogEl.style.top)
             };
-            sessionStorage.setItem('aiCallDialogPosition', JSON.stringify(currentPosition));
+            // sessionStorage.setItem('aiCallDialogPosition', JSON.stringify(currentPosition));
 
             // 移除全局事件监听
             document.removeEventListener('mousemove', handleMouseMove);
@@ -498,6 +497,9 @@ export default {
   watch: {
     dialogVisible: {
       handler(newVal) {
+        console.log('dialogVisible发生变化');
+        console.log(newVal);
+        console.log(this.windowState);
         if (newVal) {
           this.$nextTick(() => {
             // 获取对话框元素
@@ -514,12 +516,12 @@ export default {
               }
 
               // 检查是否有保存的位置状态
-              const savedPosition = sessionStorage.getItem('aiCallDialogPosition');
-              if (savedPosition) {
-                const { left, top } = JSON.parse(savedPosition);
-                dialogEl.style.left = left + 'px';
-                dialogEl.style.top = top + 'px';
-              }
+              // const savedPosition = sessionStorage.getItem('aiCallDialogPosition');
+              // if (savedPosition) {
+              //   const { left, top } = JSON.parse(savedPosition);
+              //   dialogEl.style.left = left + 'px';
+              //   dialogEl.style.top = top + 'px';
+              // }
             }
 
             let doc = document.querySelector('.welcome-message')
@@ -566,7 +568,7 @@ closeMinimizedWindow() {
       console.log('关闭弹窗')
       // 清除保存的状态
       sessionStorage.removeItem('aiCallDialogSize');
-      sessionStorage.removeItem('aiCallDialogPosition');
+      // sessionStorage.removeItem('aiCallDialogPosition');
       this.$emit('close')
       // 可以在这里执行其他逻辑
     },
@@ -595,6 +597,7 @@ closeMinimizedWindow() {
 
     // 处理加载状态
     handleLoading(status) {
+      console.log('handleLoading---'+status);
       this.isLoading = status;
     },
 
@@ -655,6 +658,31 @@ closeMinimizedWindow() {
       }
     },
 
+    // 处理鼠标滚轮事件
+    handleWheel(event) {
+      const element = this.$refs.messageContainer;
+      if (!element) return;
+
+      // 阻止事件冒泡，防止滚动底层页面
+      event.stopPropagation();
+
+      // 计算滚动方向和距离
+      const delta = event.deltaY || event.detail || event.wheelDelta;
+
+      // 检查是否可以继续滚动
+      if (delta < 0 && element.scrollTop === 0) {
+        // 向上滚动且已在顶部，阻止默认行为
+        event.preventDefault();
+      } else if (delta > 0 && element.scrollHeight - element.scrollTop <= element.clientHeight) {
+        // 向下滚动且已在底部，阻止默认行为
+        event.preventDefault();
+      } else {
+        // 允许在容器内滚动
+        element.scrollTop += delta;
+        event.preventDefault();
+      }
+    },
+
     // 最小化窗口的点击事件处理方法
     onMinimizedWindowClick() {
       // 当点击最小化窗口时，如果dialogVisible为false，则通过事件通知父组件显示对话框
@@ -669,6 +697,9 @@ closeMinimizedWindow() {
 </script>
 
 <style scoped lang="scss">
+::v-deep .el-dialog__wrapper{
+  position: unset!important;
+}
 .case-expert-dialog {
   ::v-deep .el-dialog{
     background: url("./components/u762.svg") no-repeat ;
@@ -677,6 +708,8 @@ closeMinimizedWindow() {
     overflow: hidden;
     display: flex;
     flex-direction: column;
+    pointer-events: auto;
+    z-index: 2000;
 
     //background-color: rgba(255, 255, 255, 0.8);
   }

src/views/portal/case/components/sendMessage.vue

@@ -5,7 +5,7 @@
       type="textarea"
       class="input-placeholder"
       placeholder="有问题，尽管问"
-      @keyup.enter.native="handleSend"
+      @keyup.enter.native.prevent="handleSend"
       :disabled="disabled"
       :autosize="{ minRows: 2, maxRows: 4}"
       resize="none"
@@ -56,7 +56,14 @@ export default {
     }
   },
   methods: {
-    handleSend() {
+    handleSend(event) {
+      // 阻止事件的默认行为和冒泡
+      if (event) {
+        event.preventDefault();
+        event.stopPropagation();
+        console.log('preventDefault');
+      }
+      console.log('handleSend');
       if (!this.inputContent.trim() || this.disabled) return
       // 添加用户消息到列表
       const userMessage = {

src/views/portal/course/Index.vue

@@ -2590,7 +2590,7 @@ a.custom2 {
 }
 
 .course-tags {
-  margin: 5px 0;
+  margin: 10px 0 0;
   min-height: 20px;
 }
 

src/views/portal/course/qualityCourse.vue

@@ -2477,6 +2477,10 @@ export default {
   background-color: #f4f4f5;
   border-color: #e9e9eb;
 }
+.course-tags {
+  margin: 10px 0 0;
+  min-height: 20px;
+}
 .course-tags ::v-deep .el-tag .keyword-highlight,
 .course-tags ::v-deep .el-tag .exact-match-highlight {
   color: #387DF7 !important;