Compare commits

..

96 Commits

Author SHA1 Message Date
zhangsir
fa044187bc 个人中心临时修改,后期优化 2024-09-19 16:55:26 +08:00
zhangsir
5119aadf66 防止404报错,临时注释 2024-09-11 20:19:08 +08:00
zhangsir
59571d216e 修改其他问题 2024-07-17 18:38:20 +08:00
zhangsir
f6244aa462 修改其他问题 2024-07-17 14:58:30 +08:00
zhangsir
f854a9c5e9 排查问题4 2024-07-17 13:55:52 +08:00
zhangsir
cb708079ba 排查问题3 2024-07-17 11:49:09 +08:00
zhangsir
8a933a6330 排查问题2 2024-07-17 11:32:12 +08:00
zhangsir
18adb406a2 排查问题1 2024-07-17 10:37:26 +08:00
zhangsir
b40dd4fb96 排查问题 2024-07-17 09:48:42 +08:00
zhangsir
e82b7eb3cf 细节 2024-07-15 19:58:00 +08:00
zhangsir
c054026259 修改接口 2024-07-12 15:57:05 +08:00
zhangsir
482cd48571 修改接口 2024-07-12 14:34:03 +08:00
zhangsir
2dc9bcdbd3 修改 2024-07-11 19:09:02 +08:00
zhangsir
3e57c4bedb 展示方式 2024-07-11 15:01:38 +08:00
zhangsir
d9bc4603af 没参数修改调用接口 2024-07-11 13:49:34 +08:00
zhangsir
158c836cd1 细节 2024-07-11 10:59:07 +08:00
zhangsir
972f2cb097 小细节 2024-07-10 19:28:48 +08:00
zhangsir
c98e079684 修改文字 2024-07-10 16:47:29 +08:00
zhangsir
a07f38d33c 修改专业力必修显示问题 2024-07-10 10:02:31 +08:00
zhangsir
21cf02d873 修改任务、飞机定位 2024-07-08 19:00:13 +08:00
zhangsir
275e59987f 已读调接口 2024-07-08 10:42:32 +08:00
zhangsir
cb43195803 未读数量 2024-07-08 09:54:14 +08:00
zhangsir
ddbb6c7a2e Merge branch 'boe_0705_master' into zcwy-master
# Conflicts:
#	src/assets/images/ban.png
#	src/views/study/coursenew.vue
2024-07-05 17:31:29 +08:00
zhangsir
0e18d143d9 Merge branch 'dev0124' into zcwy-master 2024-07-05 14:56:02 +08:00
zhangsir
99ea8d35c9 细节 2024-07-05 14:53:23 +08:00
zhangsir
dfda1936c7 细节 2024-07-03 18:19:22 +08:00
zhangsir
b120e0f53b 路径图调整 2024-07-01 16:43:27 +08:00
zhangsir
a143a8ecaa 路径图调整 2024-07-01 16:19:29 +08:00
zhangsir
458e20e4c2 细节 2024-07-01 15:46:01 +08:00
zhangsir
8883cce52f 合并 2024-06-28 16:48:27 +08:00
zhangsir
2aa861c2a1 左侧菜单 2024-06-28 14:17:48 +08:00
zhangsir
bc408c039e Merge branch 'dev0124' into zcwy-master
# Conflicts:
#	src/components/UserCenter/menu.vue
#	src/router/index.js
2024-06-28 13:33:25 +08:00
zhangsir
4269bff0b5 左侧菜单 2024-06-28 13:30:08 +08:00
zhangsir
c0575661c0 xijie 2024-06-27 20:35:52 +08:00
zhangsir
2030879c1f 左侧菜单 2024-06-27 19:02:42 +08:00
zhangsir
233f21e310 细节 2024-06-27 14:02:00 +08:00
zhangsir
ef0bcbf542 细节 2024-06-27 11:09:37 +08:00
zhangsir
3d018a4221 合并 2024-06-26 11:17:57 +08:00
zhangsir
8db79d599b 考试 2024-06-26 09:05:10 +08:00
zhangsir
4d96ad1b22 路径 2024-06-25 23:03:22 +08:00
zhangsir
bee4253448 考试 2024-06-25 20:12:51 +08:00
zhangsir
99cd7cea6b 跳转 2024-06-25 20:09:29 +08:00
zhangsir
6ebafa6ed7 考试细节 2024-06-25 13:53:14 +08:00
zhangsir
9c198f52a3 全岗位 2024-06-24 20:53:11 +08:00
zhangsir
94de112f49 全岗位 2024-06-24 14:17:59 +08:00
zhangsir
2f9c3827ee 修改考试样式 2024-06-24 11:36:58 +08:00
zhangsir
245ce904ac 细节 2024-06-22 17:22:25 +08:00
zhangsir
7a413ff1c7 路径图定位完善 2024-06-21 14:59:03 +08:00
zhangsir
cd9bf1261a 路径图细节除定位完善 2024-06-21 13:35:21 +08:00
zhangsir
95ba2f107b 路径图显示 2024-06-20 17:11:58 +08:00
zhangsir
0a6548ba57 审核回退 2024-06-20 14:09:09 +08:00
zhangsir
eee49b3742 审核 2024-06-20 12:02:23 +08:00
zhangsir
f133294879 细节 2024-06-20 11:46:04 +08:00
zhangsir
94595f256d 细节 2024-06-19 19:54:52 +08:00
zhangsir
17528eb465 考试状态 2024-06-19 16:28:59 +08:00
zhangsir
10f955a58f 修改图片 2024-06-18 15:29:04 +08:00
zhangsir
b691688775 取消错误提示 2024-06-18 11:34:53 +08:00
zhangsir
d8a69328f1 弹窗修改 2024-06-17 09:47:16 +08:00
zhangsir
10e82a1608 修改显示方式 2024-06-17 08:54:33 +08:00
zhangsir
a535b6ee85 课程优化 2024-06-14 16:19:28 +08:00
zhangsir
3264dcaa43 差只展示一个 2024-06-13 17:30:57 +08:00
zhangsir
c37442103a 在线课程修改 2024-06-12 18:11:37 +08:00
zhangsir
549b74d47d 设置空状态 2024-06-11 17:31:35 +08:00
zhangsir
0afaea52ba 成长路径 2024-06-11 17:24:41 +08:00
zhangsir
dd52845b19 修改路径 2024-06-04 11:58:44 +08:00
zhangsir
dc118c19ee 路径静态修改 2024-05-11 10:39:36 +08:00
zhangsir
3f2db4136c 路径图整体修改 2024-05-10 18:22:06 +08:00
NiSen
e82ea0709d 还原 2024-01-29 11:03:45 +08:00
NiSen
fd704f91d2 滚动图 2024-01-29 11:03:30 +08:00
NiSen
1eb82c3871 小手 2024-01-26 13:57:22 +08:00
NiSen
9d57cab7d3 u选小课堂跳转 2024-01-26 13:56:00 +08:00
NiSen
83257c5fba 信息概览 2024-01-25 16:32:38 +08:00
NiSen
8167d9f430 表格 2024-01-25 16:24:26 +08:00
NiSen
e08ec8484f title 2024-01-25 15:58:50 +08:00
NiSen
29d5ae0100 上次提交是iconTitle也会移入弹框 2024-01-25 15:57:22 +08:00
NiSen
128f21e454 移入 2024-01-25 15:39:31 +08:00
NiSen
a74a3dc225 点击显示弹窗 2024-01-25 15:32:03 +08:00
NiSen
2c29bb5b03 路径图坐标 2024-01-25 14:25:28 +08:00
NiSen
9da8b65739 图标 2024-01-25 13:58:43 +08:00
NiSen
aec5834061 信息概览 2024-01-25 13:20:07 +08:00
NiSen
8619646405 1 2024-01-25 13:08:25 +08:00
NiSen
e1eef650ee 1 2024-01-25 12:45:52 +08:00
NiSen
52412849fe 合并单元格 2024-01-25 12:45:32 +08:00
NiSen
cf4a114eb6 align="center" 2024-01-25 12:18:32 +08:00
NiSen
dd96b610bd 全岗位路径 2024-01-25 12:14:01 +08:00
NiSen
c7ce891634 颜色 2024-01-25 10:35:47 +08:00
NiSen
b2177abe20 颜色调整 2024-01-25 10:35:07 +08:00
NiSen
660d834c30 1 2024-01-25 10:03:08 +08:00
NiSen
ebdd865e71 1 2024-01-25 09:49:12 +08:00
NiSen
302c3fac3b 2 2024-01-25 09:41:03 +08:00
NiSen
d8e8efdba3 修改位置 2024-01-24 17:49:54 +08:00
NiSen
2b617297f9 growth页面 2024-01-24 17:45:53 +08:00
NiSen
d06e4b40dd 样式 2024-01-24 15:32:17 +08:00
NiSen
9b7b073011 样式 2024-01-24 15:23:05 +08:00
NiSen
e6581ffbbe 成长路径图 2024-01-24 11:43:52 +08:00
NiSen
fcfc575a4c 成长路径图的页面 2024-01-24 10:59:02 +08:00
199 changed files with 10652 additions and 24664 deletions

View File

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

View File

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

View File

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

View File

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

5677
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 689 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 438 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 665 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 169 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 957 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

11
src/api/growth/index.js Normal file
View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 360 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 467 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 412 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 474 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 427 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 471 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 424 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 461 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 689 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 625 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 514 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 665 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 576 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 475 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 528 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 476 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 540 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 387 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 413 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 425 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 398 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 166 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 69 KiB

After

Width:  |  Height:  |  Size: 362 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 657 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 470 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 442 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 422 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 649 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 89 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 360 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 280 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 503 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 625 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 586 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 818 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 139 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 212 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 229 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 215 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 217 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 220 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 200 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 185 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 84 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 111 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 244 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 186 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 182 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 150 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 690 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 683 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

Some files were not shown because too many files have changed in this diff Show More