Compare commits
1 Commits
20260918-s
...
boe104_goo
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
98c891bc23 |
@@ -41,7 +41,6 @@ VUE_APP_PUBLIC_PATH='/pc'
|
|||||||
VUE_APP_MANAGER_PATH='/manage'
|
VUE_APP_MANAGER_PATH='/manage'
|
||||||
VUE_APP_STUDENT_PATH='/fe-student'
|
VUE_APP_STUDENT_PATH='/fe-student'
|
||||||
VUE_APP_MANAGER_API_PATH='/manageApi'
|
VUE_APP_MANAGER_API_PATH='/manageApi'
|
||||||
VUE_APP_GROWTH_API_PATH=''
|
|
||||||
|
|
||||||
# 路由懒加载
|
# 路由懒加载
|
||||||
VUE_CLI_BABEL_TRANSPILE_MODULES = true
|
VUE_CLI_BABEL_TRANSPILE_MODULES = true
|
||||||
|
|||||||
@@ -37,7 +37,6 @@ VUE_APP_PUBLIC_PATH='/pc-release'
|
|||||||
VUE_APP_MANAGER_PATH='/manage-release'
|
VUE_APP_MANAGER_PATH='/manage-release'
|
||||||
VUE_APP_STUDENT_PATH='/fe-student-release'
|
VUE_APP_STUDENT_PATH='/fe-student-release'
|
||||||
VUE_APP_MANAGER_API_PATH='/manageApi-release'
|
VUE_APP_MANAGER_API_PATH='/manageApi-release'
|
||||||
VUE_APP_GROWTH_API_PATH='/growth'
|
|
||||||
|
|
||||||
# 登录地址
|
# 登录地址
|
||||||
VUE_APP_LOGIN_URL='https://u.boe.com/web-release/'
|
VUE_APP_LOGIN_URL='https://u.boe.com/web-release/'
|
||||||
|
|||||||
@@ -37,7 +37,6 @@ VUE_APP_PUBLIC_PATH='/pc'
|
|||||||
VUE_APP_MANAGER_PATH='/manage'
|
VUE_APP_MANAGER_PATH='/manage'
|
||||||
VUE_APP_STUDENT_PATH='/fe-student'
|
VUE_APP_STUDENT_PATH='/fe-student'
|
||||||
VUE_APP_MANAGER_API_PATH='/manageApi'
|
VUE_APP_MANAGER_API_PATH='/manageApi'
|
||||||
VUE_APP_GROWTH_API_PATH='/growth'
|
|
||||||
|
|
||||||
# 登录地址
|
# 登录地址
|
||||||
VUE_APP_LOGIN_URL='https://u.boe.com/web/'
|
VUE_APP_LOGIN_URL='https://u.boe.com/web/'
|
||||||
|
|||||||
@@ -36,7 +36,6 @@ VUE_APP_PUBLIC_PATH='/pc'
|
|||||||
VUE_APP_MANAGER_PATH='/manage'
|
VUE_APP_MANAGER_PATH='/manage'
|
||||||
VUE_APP_STUDENT_PATH='/fe-student'
|
VUE_APP_STUDENT_PATH='/fe-student'
|
||||||
VUE_APP_MANAGER_API_PATH='/manageApi'
|
VUE_APP_MANAGER_API_PATH='/manageApi'
|
||||||
VUE_APP_GROWTH_API_PATH='/growth'
|
|
||||||
|
|
||||||
# 登录地址
|
# 登录地址
|
||||||
VUE_APP_LOGIN_URL='https://u-pre.boe.com/web/'
|
VUE_APP_LOGIN_URL='https://u-pre.boe.com/web/'
|
||||||
|
|||||||
16540
package-lock.json
generated
|
Before Width: | Height: | Size: 689 B |
|
Before Width: | Height: | Size: 665 B |
|
Before Width: | Height: | Size: 169 KiB |
|
Before Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 957 B |
@@ -41,7 +41,7 @@ const formRequest=axios.create({
|
|||||||
}
|
}
|
||||||
return config
|
return config
|
||||||
}, error => {
|
}, error => {
|
||||||
console.log(error)
|
// console.log(error)
|
||||||
Promise.reject(error)
|
Promise.reject(error)
|
||||||
});
|
});
|
||||||
formRequest.interceptors.response.use(res => {
|
formRequest.interceptors.response.use(res => {
|
||||||
@@ -66,7 +66,7 @@ const formRequest=axios.create({
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
error => {
|
error => {
|
||||||
console.log('err' + error)
|
// console.log('err' + error)
|
||||||
let { message } = error;
|
let { message } = error;
|
||||||
if (message == "Network Error") {
|
if (message == "Network Error") {
|
||||||
message = "网络异常,请稍后重试";
|
message = "网络异常,请稍后重试";
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ const formRequest=axios.create({
|
|||||||
// axios中请求配置有baseURL选项,表示请求URL公共部分
|
// axios中请求配置有baseURL选项,表示请求URL公共部分
|
||||||
// baseURL: process.env.VUE_APP_CESOURCE_BASE_API,
|
// baseURL: process.env.VUE_APP_CESOURCE_BASE_API,
|
||||||
//超时
|
//超时
|
||||||
timeout: 10000,
|
timeout: 15000,
|
||||||
})
|
})
|
||||||
//发送json对象的拦截器
|
//发送json对象的拦截器
|
||||||
formRequest.interceptors.request.use(config => {
|
formRequest.interceptors.request.use(config => {
|
||||||
@@ -43,7 +43,7 @@ const formRequest=axios.create({
|
|||||||
}
|
}
|
||||||
return config
|
return config
|
||||||
}, error => {
|
}, error => {
|
||||||
console.log(error)
|
// console.log(error)
|
||||||
Promise.reject(error)
|
Promise.reject(error)
|
||||||
});
|
});
|
||||||
formRequest.interceptors.response.use(res => {
|
formRequest.interceptors.response.use(res => {
|
||||||
@@ -68,7 +68,7 @@ const formRequest=axios.create({
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
error => {
|
error => {
|
||||||
console.log('err',error)
|
// console.log('err',error)
|
||||||
let { message } = error;
|
let { message } = error;
|
||||||
if (message == "Network Error") {
|
if (message == "Network Error") {
|
||||||
message = "网络异常,请稍后重试";
|
message = "网络异常,请稍后重试";
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ const jsonRequest=axios.create({
|
|||||||
// axios中请求配置有baseURL选项,表示请求URL公共部分
|
// axios中请求配置有baseURL选项,表示请求URL公共部分
|
||||||
baseURL: process.env.VUE_APP_BOE_BASE_API,
|
baseURL: process.env.VUE_APP_BOE_BASE_API,
|
||||||
//超时
|
//超时
|
||||||
timeout: 10000,
|
timeout: 15000,
|
||||||
});
|
});
|
||||||
//发送json对象的拦截器
|
//发送json对象的拦截器
|
||||||
jsonRequest.interceptors.request.use(config => {
|
jsonRequest.interceptors.request.use(config => {
|
||||||
@@ -39,7 +39,7 @@ jsonRequest.interceptors.request.use(config => {
|
|||||||
}
|
}
|
||||||
return config
|
return config
|
||||||
}, error => {
|
}, error => {
|
||||||
console.log(error)
|
// console.log(error)
|
||||||
Promise.reject(error)
|
Promise.reject(error)
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -69,7 +69,7 @@ jsonRequest.interceptors.response.use(res => {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
error => {
|
error => {
|
||||||
console.log('err' + error)
|
// console.log('err' + error)
|
||||||
let { message } = error;
|
let { message } = error;
|
||||||
if (message == "Network Error") {
|
if (message == "Network Error") {
|
||||||
message = "网络异常,请稍后重试";
|
message = "网络异常,请稍后重试";
|
||||||
@@ -96,7 +96,7 @@ const formRequest=axios.create({
|
|||||||
// axios中请求配置有baseURL选项,表示请求URL公共部分
|
// axios中请求配置有baseURL选项,表示请求URL公共部分
|
||||||
baseURL: process.env.VUE_APP_BOE_BASE_API,
|
baseURL: process.env.VUE_APP_BOE_BASE_API,
|
||||||
//超时
|
//超时
|
||||||
timeout: 10000,
|
timeout: 15000,
|
||||||
})
|
})
|
||||||
//发送json对象的拦截器
|
//发送json对象的拦截器
|
||||||
formRequest.interceptors.request.use(config => {
|
formRequest.interceptors.request.use(config => {
|
||||||
@@ -107,7 +107,7 @@ formRequest.interceptors.request.use(config => {
|
|||||||
}
|
}
|
||||||
return config
|
return config
|
||||||
}, error => {
|
}, error => {
|
||||||
console.log(error)
|
// console.log(error)
|
||||||
Promise.reject(error)
|
Promise.reject(error)
|
||||||
});
|
});
|
||||||
formRequest.interceptors.response.use(res => {
|
formRequest.interceptors.response.use(res => {
|
||||||
@@ -132,7 +132,7 @@ formRequest.interceptors.response.use(res => {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
error => {
|
error => {
|
||||||
console.log('err' + error)
|
// console.log('err' + error)
|
||||||
let { message } = error;
|
let { message } = error;
|
||||||
if (message == "Network Error") {
|
if (message == "Network Error") {
|
||||||
message = "网络异常,请稍后重试";
|
message = "网络异常,请稍后重试";
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
/**我的授课记录*/
|
/**我的授课记录*/
|
||||||
import ajax from '@/api/boe/boeApiAjax.js'
|
import ajax from '@/api/boe/boeApiAjax.js'
|
||||||
import ajax2 from '@/api/unionAjax.js'
|
|
||||||
import axios from 'axios'
|
import axios from 'axios'
|
||||||
import { getToken } from '@/utils/token'
|
import { getToken } from '@/utils/token'
|
||||||
const baseURL = process.env.VUE_APP_BOE_BASE_API;
|
const baseURL = process.env.VUE_APP_BOE_BASE_API;
|
||||||
@@ -61,63 +60,13 @@ const exportStudentOfTearcher = function(userId) {
|
|||||||
const courseRecordList = function(data) {
|
const courseRecordList = function(data) {
|
||||||
return ajax.postJson('/b1/system/teacher/teacher-course-list',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 {
|
export default {
|
||||||
courseRecordExport,
|
courseRecordExport,
|
||||||
courseRecordExport2,
|
|
||||||
courseRecordList,
|
courseRecordList,
|
||||||
getListByToken,
|
|
||||||
exportStudentOfCourse,
|
exportStudentOfCourse,
|
||||||
exportStudentOfCourse2,
|
exportStudentOfTearcher
|
||||||
exportStudentOfTearcher,
|
|
||||||
exportStudentOfTearcher2,
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ const jsonRequest=axios.create({
|
|||||||
// axios中请求配置有baseURL选项,表示请求URL公共部分
|
// axios中请求配置有baseURL选项,表示请求URL公共部分
|
||||||
baseURL: process.env.VUE_APP_CESOURCE_BASE_API,
|
baseURL: process.env.VUE_APP_CESOURCE_BASE_API,
|
||||||
//超时
|
//超时
|
||||||
timeout: 10000,
|
timeout: 15000,
|
||||||
});
|
});
|
||||||
//发送json对象的拦截器
|
//发送json对象的拦截器
|
||||||
jsonRequest.interceptors.request.use(config => {
|
jsonRequest.interceptors.request.use(config => {
|
||||||
@@ -37,7 +37,7 @@ jsonRequest.interceptors.request.use(config => {
|
|||||||
}
|
}
|
||||||
return config
|
return config
|
||||||
}, error => {
|
}, error => {
|
||||||
console.log(error)
|
// console.log(error)
|
||||||
Promise.reject(error)
|
Promise.reject(error)
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -65,7 +65,7 @@ jsonRequest.interceptors.response.use(res => {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
error => {
|
error => {
|
||||||
console.log('err' + error)
|
// console.log('err' + error)
|
||||||
let { message } = error;
|
let { message } = error;
|
||||||
if (message == "Network Error") {
|
if (message == "Network Error") {
|
||||||
message = "网络异常,请稍后重试";
|
message = "网络异常,请稍后重试";
|
||||||
@@ -91,7 +91,7 @@ const formRequest=axios.create({
|
|||||||
// axios中请求配置有baseURL选项,表示请求URL公共部分
|
// axios中请求配置有baseURL选项,表示请求URL公共部分
|
||||||
baseURL: process.env.VUE_APP_CESOURCE_BASE_API,
|
baseURL: process.env.VUE_APP_CESOURCE_BASE_API,
|
||||||
//超时
|
//超时
|
||||||
timeout: 10000,
|
timeout: 15000,
|
||||||
})
|
})
|
||||||
//发送json对象的拦截器
|
//发送json对象的拦截器
|
||||||
formRequest.interceptors.request.use(config => {
|
formRequest.interceptors.request.use(config => {
|
||||||
@@ -102,7 +102,7 @@ formRequest.interceptors.request.use(config => {
|
|||||||
}
|
}
|
||||||
return config
|
return config
|
||||||
}, error => {
|
}, error => {
|
||||||
console.log(error)
|
// console.log(error)
|
||||||
Promise.reject(error)
|
Promise.reject(error)
|
||||||
});
|
});
|
||||||
formRequest.interceptors.response.use(res => {
|
formRequest.interceptors.response.use(res => {
|
||||||
@@ -126,7 +126,7 @@ formRequest.interceptors.response.use(res => {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
error => {
|
error => {
|
||||||
console.log('err' + error)
|
// console.log('err' + error)
|
||||||
let { message } = error;
|
let { message } = error;
|
||||||
if (message == "Network Error") {
|
if (message == "Network Error") {
|
||||||
message = "网络异常,请稍后重试";
|
message = "网络异常,请稍后重试";
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ const jsonRequest=axios.create({
|
|||||||
// axios中请求配置有baseURL选项,表示请求URL公共部分
|
// axios中请求配置有baseURL选项,表示请求URL公共部分
|
||||||
baseURL: process.env.VUE_APP_STAT_BASE_API,
|
baseURL: process.env.VUE_APP_STAT_BASE_API,
|
||||||
//超时
|
//超时
|
||||||
timeout: 10000,
|
timeout: 15000,
|
||||||
});
|
});
|
||||||
//发送json对象的拦截器
|
//发送json对象的拦截器
|
||||||
jsonRequest.interceptors.request.use(config => {
|
jsonRequest.interceptors.request.use(config => {
|
||||||
@@ -37,7 +37,7 @@ jsonRequest.interceptors.request.use(config => {
|
|||||||
}
|
}
|
||||||
return config
|
return config
|
||||||
}, error => {
|
}, error => {
|
||||||
console.log(error)
|
// console.log(error)
|
||||||
Promise.reject(error)
|
Promise.reject(error)
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -65,7 +65,7 @@ jsonRequest.interceptors.response.use(res => {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
error => {
|
error => {
|
||||||
console.log('err' + error)
|
// console.log('err' + error)
|
||||||
let { message } = error;
|
let { message } = error;
|
||||||
if (message == "Network Error") {
|
if (message == "Network Error") {
|
||||||
message = "网络异常,请稍后重试";
|
message = "网络异常,请稍后重试";
|
||||||
@@ -91,7 +91,7 @@ const formRequest=axios.create({
|
|||||||
// axios中请求配置有baseURL选项,表示请求URL公共部分
|
// axios中请求配置有baseURL选项,表示请求URL公共部分
|
||||||
baseURL: process.env.VUE_APP_STAT_BASE_API,
|
baseURL: process.env.VUE_APP_STAT_BASE_API,
|
||||||
//超时
|
//超时
|
||||||
timeout: 10000,
|
timeout: 15000,
|
||||||
})
|
})
|
||||||
//发送json对象的拦截器
|
//发送json对象的拦截器
|
||||||
formRequest.interceptors.request.use(config => {
|
formRequest.interceptors.request.use(config => {
|
||||||
@@ -102,7 +102,7 @@ formRequest.interceptors.request.use(config => {
|
|||||||
}
|
}
|
||||||
return config
|
return config
|
||||||
}, error => {
|
}, error => {
|
||||||
console.log(error)
|
// console.log(error)
|
||||||
Promise.reject(error)
|
Promise.reject(error)
|
||||||
});
|
});
|
||||||
formRequest.interceptors.response.use(res => {
|
formRequest.interceptors.response.use(res => {
|
||||||
@@ -126,7 +126,7 @@ formRequest.interceptors.response.use(res => {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
error => {
|
error => {
|
||||||
console.log('err' + error)
|
// console.log('err' + error)
|
||||||
let { message } = error;
|
let { message } = error;
|
||||||
if (message == "Network Error") {
|
if (message == "Network Error") {
|
||||||
message = "网络异常,请稍后重试";
|
message = "网络异常,请稍后重试";
|
||||||
|
|||||||
@@ -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 })
|
|
||||||
@@ -34,48 +34,9 @@ const userRsSginupCourse = function(data){
|
|||||||
return ajax.postJson(baseURL,'/stu/project/stuCancelEnrollment',data);
|
return ajax.postJson(baseURL,'/stu/project/stuCancelEnrollment',data);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 获取学员指定新员工转正项目的bpm审批状况
|
|
||||||
* {studentId,pid}
|
|
||||||
* add by zhengsongbo on 2025-07-12
|
|
||||||
*/
|
|
||||||
const getStudntProjectInfo = function(pid){
|
|
||||||
return ajax.get(baseURL,`/stu/project/queryStudentInfo?pid=${pid}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* BPM项目:立即报名
|
|
||||||
* pid
|
|
||||||
* add by zhengsongbo on 2025-07-13
|
|
||||||
*/
|
|
||||||
const signUpBpmProjectNow = function(pid){
|
|
||||||
return ajax.get(baseURL,`/stu/project/signUpBpmProjectNow?pid=${pid}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* BPM项目:重新报名
|
|
||||||
* pid
|
|
||||||
* add by zhengsongbo on 2025-07-13
|
|
||||||
*/
|
|
||||||
const signUpBpmProjectAgain = function(pid){
|
|
||||||
return ajax.get(baseURL,`/stu/project/signUpBpmProjectAgain?pid=${pid}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 社招新员工
|
|
||||||
* add by zhengsongbo on 2025-07-14
|
|
||||||
*/
|
|
||||||
const getNewSocialHireProject = function(){
|
|
||||||
return ajax.get(baseURL,'/stu/project/getNewSocialHireProject');
|
|
||||||
}
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
getTaskNum,
|
getTaskNum,
|
||||||
userTaskList,
|
userTaskList,
|
||||||
userDeleteStudy,
|
userDeleteStudy,
|
||||||
userRsSginupCourse,
|
userRsSginupCourse
|
||||||
getStudntProjectInfo,
|
|
||||||
signUpBpmProjectNow,
|
|
||||||
signUpBpmProjectAgain,
|
|
||||||
getNewSocialHireProject
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/* 案例模块的相关处理*/
|
/* 案例模块的相关处理*/
|
||||||
import ajax from '@/utils/xajax.js'
|
import ajax from '@/utils/xajax.js'
|
||||||
import ajaxs from '@/api/ajax.js'
|
|
||||||
/**首页查询
|
/**首页查询
|
||||||
* pageSize
|
* pageSize
|
||||||
* orderField
|
* orderField
|
||||||
@@ -88,12 +88,6 @@ const usernameList = function (pageSize) {
|
|||||||
const queryPraises = function (pageSize) {
|
const queryPraises = function (pageSize) {
|
||||||
return ajax.get(`/xboe/m/boe/cases/query-praises?pageSize=${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 长度
|
@param pageSize 长度
|
||||||
@@ -101,9 +95,6 @@ const queryRecommendRank = function (pageSize) {
|
|||||||
const queryComments = function (pageSize) {
|
const queryComments = function (pageSize) {
|
||||||
return ajax.get(`/xboe/m/boe/cases/query-comments?pageSize=${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 = {}) {
|
const caseYears = function (query = {}) {
|
||||||
return ajax.post('/xboe/m/boe/cases/caseYears', 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 {
|
export default {
|
||||||
queryAllTimePopularityOfMajor,
|
|
||||||
getQueryRecommendRank,
|
|
||||||
queryPopularityOfMajor,
|
|
||||||
browsingHistory,
|
|
||||||
queryViewRecord,
|
|
||||||
queryFavoriteCaseOfIndex,
|
|
||||||
riseIntoRank,
|
|
||||||
cancelRiseIntoRank,
|
|
||||||
adjustRank,
|
|
||||||
indexList,
|
indexList,
|
||||||
queryList,
|
queryList,
|
||||||
queryListV2,
|
queryListV2,
|
||||||
@@ -236,10 +202,7 @@ export default {
|
|||||||
query,
|
query,
|
||||||
usernameList,
|
usernameList,
|
||||||
queryPraises,
|
queryPraises,
|
||||||
queryPraisesNew,
|
|
||||||
queryRecommendRank,
|
|
||||||
queryComments,
|
queryComments,
|
||||||
queryCommentsNew,
|
|
||||||
majorTypes,
|
majorTypes,
|
||||||
details,
|
details,
|
||||||
ids,
|
ids,
|
||||||
|
|||||||
@@ -170,9 +170,7 @@ const updateContentOrders = function(cid,items) {
|
|||||||
const detail = function(id) {
|
const detail = function(id) {
|
||||||
return ajax.get('/xboe/m/course/manage/detail?id=' + 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
|
* @param {Object} data
|
||||||
@@ -448,7 +446,6 @@ export default {
|
|||||||
findUpdateLogs,
|
findUpdateLogs,
|
||||||
getUpdateLog,
|
getUpdateLog,
|
||||||
detail,
|
detail,
|
||||||
getDictIds,
|
|
||||||
saveContent,
|
saveContent,
|
||||||
pageList,
|
pageList,
|
||||||
setEnabled,
|
setEnabled,
|
||||||
|
|||||||
@@ -114,10 +114,6 @@ const studyVideoTime = function(data) {
|
|||||||
return ajax.post('/xboe/school/study/course/study-video-time',data);
|
return ajax.post('/xboe/school/study/course/study-video-time',data);
|
||||||
}
|
}
|
||||||
|
|
||||||
const updateStudyVideoTime = function(data) {
|
|
||||||
return ajax.post('/xboe/school/study/course/updateStudyVideoTime',data);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取上一次的学习内容
|
* 获取上一次的学习内容
|
||||||
* @returns
|
* @returns
|
||||||
@@ -342,7 +338,7 @@ const myExamList = function(itemId) {
|
|||||||
contentId:''
|
contentId:''
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
const myExamList2 = function(data) {
|
const myExamList2 = function(data) {
|
||||||
return ajax.post('/xboe/school/study/exam/list-study',data);
|
return ajax.post('/xboe/school/study/exam/list-study',data);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -393,10 +389,7 @@ const followIds=function (data){
|
|||||||
const myStudysFromES=function (data){
|
const myStudysFromES=function (data){
|
||||||
return ajax.post('/xboe/school/study/es/search',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数组*/
|
/**根据id集合查询,传入的是id数组*/
|
||||||
const findByIds=function (ids){
|
const findByIds=function (ids){
|
||||||
return ajax.postJson('/xboe/school/study/es/list-by-ids',ids);
|
return ajax.postJson('/xboe/school/study/es/list-by-ids',ids);
|
||||||
@@ -412,7 +405,6 @@ export default {
|
|||||||
studyIndex,
|
studyIndex,
|
||||||
studyInfo,
|
studyInfo,
|
||||||
studyVideoTime,
|
studyVideoTime,
|
||||||
updateStudyVideoTime,
|
|
||||||
lastStudy,
|
lastStudy,
|
||||||
studyContent,
|
studyContent,
|
||||||
appendStudyTime,
|
appendStudyTime,
|
||||||
@@ -433,7 +425,6 @@ export default {
|
|||||||
myExamList2,
|
myExamList2,
|
||||||
myCourseStudy,
|
myCourseStudy,
|
||||||
myStudysFromES,
|
myStudysFromES,
|
||||||
homeworkExport,
|
|
||||||
findByIds,
|
findByIds,
|
||||||
deleteSignUp,
|
deleteSignUp,
|
||||||
ids,
|
ids,
|
||||||
|
|||||||
@@ -72,9 +72,6 @@ const querypaper = function(data) {
|
|||||||
const getPaperContent = function(id) {
|
const getPaperContent = function(id) {
|
||||||
return ajax.get('/xboe/m/exam/paper/paper-content?id=' + 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 {
|
export default {
|
||||||
detail,
|
detail,
|
||||||
update,
|
update,
|
||||||
@@ -83,7 +80,6 @@ export default {
|
|||||||
querylist,
|
querylist,
|
||||||
querypaper,
|
querypaper,
|
||||||
getPaperContent,
|
getPaperContent,
|
||||||
newPaperContent,
|
|
||||||
batchImportCount,
|
batchImportCount,
|
||||||
batchImportData
|
batchImportData
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import ajax from '@/utils/xajax.js'
|
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);
|
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){
|
const updateTeacher=function(data){
|
||||||
return ajax.postJson('/xboe/teacher/update-teacher',data);
|
return ajax.postJson('/xboe/teacher/update-teacher',data);
|
||||||
}
|
}
|
||||||
@@ -219,7 +217,7 @@ export default {
|
|||||||
update,
|
update,
|
||||||
del,
|
del,
|
||||||
detail,
|
detail,
|
||||||
findByNameNew,
|
findByName,
|
||||||
updateSysId,
|
updateSysId,
|
||||||
has,
|
has,
|
||||||
start,
|
start,
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ const formRequest = axios.create({
|
|||||||
// axios中请求配置有baseURL选项,表示请求URL公共部分
|
// axios中请求配置有baseURL选项,表示请求URL公共部分
|
||||||
// baseURL: process.env.VUE_APP_CESOURCE_BASE_API,
|
// baseURL: process.env.VUE_APP_CESOURCE_BASE_API,
|
||||||
//超时
|
//超时
|
||||||
timeout: 10000,
|
timeout: 15000,
|
||||||
})
|
})
|
||||||
//发送json对象的拦截器
|
//发送json对象的拦截器
|
||||||
formRequest.interceptors.request.use(config => {
|
formRequest.interceptors.request.use(config => {
|
||||||
@@ -44,7 +44,7 @@ formRequest.interceptors.request.use(config => {
|
|||||||
}
|
}
|
||||||
return config
|
return config
|
||||||
}, error => {
|
}, error => {
|
||||||
console.log(error)
|
// console.log(error)
|
||||||
Promise.reject(error)
|
Promise.reject(error)
|
||||||
});
|
});
|
||||||
formRequest.interceptors.response.use(res => {
|
formRequest.interceptors.response.use(res => {
|
||||||
@@ -71,7 +71,7 @@ formRequest.interceptors.response.use(res => {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
error => {
|
error => {
|
||||||
console.log('err', error)
|
// console.log('err', error)
|
||||||
let {message} = error;
|
let {message} = error;
|
||||||
if (message == "Network Error") {
|
if (message == "Network Error") {
|
||||||
message = "网络异常,请稍后重试";
|
message = "网络异常,请稍后重试";
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 360 B |
|
Before Width: | Height: | Size: 467 B |
|
Before Width: | Height: | Size: 412 B |
|
Before Width: | Height: | Size: 474 B |
|
Before Width: | Height: | Size: 427 B |
|
Before Width: | Height: | Size: 471 B |
|
Before Width: | Height: | Size: 424 B |
|
Before Width: | Height: | Size: 461 B |
|
Before Width: | Height: | Size: 689 B |
|
Before Width: | Height: | Size: 625 B |
|
Before Width: | Height: | Size: 514 B |
|
Before Width: | Height: | Size: 665 B |
|
Before Width: | Height: | Size: 576 B |
|
Before Width: | Height: | Size: 475 B |
|
Before Width: | Height: | Size: 528 B |
|
Before Width: | Height: | Size: 476 B |
|
Before Width: | Height: | Size: 540 B |
|
Before Width: | Height: | Size: 387 B |
|
Before Width: | Height: | Size: 413 B |
|
Before Width: | Height: | Size: 425 B |
|
Before Width: | Height: | Size: 398 B |
|
Before Width: | Height: | Size: 4.9 KiB |
|
Before Width: | Height: | Size: 6.6 KiB |
|
Before Width: | Height: | Size: 69 KiB After Width: | Height: | Size: 362 KiB |
|
Before Width: | Height: | Size: 657 KiB |
|
Before Width: | Height: | Size: 29 KiB |
|
Before Width: | Height: | Size: 28 KiB |
|
Before Width: | Height: | Size: 220 KiB |
|
Before Width: | Height: | Size: 84 KiB |
|
Before Width: | Height: | Size: 111 KiB |
|
Before Width: | Height: | Size: 33 KiB |
|
Before Width: | Height: | Size: 244 KiB |
|
Before Width: | Height: | Size: 186 KiB |
|
Before Width: | Height: | Size: 1.4 MiB |
|
Before Width: | Height: | Size: 3.0 KiB |
|
Before Width: | Height: | Size: 2.9 KiB |
|
Before Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 48 KiB |
|
Before Width: | Height: | Size: 2.9 KiB |
|
Before Width: | Height: | Size: 4.3 KiB |
|
Before Width: | Height: | Size: 5.5 KiB |
@@ -1,7 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<!--弹出窗口设置-->
|
<!--弹出窗口设置-->
|
||||||
<div>
|
<div>
|
||||||
<div v-for="pop in popupList" :key="pop.id">
|
<div v-for="pop in popupList" :key="pop.id">wwww
|
||||||
<el-dialog :close-on-press-escape="false" :close-on-click-modal="false" class="medalbox" :visible.sync="pop.show" :append-to-body="true" >
|
<el-dialog :close-on-press-escape="false" :close-on-click-modal="false" class="medalbox" :visible.sync="pop.show" :append-to-body="true" >
|
||||||
<div style="text-align: center;position: relative;">
|
<div style="text-align: center;position: relative;">
|
||||||
<!-- <span style="float: right;" @click="pop.show = false"><i style="font-size: 28px;color: #000000;" class="el-icon-close"></i></span> -->
|
<!-- <span style="float: right;" @click="pop.show = false"><i style="font-size: 28px;color: #000000;" class="el-icon-close"></i></span> -->
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ export default {
|
|||||||
created() {
|
created() {
|
||||||
this.getBreadcrumb();
|
this.getBreadcrumb();
|
||||||
this.levelList.forEach(function(one){
|
this.levelList.forEach(function(one){
|
||||||
console.log(one);
|
// console.log(one);
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ export default {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
console.log(item)
|
// console.log(item)
|
||||||
|
|
||||||
this.$router.push({path:'/case/detail',query:{id:item.cases.id}})
|
this.$router.push({path:'/case/detail',query:{id:item.cases.id}})
|
||||||
// window.open(`${this.webBaseUrl}/article/detail?id=${item.objId}`)
|
// window.open(`${this.webBaseUrl}/article/detail?id=${item.objId}`)
|
||||||
|
|||||||
@@ -8,10 +8,7 @@
|
|||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="article-info-date">
|
<div class="article-info-date">
|
||||||
<div class="box">
|
<el-button @click="delItem(item)" type="text" style="color: #8590A6;font-size:14px" icon="el-icon-star-on">取消收藏</el-button>
|
||||||
<div class="image"></div>
|
|
||||||
<el-button @click="delItem(item)" type="text" style="color: #8590A6;font-size:14px">取消收藏</el-button>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="article-info-tools">
|
<div class="article-info-tools">
|
||||||
@@ -68,7 +65,7 @@
|
|||||||
return item.cases.summary;
|
return item.cases.summary;
|
||||||
},
|
},
|
||||||
changeIsAll(item,idx) {
|
changeIsAll(item,idx) {
|
||||||
console.log(item.isAll)
|
// console.log(item.isAll)
|
||||||
item.isAll = !item.isAll;
|
item.isAll = !item.isAll;
|
||||||
this.$set(this.items, idx, item);
|
this.$set(this.items, idx, item);
|
||||||
},
|
},
|
||||||
@@ -164,26 +161,6 @@
|
|||||||
line-height: 40px;
|
line-height: 40px;
|
||||||
font-weight: 200;
|
font-weight: 200;
|
||||||
color: #999999;
|
color: #999999;
|
||||||
display: flex;
|
|
||||||
justify-content: end;
|
|
||||||
.box{
|
|
||||||
display: flex;
|
|
||||||
justify-content: end;
|
|
||||||
align-items: center;
|
|
||||||
.image{
|
|
||||||
width: 14px;
|
|
||||||
height: 14px;
|
|
||||||
background: url('../../assets/images/case/Frame(5).png') no-repeat;
|
|
||||||
background-size: 100%;
|
|
||||||
margin-right: 10px;
|
|
||||||
}
|
|
||||||
&:hover{
|
|
||||||
.image{
|
|
||||||
background: url('../../assets/images/case/Frame(12).png') no-repeat;
|
|
||||||
background-size: 100%;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
i {
|
i {
|
||||||
margin-right: 5px;
|
margin-right: 5px;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -425,28 +425,28 @@ export default {
|
|||||||
return this.sysTypeMap.get(code);
|
return this.sysTypeMap.get(code);
|
||||||
},
|
},
|
||||||
onPlayerPlay() {
|
onPlayerPlay() {
|
||||||
console.log("开始播放");
|
// console.log("开始播放");
|
||||||
},
|
},
|
||||||
onPlayerPause() {
|
onPlayerPause() {
|
||||||
console.log("暂停");
|
// console.log("暂停");
|
||||||
},
|
},
|
||||||
onPlayerEnded() {
|
onPlayerEnded() {
|
||||||
console.log("播放结束");
|
// console.log("播放结束");
|
||||||
},
|
},
|
||||||
onPlayerPlaying(itme) {
|
onPlayerPlaying(itme) {
|
||||||
console.log("当前播放" + itme);
|
// console.log("当前播放" + itme);
|
||||||
},
|
},
|
||||||
audioPlaying(item) {
|
audioPlaying(item) {
|
||||||
console.log("当前播放" + item);
|
// console.log("当前播放" + item);
|
||||||
},
|
},
|
||||||
audioPlay() {
|
audioPlay() {
|
||||||
console.log("开始播放");
|
// console.log("开始播放");
|
||||||
},
|
},
|
||||||
audioPause() {
|
audioPause() {
|
||||||
console.log("暂停");
|
// console.log("暂停");
|
||||||
},
|
},
|
||||||
audioEnd() {
|
audioEnd() {
|
||||||
console.log("播放结束");
|
// console.log("播放结束");
|
||||||
},
|
},
|
||||||
// 场景过滤
|
// 场景过滤
|
||||||
sceneFilter(forScene) {
|
sceneFilter(forScene) {
|
||||||
@@ -541,7 +541,7 @@ export default {
|
|||||||
this.tagList = result;
|
this.tagList = result;
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.log(error);
|
// console.log(error);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
this.tagList = [];
|
this.tagList = [];
|
||||||
@@ -555,7 +555,7 @@ export default {
|
|||||||
this.sceneList = result;
|
this.sceneList = result;
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.log(error);
|
// console.log(error);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
// 教师列标,远程查询
|
// 教师列标,远程查询
|
||||||
@@ -637,9 +637,7 @@ export default {
|
|||||||
}
|
}
|
||||||
this.teacherList = rs.result.teachers;
|
this.teacherList = rs.result.teachers;
|
||||||
this.teacherName = rs.result.teachers;
|
this.teacherName = rs.result.teachers;
|
||||||
this.teacher = rs.result.teachers.map(item => {
|
this.teacher = rs.result.teachers.map(res => res.teacherName);
|
||||||
return `${item.teacherName}(${item.userNo})`
|
|
||||||
});
|
|
||||||
this.totalContent = rs.result.contents.length; //计算总内容数
|
this.totalContent = rs.result.contents.length; //计算总内容数
|
||||||
if (this.courseInfo.tags != "") {
|
if (this.courseInfo.tags != "") {
|
||||||
this.showTags = this.courseInfo.tags.split(",");
|
this.showTags = this.courseInfo.tags.split(",");
|
||||||
|
|||||||
@@ -462,28 +462,28 @@ export default {
|
|||||||
return this.sysTypeMap.get(code);
|
return this.sysTypeMap.get(code);
|
||||||
},
|
},
|
||||||
onPlayerPlay(){
|
onPlayerPlay(){
|
||||||
console.log("开始播放");
|
// console.log("开始播放");
|
||||||
},
|
},
|
||||||
onPlayerPause(){
|
onPlayerPause(){
|
||||||
console.log("暂停");
|
// console.log("暂停");
|
||||||
},
|
},
|
||||||
onPlayerEnded(){
|
onPlayerEnded(){
|
||||||
console.log("播放结束");
|
// console.log("播放结束");
|
||||||
},
|
},
|
||||||
onPlayerPlaying(itme){
|
onPlayerPlaying(itme){
|
||||||
console.log("当前播放"+itme);
|
// console.log("当前播放"+itme);
|
||||||
},
|
},
|
||||||
audioPlaying(item){
|
audioPlaying(item){
|
||||||
console.log("当前播放"+item);
|
// console.log("当前播放"+item);
|
||||||
},
|
},
|
||||||
audioPlay(){
|
audioPlay(){
|
||||||
console.log("开始播放");
|
// console.log("开始播放");
|
||||||
},
|
},
|
||||||
audioPause(){
|
audioPause(){
|
||||||
console.log("暂停");
|
// console.log("暂停");
|
||||||
},
|
},
|
||||||
audioEnd(){
|
audioEnd(){
|
||||||
console.log("播放结束");
|
// console.log("播放结束");
|
||||||
},
|
},
|
||||||
// 场景过滤
|
// 场景过滤
|
||||||
sceneFilter(forScene) {
|
sceneFilter(forScene) {
|
||||||
@@ -583,7 +583,7 @@ export default {
|
|||||||
this.tagList = result;
|
this.tagList = result;
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.log(error);
|
// console.log(error);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
this.tagList = [];
|
this.tagList = [];
|
||||||
@@ -597,7 +597,7 @@ export default {
|
|||||||
this.sceneList = result;
|
this.sceneList = result;
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.log(error);
|
// console.log(error);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
// 教师列标,远程查询
|
// 教师列标,远程查询
|
||||||
@@ -681,9 +681,7 @@ export default {
|
|||||||
}
|
}
|
||||||
this.teacherList = rs.result.teachers;
|
this.teacherList = rs.result.teachers;
|
||||||
this.teacherName = rs.result.teachers;
|
this.teacherName = rs.result.teachers;
|
||||||
this.teacher = rs.result.teachers.map(item => {
|
this.teacher = rs.result.teachers.map(item => item.teacherName);
|
||||||
return `${item.teacherName}(${item.userNo})`
|
|
||||||
});
|
|
||||||
this.showTags = this.courseInfo.tags.split(",");
|
this.showTags = this.courseInfo.tags.split(",");
|
||||||
if (rs.result.course.resOwner3 == "") {
|
if (rs.result.course.resOwner3 == "") {
|
||||||
this.resOwnerArray = [
|
this.resOwnerArray = [
|
||||||
|
|||||||
@@ -284,7 +284,7 @@
|
|||||||
this.type = 0;
|
this.type = 0;
|
||||||
},
|
},
|
||||||
handleChange(val) {
|
handleChange(val) {
|
||||||
console.log(val);
|
// console.log(val);
|
||||||
},
|
},
|
||||||
formatChoose(format) {
|
formatChoose(format) {
|
||||||
let text = '';
|
let text = '';
|
||||||
|
|||||||
@@ -470,13 +470,13 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
updateName(value){
|
updateName(value){
|
||||||
console.log(value);
|
// console.log(value);
|
||||||
if(this.content.id==''){
|
if(this.content.id==''){
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
apiCourse.updateContentName({id:this.content.id,name:value}).then(rs=>{
|
apiCourse.updateContentName({id:this.content.id,name:value}).then(rs=>{
|
||||||
if(rs.status!=200){
|
if(rs.status!=200){
|
||||||
console.log('更新名称失败:'+rs.message);
|
// console.log('更新名称失败:'+rs.message);
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
</el-input>
|
</el-input>
|
||||||
<div class="choice-box" v-if="teacherDownList.length>0">
|
<div class="choice-box" v-if="teacherDownList.length>0">
|
||||||
<ul>
|
<ul>
|
||||||
<li v-for="te in teacherDownList" :key="te.key" @click="changeTeachers(te)">{{te.teacherName + '(' + te.teacherCode + ')'}}</li>
|
<li v-for="te in teacherDownList" :key="te.key" @click="changeTeachers(te)">{{te.teacherName + te.teacherCode}}</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
<!-- <el-select
|
<!-- <el-select
|
||||||
@@ -84,19 +84,19 @@
|
|||||||
},
|
},
|
||||||
// 教师列标,远程查询
|
// 教师列标,远程查询
|
||||||
async remoteFindTeacher() {
|
async remoteFindTeacher() {
|
||||||
console.log("2222");
|
// console.log("2222");
|
||||||
if (this.teacherValues !== '') {
|
if (this.teacherValues !== '') {
|
||||||
this.loading = true;
|
this.loading = true;
|
||||||
try {
|
try {
|
||||||
const { data, message, code } = await apiTeacher.findByNameNew(this.teacherValues);
|
const { result, message, status } = await apiTeacher.findByName(this.teacherValues);
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
if (code === 200) {
|
if (status === 200) {
|
||||||
let list = [];
|
let list = [];
|
||||||
data.forEach(item => {
|
result.forEach(item => {
|
||||||
list.push({
|
list.push({
|
||||||
teacherId: item.id,
|
teacherId: item.id,
|
||||||
teacherName: item.name,
|
teacherName: item.name,
|
||||||
teacherCode: item.mobile
|
teacherCode: item.code
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
this.teacherDownList = list;
|
this.teacherDownList = list;
|
||||||
|
|||||||
@@ -85,28 +85,6 @@
|
|||||||
<el-form-item label="考试说明">
|
<el-form-item label="考试说明">
|
||||||
<el-input type="textarea" show-word-limit v-model="examInfo.info" placeholder="关于考试的说明(限255字以内)" maxlength="255"></el-input>
|
<el-input type="textarea" show-word-limit v-model="examInfo.info" placeholder="关于考试的说明(限255字以内)" maxlength="255"></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="随机模式">
|
|
||||||
<el-col :span="4">
|
|
||||||
<el-radio-group v-model="examInfo.randomMode">
|
|
||||||
<el-radio :label="true">是</el-radio>
|
|
||||||
<el-radio :label="false">否</el-radio>
|
|
||||||
</el-radio-group>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="20" v-if="examInfo.randomMode&&examInfo.paperType==1">
|
|
||||||
<el-form-item label="数量">
|
|
||||||
<el-input-number v-model="examInfo.qnum" :min="1" :max="examPaper.items.length" label="数量"></el-input-number>
|
|
||||||
<span style="margin-left:10px;" v-if="examPaper.items.length==0">先添加试题</span>
|
|
||||||
<span style="margin-left:10px;" v-if="examPaper.items.length>0">试卷有 {{examPaper.items.length}} 道试题</span>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="20" v-if="examInfo.randomMode&&examInfo.paperType==2">
|
|
||||||
<el-form-item label="数量">
|
|
||||||
<el-input-number v-model="examInfo.qnum" :min="1" :max="usePaper.counts" label="数量"></el-input-number>
|
|
||||||
<span style="margin-left:10px;" v-if="usePaper.counts==0">先选择试卷</span>
|
|
||||||
<span style="margin-left:10px;" v-if="usePaper.counts>0">试卷有 {{usePaper.counts}} 道试题</span>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
</el-form-item>
|
|
||||||
</el-form>
|
</el-form>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="examInfo.paperType==1">
|
<div v-if="examInfo.paperType==1">
|
||||||
@@ -307,9 +285,7 @@
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(!this.examInfo.randomMode){
|
|
||||||
this.examInfo.qnum = 0
|
|
||||||
}
|
|
||||||
this.$emit("save",this.examInfo);
|
this.$emit("save",this.examInfo);
|
||||||
},
|
},
|
||||||
deleteExam(){ //删除
|
deleteExam(){ //删除
|
||||||
@@ -318,8 +294,6 @@
|
|||||||
cancelButtonText: '取消',
|
cancelButtonText: '取消',
|
||||||
type: 'warning'
|
type: 'warning'
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
this.examInfo.randomMode = false;
|
|
||||||
this.examInfo.qnum = 0;
|
|
||||||
this.$emit("remove",this.examInfo);
|
this.$emit("remove",this.examInfo);
|
||||||
}).catch(() => {
|
}).catch(() => {
|
||||||
|
|
||||||
|
|||||||
@@ -141,7 +141,6 @@
|
|||||||
<el-radio style="margin-right: 10px;" v-model="courseInfo.device" :label="1">PC端可见</el-radio>
|
<el-radio style="margin-right: 10px;" v-model="courseInfo.device" :label="1">PC端可见</el-radio>
|
||||||
<el-radio style="margin-right: 10px;" v-model="courseInfo.device" :label="2">移动端可见</el-radio>
|
<el-radio style="margin-right: 10px;" v-model="courseInfo.device" :label="2">移动端可见</el-radio>
|
||||||
<el-radio style="margin-right: 10px;" v-model="courseInfo.device" :label="3">多端可见</el-radio>
|
<el-radio style="margin-right: 10px;" v-model="courseInfo.device" :label="3">多端可见</el-radio>
|
||||||
<el-radio style="margin-right: 10px;" v-model="courseInfo.device" v-if="isPermission" :label="4">仅内网访问</el-radio>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item v-if="!weike.onlyRequired" label="课程来源">
|
<el-form-item v-if="!weike.onlyRequired" label="课程来源">
|
||||||
<el-radio-group v-model="courseInfo.source">
|
<el-radio-group v-model="courseInfo.source">
|
||||||
@@ -306,7 +305,6 @@
|
|||||||
<el-radio v-model="courseInfo.device" :label="1">PC端可见</el-radio>
|
<el-radio v-model="courseInfo.device" :label="1">PC端可见</el-radio>
|
||||||
<el-radio v-model="courseInfo.device" :label="2">移动端可见</el-radio>
|
<el-radio v-model="courseInfo.device" :label="2">移动端可见</el-radio>
|
||||||
<el-radio v-model="courseInfo.device" :label="3">多端可见</el-radio>
|
<el-radio v-model="courseInfo.device" :label="3">多端可见</el-radio>
|
||||||
<el-radio style="margin-right: 10px;" v-model="courseInfo.device" v-if="isPermission" :label="4">仅内网访问</el-radio>
|
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="10">
|
<el-col :span="10">
|
||||||
<el-form-item label="课程来源">
|
<el-form-item label="课程来源">
|
||||||
@@ -490,8 +488,6 @@ export default {
|
|||||||
refType:''
|
refType:''
|
||||||
},
|
},
|
||||||
visibleShow:false,
|
visibleShow:false,
|
||||||
isPermission:false,
|
|
||||||
dicts:[],
|
|
||||||
extendRefId:'',
|
extendRefId:'',
|
||||||
extendRefType:'',
|
extendRefType:'',
|
||||||
courseTeachers: [], //课程的老师
|
courseTeachers: [], //课程的老师
|
||||||
@@ -531,11 +527,7 @@ export default {
|
|||||||
dlgShow: false
|
dlgShow: false
|
||||||
},
|
},
|
||||||
rightTypeId: {},
|
rightTypeId: {},
|
||||||
catalogSortDialogShow: false,
|
catalogSortDialogShow: false
|
||||||
selectedOrg: {
|
|
||||||
orgId: null,
|
|
||||||
name: ''
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
@@ -560,18 +552,14 @@ export default {
|
|||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
courseInfo: {
|
courseInfo: {
|
||||||
handler(newVal, oldVal) {
|
handler(newVal) {
|
||||||
// 需要保存
|
//需要保存
|
||||||
this.requireSaveCourse = true;
|
this.requireSaveCourse = true;
|
||||||
|
|
||||||
console.log("--- watch比较 = ", oldVal.orgId, newVal.orgId);
|
|
||||||
this.checkOrgPermission(newVal.orgId);
|
|
||||||
},
|
},
|
||||||
deep: true
|
deep: true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
this.getDictIds();
|
|
||||||
let extendFlag=this.$route.query.f; //是否是管理端过来的
|
let extendFlag=this.$route.query.f; //是否是管理端过来的
|
||||||
this.extendRefId=this.$route.query.refId;
|
this.extendRefId=this.$route.query.refId;
|
||||||
this.extendRefType=this.$route.query.refType;
|
this.extendRefType=this.$route.query.refType;
|
||||||
@@ -593,19 +581,6 @@ export default {
|
|||||||
this.loadUserGroup();
|
this.loadUserGroup();
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
// 检查机构权限
|
|
||||||
checkOrgPermission(orgId) {
|
|
||||||
console.log("--- 监测组织id orgId = ",orgId)
|
|
||||||
console.log("--- this.isPermission = ",this.isPermission)
|
|
||||||
console.log("--- device = ",this.courseInfo.device)
|
|
||||||
if (!orgId) {
|
|
||||||
this.isPermission = false;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
console.log("--- this.dicts = ",this.dicts)
|
|
||||||
this.isPermission = this.dicts.includes(orgId);
|
|
||||||
console.log("--- 监听结束 this.isPermission = ",this.isPermission)
|
|
||||||
},
|
|
||||||
// 关键字的更改
|
// 关键字的更改
|
||||||
changeKeywords(option){
|
changeKeywords(option){
|
||||||
if(option.target.value){
|
if(option.target.value){
|
||||||
@@ -910,26 +885,10 @@ export default {
|
|||||||
this.courseCoverurl = '';
|
this.courseCoverurl = '';
|
||||||
this.courseInfo.coverImg = '';
|
this.courseInfo.coverImg = '';
|
||||||
},
|
},
|
||||||
//获取字典信息
|
|
||||||
async getDictIds() {
|
|
||||||
console.log("--- 获取字典信息 1 = ", this.dicts);
|
|
||||||
try {
|
|
||||||
const response = await apiCourse.getDictIds(637, 1); // 确保返回 Promise
|
|
||||||
console.log("--- 获取字典信息 2 result= ", response);
|
|
||||||
|
|
||||||
if (response.status === 200) {
|
|
||||||
this.dicts = response.result.dicts; // 正确提取 dicts
|
|
||||||
console.log("--- 获取字典信息 3 = ", this.dicts);
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
console.error("获取字典信息失败:", error);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
//获取课程信息
|
//获取课程信息
|
||||||
async getDetail(id) {
|
async getDetail(id) {
|
||||||
this.curCourseId = id;
|
this.curCourseId = id;
|
||||||
this.orgName='';
|
this.orgName='';
|
||||||
this.isPermission = false;
|
|
||||||
let $this = this;
|
let $this = this;
|
||||||
try {
|
try {
|
||||||
const { result, status } = await apiCourse.detail(id);
|
const { result, status } = await apiCourse.detail(id);
|
||||||
@@ -947,10 +906,7 @@ export default {
|
|||||||
this.contentInfo.list = result.contents;
|
this.contentInfo.list = result.contents;
|
||||||
this.sectionInfo.list = result.sections;
|
this.sectionInfo.list = result.sections;
|
||||||
this.courseTeachers = result.teachers; //课程的老师信息
|
this.courseTeachers = result.teachers; //课程的老师信息
|
||||||
this.isPermission = result.isPermission; //课程的老师信息
|
|
||||||
this.dicts = result.dicts; //课程的老师信息
|
|
||||||
console.log("--- 编辑查看 this.isPermission = ",this.isPermission)
|
|
||||||
console.log("--- 编辑查看 this.dicts = ",this.dicts)
|
|
||||||
if(!this.courseInfo.orgId){
|
if(!this.courseInfo.orgId){
|
||||||
//根据课程创建者获取机构id
|
//根据课程创建者获取机构id
|
||||||
apiUser.getOrgSimpleByUserId(result.course.sysCreateAid).then(ors=>{
|
apiUser.getOrgSimpleByUserId(result.course.sysCreateAid).then(ors=>{
|
||||||
@@ -1073,7 +1029,7 @@ export default {
|
|||||||
//this.requireSaveCourse=false;//不需要保存
|
//this.requireSaveCourse=false;//不需要保存
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.log(error);
|
// console.log(error);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
changeTeachers(t) {
|
changeTeachers(t) {
|
||||||
@@ -1206,7 +1162,7 @@ export default {
|
|||||||
this.tagList = result;
|
this.tagList = result;
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.log(error);
|
// console.log(error);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
this.tagList = [];
|
this.tagList = [];
|
||||||
@@ -1624,7 +1580,7 @@ export default {
|
|||||||
this.sceneList = result;
|
this.sceneList = result;
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.log(error);
|
// console.log(error);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
setCurContent(item) {
|
setCurContent(item) {
|
||||||
|
|||||||
@@ -322,29 +322,31 @@ export default {
|
|||||||
}
|
}
|
||||||
qitems.push(q);
|
qitems.push(q);
|
||||||
});
|
});
|
||||||
console.log(qitems,'qitems')
|
// console.log(qitems,'qitems')
|
||||||
return qitems;
|
return qitems;
|
||||||
},
|
},
|
||||||
startTest(){
|
startTest(){
|
||||||
apiExamPaper.newPaperContent(this.info.id).then(res=>{
|
|
||||||
if(!res.error&&res.result != ''){
|
|
||||||
if(this.info.paperType==2){
|
if(this.info.paperType==2){
|
||||||
//TODO1
|
apiExamPaper.getPaperContent(this.info.paperId).then(rs=>{
|
||||||
console.log("调用开始考试 if paperType == 2")
|
if(rs.status=200){
|
||||||
this.examPaper.json=res.result;
|
this.examPaper.json=JSON.parse(rs.result);
|
||||||
|
//console.log(this.examPaper.json,'this.examPaper.json');
|
||||||
let qitems=this.convertToItems(this.examPaper.json);
|
let qitems=this.convertToItems(this.examPaper.json);
|
||||||
this.paper ={items:qitems};
|
this.paper ={items:qitems};
|
||||||
this.total=qitems.length;
|
this.total=qitems.length;
|
||||||
this.curItem=qitems[this.curIndex];
|
this.curItem=qitems[this.curIndex];
|
||||||
this.startTime=new Date();//记录开始时间
|
this.startTime=new Date();//记录开始时间
|
||||||
this.timerValue=this.info.testDuration;
|
this.timerValue=this.info.testDuration;
|
||||||
this.content.status=1;
|
|
||||||
this.timer=setInterval(this.changeTimer,60000);
|
this.timer=setInterval(this.changeTimer,60000);
|
||||||
this.testStart=true;
|
this.testStart=true;
|
||||||
}else{
|
}else{
|
||||||
console.log("调用开始考试 else paperType != 2")
|
this.$message.error('加载试卷内容失败,请与管理员联系,试卷是否已删除');
|
||||||
let paper= {items:res.result};
|
}
|
||||||
|
})
|
||||||
|
}else{
|
||||||
|
let paper= JSON.parse(this.info.paperContent);
|
||||||
paper.items.forEach(item=>{
|
paper.items.forEach(item=>{
|
||||||
|
//console.log(item);
|
||||||
if(item.type==101){
|
if(item.type==101){
|
||||||
item.userAnswer='';
|
item.userAnswer='';
|
||||||
}else if(item.type==102){
|
}else if(item.type==102){
|
||||||
@@ -358,6 +360,7 @@ export default {
|
|||||||
});
|
});
|
||||||
this.total=paper.items.length;
|
this.total=paper.items.length;
|
||||||
this.paper =paper;
|
this.paper =paper;
|
||||||
|
//console.log(this.paper);
|
||||||
|
|
||||||
this.curItem=paper.items[this.curIndex];
|
this.curItem=paper.items[this.curIndex];
|
||||||
this.startTime=new Date();//记录开始时间
|
this.startTime=new Date();//记录开始时间
|
||||||
@@ -365,52 +368,6 @@ export default {
|
|||||||
this.timer=setInterval(this.changeTimer,60000);
|
this.timer=setInterval(this.changeTimer,60000);
|
||||||
this.testStart=true;
|
this.testStart=true;
|
||||||
}
|
}
|
||||||
}else{
|
|
||||||
this.$message.error('加载试卷内容失败,请与管理员联系,试卷是否已删除');
|
|
||||||
}
|
|
||||||
})
|
|
||||||
// if(this.info.paperType==2){
|
|
||||||
// apiExamPaper.getPaperContent(this.info.paperId).then(rs=>{
|
|
||||||
// if(rs.status=200){
|
|
||||||
// this.examPaper.json=JSON.parse(rs.result);
|
|
||||||
// //console.log(this.examPaper.json,'this.examPaper.json');
|
|
||||||
// let qitems=this.convertToItems(this.examPaper.json);
|
|
||||||
// this.paper ={items:qitems};
|
|
||||||
// this.total=qitems.length;
|
|
||||||
// this.curItem=qitems[this.curIndex];
|
|
||||||
// this.startTime=new Date();//记录开始时间
|
|
||||||
// this.timerValue=this.info.testDuration;
|
|
||||||
// this.timer=setInterval(this.changeTimer,60000);
|
|
||||||
// this.testStart=true;
|
|
||||||
// }else{
|
|
||||||
// this.$message.error('加载试卷内容失败,请与管理员联系,试卷是否已删除');
|
|
||||||
// }
|
|
||||||
// })
|
|
||||||
// }else{
|
|
||||||
// let paper= JSON.parse(this.info.paperContent);
|
|
||||||
// paper.items.forEach(item=>{
|
|
||||||
// //console.log(item);
|
|
||||||
// if(item.type==101){
|
|
||||||
// item.userAnswer='';
|
|
||||||
// }else if(item.type==102){
|
|
||||||
// item.userAnswer=[];
|
|
||||||
// }else{
|
|
||||||
// item.userAnswer=''
|
|
||||||
// }
|
|
||||||
// item.options.forEach(opt=>{
|
|
||||||
// opt.checked=false;
|
|
||||||
// })
|
|
||||||
// });
|
|
||||||
// this.total=paper.items.length;
|
|
||||||
// this.paper =paper;
|
|
||||||
// //console.log(this.paper);
|
|
||||||
|
|
||||||
// this.curItem=paper.items[this.curIndex];
|
|
||||||
// this.startTime=new Date();//记录开始时间
|
|
||||||
// this.timerValue=this.info.testDuration;
|
|
||||||
// this.timer=setInterval(this.changeTimer,60000);
|
|
||||||
// this.testStart=true;
|
|
||||||
// }
|
|
||||||
},
|
},
|
||||||
chooseOption(opt){
|
chooseOption(opt){
|
||||||
if(this.curItem.type==101 || this.curItem.type==103){
|
if(this.curItem.type==101 || this.curItem.type==103){
|
||||||
@@ -465,7 +422,7 @@ export default {
|
|||||||
present(){ //提交前处理
|
present(){ //提交前处理
|
||||||
let $this=this;
|
let $this=this;
|
||||||
let score=this.countTest();
|
let score=this.countTest();
|
||||||
console.log('score='+score);
|
// console.log('score='+score);
|
||||||
if(this.noAnswers.length>0){
|
if(this.noAnswers.length>0){
|
||||||
this.$confirm('还有未答试题,您确定要提交吗?', '提示', {
|
this.$confirm('还有未答试题,您确定要提交吗?', '提示', {
|
||||||
confirmButtonText: '确定',
|
confirmButtonText: '确定',
|
||||||
@@ -575,7 +532,7 @@ export default {
|
|||||||
randomMode:this.info.randomMode,
|
randomMode:this.info.randomMode,
|
||||||
score:testScore,
|
score:testScore,
|
||||||
paperJson:JSON.stringify(this.paper),//原来是对象,这里要也要对象
|
paperJson:JSON.stringify(this.paper),//原来是对象,这里要也要对象
|
||||||
startTime:formatDate(this.startTime),//此时间需要格式化,格式化时间可以放在util中
|
//startTime:formatDate(this.startTime),//此时间需要格式化,格式化时间可以放在util中
|
||||||
//endTime:formatDate(now),
|
//endTime:formatDate(now),
|
||||||
}
|
}
|
||||||
//计划考试的时长
|
//计划考试的时长
|
||||||
@@ -586,15 +543,8 @@ export default {
|
|||||||
apiStudy.saveExam(postData).then(res=>{
|
apiStudy.saveExam(postData).then(res=>{
|
||||||
this.thisTrue = true
|
this.thisTrue = true
|
||||||
if(res.status == 200) {
|
if(res.status == 200) {
|
||||||
console.log("获取数据结果 考试 res ==>",res)
|
|
||||||
this.records.push(res.result);
|
this.records.push(res.result);
|
||||||
//TODO 评分更改 最终完成
|
|
||||||
if(res.result.score > res.result.passLine){
|
|
||||||
this.content.status=9;//表已学习完,判断上级的章是否已完成
|
this.content.status=9;//表已学习完,判断上级的章是否已完成
|
||||||
}else{
|
|
||||||
this.content.status=1;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.studyItemId=res.result.studyItemId;//第一次保存时是没有的,所以这里要赋值
|
this.studyItemId=res.result.studyItemId;//第一次保存时是没有的,所以这里要赋值
|
||||||
this.$alert('您本次考试得分:'+this.lastScore, '考试成绩', {
|
this.$alert('您本次考试得分:'+this.lastScore, '考试成绩', {
|
||||||
confirmButtonText: '确定',
|
confirmButtonText: '确定',
|
||||||
|
|||||||
@@ -109,7 +109,7 @@ export default {
|
|||||||
if(res.status==200){
|
if(res.status==200){
|
||||||
this.info=res.result;
|
this.info=res.result;
|
||||||
//检查是否过期
|
//检查是否过期
|
||||||
if(res.result.deadTime!='' && res.result.deadTime != null){
|
if(res.result.deadTime!=''){
|
||||||
var d = new Date(res.result.deadTime);
|
var d = new Date(res.result.deadTime);
|
||||||
var now=new Date();
|
var now=new Date();
|
||||||
if(now.getTime() > d.getTime()){
|
if(now.getTime() > d.getTime()){
|
||||||
@@ -210,7 +210,7 @@ export default {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped lang="scss">
|
<style scoped lang="scss">
|
||||||
.homework-div {
|
.homework-div {
|
||||||
border: 1px solid #dadada;
|
border: 1px solid #dadada;
|
||||||
min-height: 500px;
|
min-height: 500px;
|
||||||
padding: 20px;
|
padding: 20px;
|
||||||
@@ -232,5 +232,5 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -236,7 +236,7 @@ export default {
|
|||||||
// }, 10000);
|
// }, 10000);
|
||||||
},
|
},
|
||||||
noteEdit(note) {
|
noteEdit(note) {
|
||||||
console.log(note)
|
// console.log(note)
|
||||||
this.isEdit = true;
|
this.isEdit = true;
|
||||||
this.mynoteData = note;
|
this.mynoteData = note;
|
||||||
this.editNodeOpenType = note.openType;
|
this.editNodeOpenType = note.openType;
|
||||||
|
|||||||
@@ -401,28 +401,6 @@
|
|||||||
<el-form-item label="考试说明">
|
<el-form-item label="考试说明">
|
||||||
<el-input type="textarea" show-word-limit v-model="exam.info.info" placeholder="关于考试的说明(限255字以内)" maxlength="255"></el-input>
|
<el-input type="textarea" show-word-limit v-model="exam.info.info" placeholder="关于考试的说明(限255字以内)" maxlength="255"></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="随机模式">
|
|
||||||
<el-col :span="4">
|
|
||||||
<el-radio-group v-model="exam.info.randomMode">
|
|
||||||
<el-radio :label="true">是</el-radio>
|
|
||||||
<el-radio :label="false">否</el-radio>
|
|
||||||
</el-radio-group>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="20" v-if="exam.info.randomMode&&exam.info.paperType==1">
|
|
||||||
<el-form-item label="数量">
|
|
||||||
<el-input-number v-model="exam.info.qnum" :min="1" :max="exam.paperJson.items.length" label="数量"></el-input-number>
|
|
||||||
<span style="margin-left:10px;" v-if="exam.paperJson.items.length==0">先添加试题</span>
|
|
||||||
<span style="margin-left:10px;" v-if="exam.paperJson.items.length>0">试卷有 {{exam.paperJson.items.length}} 道试题</span>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="20" v-if="exam.info.randomMode&&exam.info.paperType==2">
|
|
||||||
<el-form-item label="数量">
|
|
||||||
<el-input-number v-model="exam.info.qnum" :min="1" :max="usePaper.counts" label="数量"></el-input-number>
|
|
||||||
<span style="margin-left:10px;" v-if="usePaper.counts==0">先选择试卷</span>
|
|
||||||
<span style="margin-left:10px;" v-if="usePaper.counts>0">试卷有 {{usePaper.counts}} 道试题</span>
|
|
||||||
</el-form-item>
|
|
||||||
</el-col>
|
|
||||||
</el-form-item>
|
|
||||||
</el-form>
|
</el-form>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="exam.info.paperType==1">
|
<div v-if="exam.info.paperType==1">
|
||||||
@@ -1081,14 +1059,12 @@
|
|||||||
if(this.exam.info.paperType==2){
|
if(this.exam.info.paperType==2){
|
||||||
if(!this.exam.info.paperId){
|
if(!this.exam.info.paperId){
|
||||||
this.$message.error("您还未选择任何试卷");
|
this.$message.error("您还未选择任何试卷");
|
||||||
this.loading=false;
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
//检查是不是所有的试题都有了答案
|
//检查是不是所有的试题都有了答案
|
||||||
if(this.exam.paperJson.items.length==0){
|
if(this.exam.paperJson.items.length==0){
|
||||||
this.$message.error("您还没有添加考试的试题");
|
this.$message.error("您还没有添加考试的试题");
|
||||||
this.loading=false;
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
let pass=true;
|
let pass=true;
|
||||||
@@ -1111,9 +1087,6 @@
|
|||||||
}
|
}
|
||||||
this.exam.info.paperContent=JSON.stringify(this.exam.paperJson);
|
this.exam.info.paperContent=JSON.stringify(this.exam.paperJson);
|
||||||
}
|
}
|
||||||
if(!this.exam.info.randomMode){
|
|
||||||
this.exam.info.qnum = 0
|
|
||||||
}
|
|
||||||
postData.exam=this.exam.info;
|
postData.exam=this.exam.info;
|
||||||
postData.content.contentName='考试';
|
postData.content.contentName='考试';
|
||||||
this.examChange = deepClone(this.exam);
|
this.examChange = deepClone(this.exam);
|
||||||
@@ -1179,8 +1152,6 @@
|
|||||||
postData.id=this.exam.content.id;
|
postData.id=this.exam.content.id;
|
||||||
postData.ctype=this.exam.content.contentType;
|
postData.ctype=this.exam.content.contentType;
|
||||||
curContent=this.exam.content;
|
curContent=this.exam.content;
|
||||||
this.exam.info.randomMode = false;
|
|
||||||
this.exam.info.qnum = 0
|
|
||||||
}else if(index==4){
|
}else if(index==4){
|
||||||
postData.id=this.assess.content.id;
|
postData.id=this.assess.content.id;
|
||||||
postData.ctype=this.assess.content.contentType;
|
postData.ctype=this.assess.content.contentType;
|
||||||
|
|||||||
@@ -164,7 +164,7 @@ export default {
|
|||||||
change(e) {
|
change(e) {
|
||||||
let file = e.target.files[0]
|
let file = e.target.files[0]
|
||||||
const formData = new FormData()
|
const formData = new FormData()
|
||||||
console.log(file,'file');
|
// console.log(file,'file');
|
||||||
formData.append('file', file)
|
formData.append('file', file)
|
||||||
upload(formData)
|
upload(formData)
|
||||||
.then(res => {
|
.then(res => {
|
||||||
|
|||||||
@@ -285,7 +285,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(hasItem!=null){
|
if(hasItem!=null){
|
||||||
console.log(hasItem);
|
// console.log(hasItem);
|
||||||
this.$message.error('选择的试题重复:'+hasItem.title)
|
this.$message.error('选择的试题重复:'+hasItem.title)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -217,16 +217,13 @@ export default {
|
|||||||
if(delIdx>-1){
|
if(delIdx>-1){
|
||||||
fileList.splice(delIdx,1);
|
fileList.splice(delIdx,1);
|
||||||
}
|
}
|
||||||
this.$emit("success", res);
|
|
||||||
} else {
|
} else {
|
||||||
this.isLoading = false;
|
this.isLoading = false;
|
||||||
if(this.limit == 1){
|
//this.fileList = [];
|
||||||
this.fileList = [];
|
|
||||||
}
|
|
||||||
this.$message({message:"上传失败",type:'error',offset:100});
|
this.$message({message:"上传失败",type:'error',offset:100});
|
||||||
}
|
}
|
||||||
|
|
||||||
// this.$emit("success", res);
|
this.$emit("success", res);
|
||||||
},
|
},
|
||||||
// 删除文件
|
// 删除文件
|
||||||
handleDelete(index) {
|
handleDelete(index) {
|
||||||
|
|||||||
@@ -51,7 +51,7 @@
|
|||||||
watch:{
|
watch:{
|
||||||
has(newVal,oldVal){
|
has(newVal,oldVal){
|
||||||
this.has=newVal;
|
this.has=newVal;
|
||||||
console.log(newVal,oldVal,'测试问题');
|
// console.log(newVal,oldVal,'测试问题');
|
||||||
this.hasFollow=newVal;
|
this.hasFollow=newVal;
|
||||||
if(newVal!=oldVal && this.auto){
|
if(newVal!=oldVal && this.auto){
|
||||||
this.autoCheck();
|
this.autoCheck();
|
||||||
|
|||||||
@@ -8,10 +8,7 @@
|
|||||||
<span style="margin-left:28px">{{item.eventTime}}</span>
|
<span style="margin-left:28px">{{item.eventTime}}</span>
|
||||||
<span v-if="item.aid == userInfo.aid" class="follow-hide pointer" style="float:right">
|
<span v-if="item.aid == userInfo.aid" class="follow-hide pointer" style="float:right">
|
||||||
<span v-if="item.hidden">已隐藏</span>
|
<span v-if="item.hidden">已隐藏</span>
|
||||||
<span class="span_hidden" v-else @click="emitHide(item.id)">
|
<span v-else @click="emitHide(item.id)"> <svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>隐藏 </span>
|
||||||
<!-- <svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon> -->
|
|
||||||
<div class="is_hidden"></div>
|
|
||||||
隐藏 </span>
|
|
||||||
</span>
|
</span>
|
||||||
</p>
|
</p>
|
||||||
<div class="case-info-cont">
|
<div class="case-info-cont">
|
||||||
@@ -139,22 +136,6 @@
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.span_hidden{
|
|
||||||
display: flex;
|
|
||||||
&:hover{
|
|
||||||
.is_hidden{
|
|
||||||
background: url('../../assets/images/case/Frame(12).png');
|
|
||||||
background-size: 100%;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.is_hidden{
|
|
||||||
width: 18px;
|
|
||||||
height: 18px;
|
|
||||||
background: url('../../assets/images/case/Frame(5).png');
|
|
||||||
background-size: 100%;
|
|
||||||
margin-right: 10px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.sign-text{
|
.sign-text{
|
||||||
color: #666666;
|
color: #666666;
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
|
|||||||
@@ -290,7 +290,7 @@ import apiUser from "@/api/system/user.js";
|
|||||||
//console.log(this.mypageList,'this.mypageList');
|
//console.log(this.mypageList,'this.mypageList');
|
||||||
$this.getUserData(res.result.list,2);
|
$this.getUserData(res.result.list,2);
|
||||||
}else{
|
}else{
|
||||||
console.log('加载关注我数据错误:'+res.message);
|
// console.log('加载关注我数据错误:'+res.message);
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -102,13 +102,13 @@ export default {
|
|||||||
document.documentElement.scrollTop = 0;
|
document.documentElement.scrollTop = 0;
|
||||||
},
|
},
|
||||||
loadProgress(e){
|
loadProgress(e){
|
||||||
console.log(e,'loadProgress');
|
// console.log(e,'loadProgress');
|
||||||
},
|
},
|
||||||
loadedPageHandle(e){
|
loadedPageHandle(e){
|
||||||
this.pdfpage = e;
|
this.pdfpage = e;
|
||||||
},
|
},
|
||||||
loadPdfHandle(e){
|
loadPdfHandle(e){
|
||||||
console.log(e,'loadPdfHandle');
|
// console.log(e,'loadPdfHandle');
|
||||||
},
|
},
|
||||||
clickMore(){
|
clickMore(){
|
||||||
if(this.totalPages>this.showPages){
|
if(this.totalPages>this.showPages){
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="item-author">
|
<div class="item-author">
|
||||||
<div v-if="userName" @click="toHome()">
|
<div @click="toHome()">
|
||||||
<!-- <el-avatar shape="square" size="small" :src="userAvatar" v-if="userAvatar"></el-avatar> -->
|
<!-- <el-avatar shape="square" size="small" :src="userAvatar" v-if="userAvatar"></el-avatar> -->
|
||||||
<!-- <div v-else class="uavatar"><span class="uavatar-text">{{avatarText}}</span></div> -->
|
<!-- <div v-else class="uavatar"><span class="uavatar-text">{{avatarText}}</span></div> -->
|
||||||
<el-avatar shape="circle" size="small" :src="userAvatar" v-if="userAvatar"></el-avatar>
|
<el-avatar shape="circle" size="small" :src="userAvatar" v-if="userAvatar"></el-avatar>
|
||||||
@@ -12,10 +12,9 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="!onlyAvatar&&userName" style="padding-left: 14px;padding-top: 6px;font-size: 14px;">
|
<div v-if="!onlyAvatar" style="padding-left: 14px;padding-top: 6px;font-size: 14px;">
|
||||||
<span style="color: #333333;font-weight: 600;font-size: 16px;">{{userName}}</span>
|
<span style="color: #333333;font-weight: 600;font-size: 16px;">{{userName}}</span>
|
||||||
<span class="author-text" v-if="userInfo && userInfo!=''"> {{userInfo}} </span>
|
<span class="author-text" v-if="userInfo && userInfo!=''"> {{userInfo}} </span>
|
||||||
<span style="margin-left: 15px;" class="comWords" v-if="authorTags.length != 0" v-for="tag in authorTags">{{tag}}</span>
|
|
||||||
</div>
|
</div>
|
||||||
<slot />
|
<slot />
|
||||||
</div>
|
</div>
|
||||||
@@ -50,12 +49,6 @@
|
|||||||
onlyAvatar:{
|
onlyAvatar:{
|
||||||
type:Boolean,
|
type:Boolean,
|
||||||
default:false
|
default:false
|
||||||
},
|
|
||||||
authorTags: {
|
|
||||||
type:Array,
|
|
||||||
default(){
|
|
||||||
return []
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
data(){
|
data(){
|
||||||
@@ -126,14 +119,6 @@
|
|||||||
font-weight: 300;
|
font-weight: 300;
|
||||||
margin-left: 4px;
|
margin-left: 4px;
|
||||||
}
|
}
|
||||||
.comWords {
|
|
||||||
background: #409EFF;
|
|
||||||
border-radius: 2px;
|
|
||||||
font-weight: 400;
|
|
||||||
font-size: 12px;
|
|
||||||
color: #FFFFFF;
|
|
||||||
padding: 4px 10px;
|
|
||||||
}
|
|
||||||
.uavatar{
|
.uavatar{
|
||||||
// border: 1px solid #73adfe;
|
// border: 1px solid #73adfe;
|
||||||
width: 28px;
|
width: 28px;
|
||||||
|
|||||||
@@ -92,19 +92,11 @@
|
|||||||
<div class="comment-btns">
|
<div class="comment-btns">
|
||||||
|
|
||||||
<!-- <a><svg-icon icon-class="like"></svg-icon><span>66</span></a> -->
|
<!-- <a><svg-icon icon-class="like"></svg-icon><span>66</span></a> -->
|
||||||
<div style="display: flex" v-show="btnsShowRowId==com.id">
|
<div v-show="btnsShowRowId==com.id">
|
||||||
|
|
||||||
<a style="display: flex;align-items: center;" @click="showReply(com)">
|
<a @click="showReply(com)"><svg-icon icon-class="comment" style="margin-right: 0px;font-size: 16px;"></svg-icon><span>回复</span></a>
|
||||||
<!-- <svg-icon icon-class="comment" style="margin-right: 0px;font-size: 16px;"></svg-icon> -->
|
|
||||||
<div class="is_comment"></div>
|
|
||||||
<span>回复</span>
|
|
||||||
</a>
|
|
||||||
<!--必须当前登录人是一个人-->
|
<!--必须当前登录人是一个人-->
|
||||||
<a style="display: flex;align-items: center;" v-if="userInfo.aid==com.sysCreateAid" @click="delCommnet(com,comIdx)">
|
<a v-if="userInfo.aid==com.sysCreateAid" @click="delCommnet(com,comIdx)"><svg-icon icon-class="remove" style="margin-right: 0px;font-size: 16px;"></svg-icon><span>删除</span></a>
|
||||||
<!-- <svg-icon icon-class="remove" style="margin-right: 0px;font-size: 16px;"></svg-icon> -->
|
|
||||||
<div class="is_remove"></div>
|
|
||||||
<span>删除</span>
|
|
||||||
</a>
|
|
||||||
<a v-if="com.replyList && com.replyList.length==5" @click="showMoreReply(com)" ><svg-icon icon-class="all" style="margin-right: 0px;font-size: 16px;"></svg-icon><span>全部</span></a>
|
<a v-if="com.replyList && com.replyList.length==5" @click="showMoreReply(com)" ><svg-icon icon-class="all" style="margin-right: 0px;font-size: 16px;"></svg-icon><span>全部</span></a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -431,7 +423,7 @@
|
|||||||
})
|
})
|
||||||
});
|
});
|
||||||
}else{
|
}else{
|
||||||
console.log('加载用户头像信息:'+res.error);
|
// console.log('加载用户头像信息:'+res.error);
|
||||||
//this.$message.error(res.message);
|
//this.$message.error(res.message);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -968,28 +960,6 @@
|
|||||||
line-height: 35px;
|
line-height: 35px;
|
||||||
a{
|
a{
|
||||||
margin-right:15px;
|
margin-right:15px;
|
||||||
&:hover{
|
|
||||||
.is_comment{
|
|
||||||
background: url('../../assets/images/case/Frame(9).png');
|
|
||||||
background-size: 100%;
|
|
||||||
}
|
|
||||||
.is_remove{
|
|
||||||
background: url('../../assets/images/case/Frame(15).png');
|
|
||||||
background-size: 100%;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.is_comment{
|
|
||||||
width: 16px;
|
|
||||||
height: 16px;
|
|
||||||
background: url('../../assets/images/case/Frame.png');
|
|
||||||
background-size: 100%;
|
|
||||||
}
|
|
||||||
.is_remove{
|
|
||||||
width: 16px;
|
|
||||||
height: 16px;
|
|
||||||
background: url('../../assets/images/case/Frame(8).png');
|
|
||||||
background-size: 100%;
|
|
||||||
}
|
|
||||||
span{
|
span{
|
||||||
margin-left: 6px;
|
margin-left: 6px;
|
||||||
color: #8590A6;
|
color: #8590A6;
|
||||||
|
|||||||
@@ -268,7 +268,7 @@ export default {
|
|||||||
conType,
|
conType,
|
||||||
}
|
}
|
||||||
apiMessage.save(message).then(res=>{
|
apiMessage.save(message).then(res=>{
|
||||||
if(res.status!=200){ console.log('发送消息失败') }
|
// if(res.status!=200){ console.log('发送消息失败') }
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
checkHas(){
|
checkHas(){
|
||||||
@@ -301,7 +301,7 @@ export default {
|
|||||||
},
|
},
|
||||||
addPraise(){
|
addPraise(){
|
||||||
if(this.type==0){
|
if(this.type==0){
|
||||||
console.log('未设置type值,1表课程,2表文章,3表案例,4表问答,6笔记')
|
// console.log('未设置type值,1表课程,2表文章,3表案例,4表问答,6笔记')
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
//需要判断是否已点赞,已点赞的不再加
|
//需要判断是否已点赞,已点赞的不再加
|
||||||
@@ -359,7 +359,7 @@ export default {
|
|||||||
}
|
}
|
||||||
this.$message({message:'取消点赞',type:'success'})
|
this.$message({message:'取消点赞',type:'success'})
|
||||||
}else{
|
}else{
|
||||||
console.log('取消失败:'+res.message);
|
// console.log('取消失败:'+res.message);
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
@@ -430,7 +430,7 @@ export default {
|
|||||||
this.$store.dispatch("userTrigger", event);
|
this.$store.dispatch("userTrigger", event);
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
console.log('点赞失败:'+res.message);
|
// console.log('点赞失败:'+res.message);
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -443,7 +443,7 @@ export default {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
if(this.type==0){
|
if(this.type==0){
|
||||||
console.log('未设置type值,1表课程,2表文章,3表案例,4表问答')
|
// console.log('未设置type值,1表课程,2表文章,3表案例,4表问答')
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
//需要判断是否已点赞,已点赞的不再加
|
//需要判断是否已点赞,已点赞的不再加
|
||||||
@@ -479,7 +479,7 @@ export default {
|
|||||||
this.$message({message:'已取消收藏',type:'success'});
|
this.$message({message:'已取消收藏',type:'success'});
|
||||||
//this.$emit('addFavorite',res.result);//添加收藏,如果是true代表添加成功,false代表已存在
|
//this.$emit('addFavorite',res.result);//添加收藏,如果是true代表添加成功,false代表已存在
|
||||||
}else{
|
}else{
|
||||||
console.log('取消收藏失败:'+res.message);
|
// console.log('取消收藏失败:'+res.message);
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
@@ -499,7 +499,7 @@ export default {
|
|||||||
this.$message({message:'已加入收藏',type:'success'});
|
this.$message({message:'已加入收藏',type:'success'});
|
||||||
//this.$emit('addFavorite',res.result);//添加收藏,如果是true代表添加成功,false代表已存在
|
//this.$emit('addFavorite',res.result);//添加收藏,如果是true代表添加成功,false代表已存在
|
||||||
}else{
|
}else{
|
||||||
console.log('加入收藏失败:'+res.message);
|
// console.log('加入收藏失败:'+res.message);
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,8 +10,7 @@
|
|||||||
<el-tooltip effect="light" :content="type == 4 || type == 5 ?'回答':'回复'" placement="left" :visible-arrow="false" popper-class="text-tooltip">
|
<el-tooltip effect="light" :content="type == 4 || type == 5 ?'回答':'回复'" placement="left" :visible-arrow="false" popper-class="text-tooltip">
|
||||||
<!-- <svg-icon style="margin-right: 0;" icon-class="comment"></svg-icon> -->
|
<!-- <svg-icon style="margin-right: 0;" icon-class="comment"></svg-icon> -->
|
||||||
<!-- <img style="width:16px;height:14px;vertical-align: middle;" :src="require('@/assets/images/icon/answers.png')"> -->
|
<!-- <img style="width:16px;height:14px;vertical-align: middle;" :src="require('@/assets/images/icon/answers.png')"> -->
|
||||||
<!-- <svg-icon style="margin-right: 0;font-size: 14px;" icon-class="comment"></svg-icon> -->
|
<svg-icon style="margin-right: 0;font-size: 14px;" icon-class="comment"></svg-icon>
|
||||||
<div class="is_comment"></div>
|
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
<span class="interact-bar-value"> {{ data.answers? data.answers:0}}</span>
|
<span class="interact-bar-value"> {{ data.answers? data.answers:0}}</span>
|
||||||
</div>
|
</div>
|
||||||
@@ -24,16 +23,14 @@
|
|||||||
</div>
|
</div>
|
||||||
<div v-if="comments" class="interact-bar-btn" :style="`min-width: ${nodeWidth};`" :class="{cursor:!readonly}">
|
<div v-if="comments" class="interact-bar-btn" :style="`min-width: ${nodeWidth};`" :class="{cursor:!readonly}">
|
||||||
<el-tooltip effect="light" content="评论" placement="left" :visible-arrow="false" popper-class="text-tooltip">
|
<el-tooltip effect="light" content="评论" placement="left" :visible-arrow="false" popper-class="text-tooltip">
|
||||||
<!-- <svg-icon style="margin-right: 0;font-size: 14px;" icon-class="comment"></svg-icon> -->
|
<svg-icon style="margin-right: 0;font-size: 14px;" icon-class="comment"></svg-icon>
|
||||||
<div class="is_comment"></div>
|
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
<span class="interact-bar-value"> {{data.comments? data.comments:0}}</span>
|
<span class="interact-bar-value"> {{data.comments? data.comments:0}}</span>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div v-if="praises" @click="addPraise()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
|
<div v-if="praises" @click="addPraise()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
|
||||||
<el-tooltip effect="light" content="点赞" placement="top" :visible-arrow="false" popper-class="text-tooltip">
|
<el-tooltip effect="light" content="点赞" placement="top" :visible-arrow="false" popper-class="text-tooltip">
|
||||||
<!-- <svg-icon style="margin-right: 0;font-size: 14px;" :icon-class="isPraise?'praised':'like'"></svg-icon> -->
|
<svg-icon style="margin-right: 0;font-size: 14px;" :icon-class="isPraise?'praised':'like'"></svg-icon>
|
||||||
<div class="is_praise" :class="isPraise?'is_praise_a':'is_praise'"></div>
|
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
<span class="interact-bar-value"> {{ data.praises? data.praises:0}}</span>
|
<span class="interact-bar-value"> {{ data.praises? data.praises:0}}</span>
|
||||||
</div>
|
</div>
|
||||||
@@ -41,22 +38,19 @@
|
|||||||
<div v-if="favorites" @click.stop="addFavorite()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
|
<div v-if="favorites" @click.stop="addFavorite()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
|
||||||
<el-tooltip effect="light" content="收藏" placement="top" :visible-arrow="false" popper-class="text-tooltip">
|
<el-tooltip effect="light" content="收藏" placement="top" :visible-arrow="false" popper-class="text-tooltip">
|
||||||
<svg-icon v-if="courseExclusive" style="font-size: 32px;margin-right: 0;" :icon-class="isFavorite?'collectedCourse':'collectionCourse'"></svg-icon>
|
<svg-icon v-if="courseExclusive" style="font-size: 32px;margin-right: 0;" :icon-class="isFavorite?'collectedCourse':'collectionCourse'"></svg-icon>
|
||||||
<!-- <svg-icon v-else style="margin-right: 0;" :style="{'font-size':(size+2)+'px'}" :icon-class="isFavorite?'scactive2':'xihuan'"></svg-icon> -->
|
<svg-icon v-else style="margin-right: 0;" :style="{'font-size':(size+2)+'px'}" :icon-class="isFavorite?'scactive2':'xihuan'"></svg-icon>
|
||||||
<div v-else class="is_favorite" :class="isFavorite?'is_favorite_a':'is_favorite'"></div>
|
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
<span v-if="!courseExclusive" class="interact-bar-value"> {{ data.favorites? data.favorites:0}}</span>
|
<span v-if="!courseExclusive" class="interact-bar-value"> {{ data.favorites? data.favorites:0}}</span>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="shares" @click="addShare()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
|
<div v-if="shares" @click="addShare()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
|
||||||
<el-tooltip effect="light" content="分享" placement="top" :visible-arrow="false" popper-class="text-tooltip">
|
<el-tooltip effect="light" content="分享" placement="top" :visible-arrow="false" popper-class="text-tooltip">
|
||||||
<!-- <svg-icon icon-class="share" style="margin-right: 0;" :style="{'font-size':(size+2)+'px'}"></svg-icon> -->
|
<svg-icon icon-class="share" style="margin-right: 0;" :style="{'font-size':(size+2)+'px'}"></svg-icon>
|
||||||
<div class="is_share"></div>
|
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
<span class="interact-bar-value"> {{data.shares}}</span>
|
<span class="interact-bar-value"> {{data.shares}}</span>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="views" style="cursor: default;" :style="`min-width: ${nodeWidth};margin-left:${data.views>1000? '20px':'20px'}`" class="interact-bar-btn ese-view" :class="{cursor:!readonly}">
|
<div v-if="views" style="cursor: default;" :style="`min-width: ${nodeWidth};margin-left:${data.views>1000? '20px':'20px'}`" class="interact-bar-btn ese-view" :class="{cursor:!readonly}">
|
||||||
<el-tooltip effect="light" content="浏览量" placement="top" :visible-arrow="false" popper-class="text-tooltip">
|
<el-tooltip effect="light" content="浏览量" placement="top" :visible-arrow="false" popper-class="text-tooltip">
|
||||||
<!-- <svg-icon style="margin-right: 0; font-size:22px;" icon-class="eyes"></svg-icon> -->
|
<svg-icon style="margin-right: 0; font-size:22px;" icon-class="eyes"></svg-icon>
|
||||||
<div class="is_view"></div>
|
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
<!-- <div style="float:right;margin-left:8px"> -->
|
<!-- <div style="float:right;margin-left:8px"> -->
|
||||||
<span class="interact-bar-value eyes-view" > {{ formatNum(data.views)}}</span>
|
<span class="interact-bar-value eyes-view" > {{ formatNum(data.views)}}</span>
|
||||||
@@ -327,7 +321,7 @@ export default {
|
|||||||
conType,
|
conType,
|
||||||
}
|
}
|
||||||
apiMessage.save(message).then(res=>{
|
apiMessage.save(message).then(res=>{
|
||||||
if(res.status!=200){ console.log('发送消息失败') }
|
// if(res.status!=200){ console.log('发送消息失败') }
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
checkHas(){
|
checkHas(){
|
||||||
@@ -360,7 +354,7 @@ export default {
|
|||||||
},
|
},
|
||||||
addPraise(){
|
addPraise(){
|
||||||
if(this.type==0){
|
if(this.type==0){
|
||||||
console.log('未设置type值,1表课程,2表文章,3表案例,4表问答,6笔记')
|
// console.log('未设置type值,1表课程,2表文章,3表案例,4表问答,6笔记')
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
//需要判断是否已点赞,已点赞的不再加
|
//需要判断是否已点赞,已点赞的不再加
|
||||||
@@ -418,7 +412,7 @@ export default {
|
|||||||
}
|
}
|
||||||
this.$message({message:'取消点赞',type:'success'})
|
this.$message({message:'取消点赞',type:'success'})
|
||||||
}else{
|
}else{
|
||||||
console.log('取消失败:'+res.message);
|
// console.log('取消失败:'+res.message);
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
@@ -489,7 +483,7 @@ export default {
|
|||||||
this.$store.dispatch("userTrigger", event);
|
this.$store.dispatch("userTrigger", event);
|
||||||
}
|
}
|
||||||
}else{
|
}else{
|
||||||
console.log('点赞失败:'+res.message);
|
// console.log('点赞失败:'+res.message);
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -502,7 +496,7 @@ export default {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
if(this.type==0){
|
if(this.type==0){
|
||||||
console.log('未设置type值,1表课程,2表文章,3表案例,4表问答')
|
// console.log('未设置type值,1表课程,2表文章,3表案例,4表问答')
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
//需要判断是否已点赞,已点赞的不再加
|
//需要判断是否已点赞,已点赞的不再加
|
||||||
@@ -536,10 +530,9 @@ export default {
|
|||||||
this.$store.dispatch("unicomFavorites",false)
|
this.$store.dispatch("unicomFavorites",false)
|
||||||
}
|
}
|
||||||
this.$message({message:'已取消收藏',type:'success'});
|
this.$message({message:'已取消收藏',type:'success'});
|
||||||
this.$emit('deleteFavorite',true)
|
|
||||||
//this.$emit('addFavorite',res.result);//添加收藏,如果是true代表添加成功,false代表已存在
|
//this.$emit('addFavorite',res.result);//添加收藏,如果是true代表添加成功,false代表已存在
|
||||||
}else{
|
}else{
|
||||||
console.log('取消收藏失败:'+res.message);
|
// console.log('取消收藏失败:'+res.message);
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
@@ -559,7 +552,7 @@ export default {
|
|||||||
this.$message({message:'已加入收藏',type:'success'});
|
this.$message({message:'已加入收藏',type:'success'});
|
||||||
//this.$emit('addFavorite',res.result);//添加收藏,如果是true代表添加成功,false代表已存在
|
//this.$emit('addFavorite',res.result);//添加收藏,如果是true代表添加成功,false代表已存在
|
||||||
}else{
|
}else{
|
||||||
console.log('加入收藏失败:'+res.message);
|
// console.log('加入收藏失败:'+res.message);
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -720,77 +713,6 @@ export default {
|
|||||||
justify-content: flex-end;
|
justify-content: flex-end;
|
||||||
.interact-bar-btn {
|
.interact-bar-btn {
|
||||||
margin: 0 0 0 15px;
|
margin: 0 0 0 15px;
|
||||||
display: flex;
|
|
||||||
justify-content: end;
|
|
||||||
align-items: center;
|
|
||||||
&:hover{
|
|
||||||
.is_praise{
|
|
||||||
background: url('../../assets/images/case/Frame\(10\).png');
|
|
||||||
}
|
|
||||||
.is_favorite{
|
|
||||||
background: url('../../assets/images/case/Frame\(11\).png');
|
|
||||||
background-size: 100%;
|
|
||||||
}
|
|
||||||
.is_share{
|
|
||||||
background: url('../../assets/images/case/Frame\(14\).png');
|
|
||||||
background-size: 100%;
|
|
||||||
}
|
|
||||||
.is_view{
|
|
||||||
background: url('../../assets/images/case/Frame\(12\).png');
|
|
||||||
background-size: 100%;
|
|
||||||
}
|
|
||||||
.is_comment{
|
|
||||||
background: url('../../assets/images/case/Frame\(9\).png');
|
|
||||||
background-size: 100%;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.is_comment{
|
|
||||||
width: 16px;
|
|
||||||
height: 16px;
|
|
||||||
background: url('../../assets/images/case/Frame.png');
|
|
||||||
background-size: 100%;
|
|
||||||
margin-right: 4px;
|
|
||||||
}
|
|
||||||
.is_view{
|
|
||||||
width: 17px;
|
|
||||||
height: 17px;
|
|
||||||
background: url('../../assets/images/case/Frame\(5\).png');
|
|
||||||
background-size: 100%;
|
|
||||||
margin-right: 4px;
|
|
||||||
}
|
|
||||||
.is_share{
|
|
||||||
width: 16px;
|
|
||||||
height: 16px;
|
|
||||||
background: url('../../assets/images/case/Frame\(7\).png');
|
|
||||||
background-size: 100%;
|
|
||||||
margin-right: 4px;
|
|
||||||
}
|
|
||||||
.is_praise{
|
|
||||||
width: 14px;
|
|
||||||
height: 14px;
|
|
||||||
background: url('../../assets/images/case/Frame\(1\).png');
|
|
||||||
margin-right: 4px;
|
|
||||||
}
|
|
||||||
.is_praise_a{
|
|
||||||
width: 14px;
|
|
||||||
height: 14px;
|
|
||||||
background: url('../../assets/images/case/Frame\(10\).png');
|
|
||||||
margin-right: 4px;
|
|
||||||
}
|
|
||||||
.is_favorite{
|
|
||||||
width: 16px;
|
|
||||||
height: 16px;
|
|
||||||
background: url('../../assets/images/case/Frame\(2\).png');
|
|
||||||
background-size: 100%;
|
|
||||||
margin-right: 4px;
|
|
||||||
}
|
|
||||||
.is_favorite_a{
|
|
||||||
width: 16px;
|
|
||||||
height: 16px;
|
|
||||||
background: url('../../assets/images/case/Frame\(11\).png');
|
|
||||||
background-size: 100%;
|
|
||||||
margin-right: 4px;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
.interact-bar-value{
|
.interact-bar-value{
|
||||||
// color:#6E7B84; ui图给的颜色,但是效果于ui图效果不一样,也没有透明度,所以找一个相近的和谐的颜色
|
// color:#6E7B84; ui图给的颜色,但是效果于ui图效果不一样,也没有透明度,所以找一个相近的和谐的颜色
|
||||||
|
|||||||
@@ -309,7 +309,7 @@
|
|||||||
})
|
})
|
||||||
});
|
});
|
||||||
}else{
|
}else{
|
||||||
console.log('加载用户头像信息:'+res.error);
|
// console.log('加载用户头像信息:'+res.error);
|
||||||
//this.$message.error(res.message);
|
//this.$message.error(res.message);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -245,7 +245,7 @@ export default {
|
|||||||
},
|
},
|
||||||
toNeedCourse(){
|
toNeedCourse(){
|
||||||
// 需要先切换标签
|
// 需要先切换标签
|
||||||
console.log('this.identity='+this.identity);
|
// console.log('this.identity='+this.identity);
|
||||||
if(this.identity==5 || this.identity==2){
|
if(this.identity==5 || this.identity==2){
|
||||||
this.$store.dispatch('SetCurIdentity',2);
|
this.$store.dispatch('SetCurIdentity',2);
|
||||||
// this.$router.push('/need/course?open=new');
|
// this.$router.push('/need/course?open=new');
|
||||||
|
|||||||
@@ -51,8 +51,7 @@
|
|||||||
<el-dropdown placement="bottom" @command="handleContributor">
|
<el-dropdown placement="bottom" @command="handleContributor">
|
||||||
<span class="el-dropdown-link" style="font-size:16px;cursor: pointer;" :style="{color:textColor}">贡献者大会</span>
|
<span class="el-dropdown-link" style="font-size:16px;cursor: pointer;" :style="{color:textColor}">贡献者大会</span>
|
||||||
<el-dropdown-menu slot="dropdown">
|
<el-dropdown-menu slot="dropdown">
|
||||||
<el-dropdown-item command="three">2024</el-dropdown-item>
|
<el-dropdown-item command="one">2023</el-dropdown-item>
|
||||||
<el-dropdown-item command="one" divided>2023</el-dropdown-item>
|
|
||||||
<el-dropdown-item command="two" divided>2022</el-dropdown-item>
|
<el-dropdown-item command="two" divided>2022</el-dropdown-item>
|
||||||
</el-dropdown-menu>
|
</el-dropdown-menu>
|
||||||
</el-dropdown>
|
</el-dropdown>
|
||||||
@@ -137,30 +136,6 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<!-- "社招新员工转正培训项目简介"弹框 -->
|
|
||||||
<el-dialog width="733px"
|
|
||||||
:visible.sync="projectDialogVisible"
|
|
||||||
:append-to-body="true"
|
|
||||||
>
|
|
||||||
<div class="el-dialog__header">
|
|
||||||
<span style="font-size: 35px; font-weight: bold; color: white; margin: 60px;line-height: 100px;">项目简介</span>
|
|
||||||
</div>
|
|
||||||
<div style="height: 280px;margin: 0px 40px 0px 40px;">
|
|
||||||
<span v-html="studentInfo.introduction"></span>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<span style="font-size: 14px; margin: 40px;" v-if="studentInfo.bpmStatus!=0">审批编号:<span style="font-weight: bold;">{{studentInfo.bpmNumber}}</span></span>
|
|
||||||
<br/>
|
|
||||||
<span style="font-size: 14px; margin: 40px;">审批状态:<span style="font-weight: bold; color: #efbf82">{{studentInfo.bpmStatusName}}</span></span>
|
|
||||||
</div>
|
|
||||||
<template #footer>
|
|
||||||
<span class="dialog-footer">
|
|
||||||
<el-button type="primary" @click="signUpNow" v-if="studentInfo.bpmStatus==0">立即报名</el-button>
|
|
||||||
<el-button v-if="studentInfo.bpmStatus==1" disabled>审批中</el-button>
|
|
||||||
<el-button type="primary" @click="signUpAgain" v-if="studentInfo.bpmStatus==3">重新报名</el-button>
|
|
||||||
</span>
|
|
||||||
</template>
|
|
||||||
</el-dialog>
|
|
||||||
</div>
|
</div>
|
||||||
<popup></popup><yearMedal></yearMedal>
|
<popup></popup><yearMedal></yearMedal>
|
||||||
</div>
|
</div>
|
||||||
@@ -168,7 +143,6 @@
|
|||||||
<script>
|
<script>
|
||||||
import { mapGetters, mapActions } from 'vuex';
|
import { mapGetters, mapActions } from 'vuex';
|
||||||
import apiMessage from '@/api/system/message.js';
|
import apiMessage from '@/api/system/message.js';
|
||||||
import apiManage from '@/api/manage/manage.js';
|
|
||||||
import popup from '@/components/AlertPopup.vue';
|
import popup from '@/components/AlertPopup.vue';
|
||||||
import yearMedal from '@/components/Popup/China2023.vue';
|
import yearMedal from '@/components/Popup/China2023.vue';
|
||||||
import apiBoeCourse from '@/api/boe/course.js';
|
import apiBoeCourse from '@/api/boe/course.js';
|
||||||
@@ -213,7 +187,7 @@ export default {
|
|||||||
},
|
},
|
||||||
watch:{
|
watch:{
|
||||||
keywords(newval){
|
keywords(newval){
|
||||||
console.log(newval,9999);
|
// console.log(newval,9999);
|
||||||
if(this.findType == '1'){
|
if(this.findType == '1'){
|
||||||
this.keyword = newval
|
this.keyword = newval
|
||||||
}
|
}
|
||||||
@@ -229,8 +203,6 @@ export default {
|
|||||||
keyword: '',
|
keyword: '',
|
||||||
isTiao: false,
|
isTiao: false,
|
||||||
sex:'',
|
sex:'',
|
||||||
projectDialogVisible: false,
|
|
||||||
studentInfo: {},
|
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
@@ -241,31 +213,12 @@ export default {
|
|||||||
//this.loadPopupConfig();
|
//this.loadPopupConfig();
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
//BPM项目:立即报名
|
|
||||||
signUpNow(){
|
|
||||||
const pid = this.studentInfo.projectId;
|
|
||||||
apiManage.signUpBpmProjectNow(pid).then(res=>{
|
|
||||||
if (res.status == 200){
|
|
||||||
this.projectDialogVisible = false;
|
|
||||||
this.$message.success('报名成功')
|
|
||||||
}else {
|
|
||||||
this.projectDialogVisible = false;
|
|
||||||
this.$message.error('报名失败')
|
|
||||||
}
|
|
||||||
})
|
|
||||||
},
|
|
||||||
//BPM项目:重新报名
|
|
||||||
signUpAgain(){
|
|
||||||
const pid = this.studentInfo.projectId;
|
|
||||||
apiManage.signUpBpmProjectAgain(pid).then(res=>{
|
|
||||||
this.projectDialogVisible = false;
|
|
||||||
})
|
|
||||||
},
|
|
||||||
setCurIdentity(iden){
|
setCurIdentity(iden){
|
||||||
this.$store.dispatch('SetCurIdentity',iden);
|
this.$store.dispatch('SetCurIdentity',iden);
|
||||||
},
|
},
|
||||||
tomy(){
|
tomy(){
|
||||||
console.log('lll')
|
// console.log('lll')
|
||||||
},
|
},
|
||||||
loadBoeData() {
|
loadBoeData() {
|
||||||
if(this.studyTaskCount>0){
|
if(this.studyTaskCount>0){
|
||||||
@@ -293,7 +246,6 @@ export default {
|
|||||||
let obj = {
|
let obj = {
|
||||||
one: urlPre + "/web/contributornew/index",
|
one: urlPre + "/web/contributornew/index",
|
||||||
two: urlPre + "/web/contributor/index",
|
two: urlPre + "/web/contributor/index",
|
||||||
three: urlPre + "/web/contributor_2024/index"
|
|
||||||
};
|
};
|
||||||
window.open(obj[val]);
|
window.open(obj[val]);
|
||||||
},
|
},
|
||||||
@@ -301,28 +253,6 @@ export default {
|
|||||||
if (val === "four") {
|
if (val === "four") {
|
||||||
window.open("https://m.qingxuetang.com/x/?appId=qxtcorp306130")
|
window.open("https://m.qingxuetang.com/x/?appId=qxtcorp306130")
|
||||||
// this.$emit('showClass',true)
|
// this.$emit('showClass',true)
|
||||||
} else if(val === "five"){//new社招新员工项目(需BPM审批报名--唯一,如果不唯一,取发布时间最新的)
|
|
||||||
let studentPath = process.env.VUE_APP_STUDENT_PATH;
|
|
||||||
apiManage.getNewSocialHireProject().then(res=>{
|
|
||||||
this.studentInfo = res.data;
|
|
||||||
const bpmStatus = this.studentInfo.bpmStatus;
|
|
||||||
if (bpmStatus == 0){//未报名--则弹窗含“立即报名”
|
|
||||||
this.studentInfo.bpmStatusName="未报名";
|
|
||||||
this.projectDialogVisible=true;
|
|
||||||
|
|
||||||
}else if (bpmStatus == 1){//已报名待审核(审批中)--仅弹窗展示
|
|
||||||
this.studentInfo.bpmStatusName="审批中";
|
|
||||||
this.projectDialogVisible=true;
|
|
||||||
|
|
||||||
}else if (bpmStatus == 2){//bpm报名审核通过,则直接进入项目进行学习
|
|
||||||
let params = encodeURIComponent('projectId=' + this.studentInfo.projectId);
|
|
||||||
this.$router.push('/forward?to=' + studentPath + '/projectdetails¶ms=' + params);
|
|
||||||
}else if(bpmStatus == 3){//已拒绝--则弹窗含“重新报名”
|
|
||||||
this.studentInfo.bpmStatusName="已拒绝(含个人撤回)";
|
|
||||||
this.projectDialogVisible=true;
|
|
||||||
|
|
||||||
}
|
|
||||||
})
|
|
||||||
} else {
|
} else {
|
||||||
let urlPre = window.location.protocol + "//" + window.location.host;
|
let urlPre = window.location.protocol + "//" + window.location.host;
|
||||||
// process.env.VUE_APP_BOE_WEB_URL
|
// process.env.VUE_APP_BOE_WEB_URL
|
||||||
@@ -332,7 +262,7 @@ export default {
|
|||||||
two: urlPre + "/grow180/login",
|
two: urlPre + "/grow180/login",
|
||||||
three: this.webBaseUrl + "/study/index?study=1",
|
three: this.webBaseUrl + "/study/index?study=1",
|
||||||
// four: 'https://m.qingxuetang.com/x/?appId=qxtcorp306130',
|
// four: 'https://m.qingxuetang.com/x/?appId=qxtcorp306130',
|
||||||
// five: urlPre + "/boe/new-employee/index.html", //old社招新员工 zhengsongbo 注释掉 2025-07-14
|
five: urlPre + "/boe/new-employee/index.html",
|
||||||
six: urlPre + "/web/contributor/index",
|
six: urlPre + "/web/contributor/index",
|
||||||
seven: this.webBaseUrl + '/grateful/index'
|
seven: this.webBaseUrl + '/grateful/index'
|
||||||
};
|
};
|
||||||
@@ -666,27 +596,4 @@ text-align: center;
|
|||||||
margin-right: 8px;
|
margin-right: 8px;
|
||||||
border-radius: 50%;
|
border-radius: 50%;
|
||||||
}
|
}
|
||||||
/* 项目简介 弹窗 ---start--- */
|
|
||||||
::v-deep .el-dialog__header {
|
|
||||||
padding: 0 !important;
|
|
||||||
}
|
|
||||||
::v-deep .el-dialog {
|
|
||||||
border-radius: 3% 3% 1% 1%;
|
|
||||||
}
|
|
||||||
.el-dialog__header {
|
|
||||||
height: 100px;
|
|
||||||
margin: 0 !important;
|
|
||||||
background-image: url('../assets/images/project/title-bg.png');
|
|
||||||
background-size: 100% 100%; /* 完全填充 */
|
|
||||||
display: block; /* 避免行内元素空隙 */
|
|
||||||
}
|
|
||||||
::v-deep .el-dialog__title {
|
|
||||||
margin: 0 !important;
|
|
||||||
padding: 0 !important;
|
|
||||||
}
|
|
||||||
::v-deep .el-dialog__body {
|
|
||||||
margin: 0 !important;
|
|
||||||
padding: 0 !important;
|
|
||||||
}
|
|
||||||
/* 项目简介 弹窗 ---end--- */
|
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -95,7 +95,7 @@
|
|||||||
this.askForm.images=file.result.filePath
|
this.askForm.images=file.result.filePath
|
||||||
this.imageShowUrl= this.fileBaseUrl + file.result.filePath;
|
this.imageShowUrl= this.fileBaseUrl + file.result.filePath;
|
||||||
// console.log(this.fileBaseUrl)
|
// console.log(this.fileBaseUrl)
|
||||||
console.log(file)
|
// console.log(file)
|
||||||
},
|
},
|
||||||
handleRemoveSuccess(file) {
|
handleRemoveSuccess(file) {
|
||||||
this.imageShowUrl=''
|
this.imageShowUrl=''
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<!-- <div style="color: red;">下面的表格标题及内容需要调整完善</div> -->
|
<!-- <div style="color: red;">下面的表格标题及内容需要调整完善</div> -->
|
||||||
<div>
|
<div>
|
||||||
<el-tabs style="width: 100%;" v-model="tabName" @tab-click="handleTabClick">
|
<el-tabs v-model="tabName" @tab-click="handleTabClick">
|
||||||
<el-tab-pane label="报名管理" name="second">
|
<el-tab-pane label="报名管理" name="second">
|
||||||
<!-- <div>已报名{{study.list.length}}人,共有0人报名未成功,共有{{study.list.length}}人通过审核</div> -->
|
<!-- <div>已报名{{study.list.length}}人,共有0人报名未成功,共有{{study.list.length}}人通过审核</div> -->
|
||||||
<el-row style="margin: 20px 0;" :gutter="20">
|
<el-row style="margin: 20px 0;" :gutter="20">
|
||||||
@@ -192,7 +192,7 @@
|
|||||||
</el-table-column>-->
|
</el-table-column>-->
|
||||||
<el-table-column label="学习人员" width="110">
|
<el-table-column label="学习人员" width="110">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-button size="mini" type="info" @click="getCatalogue(scope.row,scope.row.contentType)" >学习人员</el-button>
|
<el-button size="mini" type="info" @click="getCatalogue(scope.row,scope.row.contentName)" >学习人员</el-button>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
@@ -292,7 +292,6 @@
|
|||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" @click="studyContentRecordsSearch">搜索</el-button>
|
<el-button type="primary" @click="studyContentRecordsSearch">搜索</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-button v-if="isHomeWork" :disabled="isTrue" style="padding:10px 15px;margin-bottom: 10px;" type="primary" @click="downLoad">导出全部作业</el-button>
|
|
||||||
</el-form>
|
</el-form>
|
||||||
<el-table max-height="500" border :data="learningSituation.list" style="width: 100%">
|
<el-table max-height="500" border :data="learningSituation.list" style="width: 100%">
|
||||||
<el-table-column prop="aname" label="姓名" width="180"></el-table-column>
|
<el-table-column prop="aname" label="姓名" width="180"></el-table-column>
|
||||||
@@ -336,8 +335,6 @@ import apiCoursePortal from "@/api/modules/coursePortal.js";
|
|||||||
import { mapGetters,mapActions } from 'vuex';
|
import { mapGetters,mapActions } from 'vuex';
|
||||||
import apiUser from '@/api/system/user.js';
|
import apiUser from '@/api/system/user.js';
|
||||||
import apiStudy from '@/api/modules/courseStudy.js';
|
import apiStudy from '@/api/modules/courseStudy.js';
|
||||||
import { getToken } from '@/utils/token'
|
|
||||||
import axios from 'axios'
|
|
||||||
export default {
|
export default {
|
||||||
components: {auditCourse1,auditCourse2},
|
components: {auditCourse1,auditCourse2},
|
||||||
computed: {
|
computed: {
|
||||||
@@ -355,10 +352,7 @@ export default {
|
|||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
downParams: {},
|
|
||||||
typePress: false,
|
typePress: false,
|
||||||
isHomeWork: false,
|
|
||||||
isTrue: false,
|
|
||||||
catalogRecordTree:[],
|
catalogRecordTree:[],
|
||||||
catalogRecordList:[],
|
catalogRecordList:[],
|
||||||
resOwnerListMap:[],
|
resOwnerListMap:[],
|
||||||
@@ -383,8 +377,8 @@ export default {
|
|||||||
count: 0,
|
count: 0,
|
||||||
type: "",
|
type: "",
|
||||||
list: [],
|
list: [],
|
||||||
status: '',
|
|
||||||
name: '',
|
name: '',
|
||||||
|
status: '',
|
||||||
},
|
},
|
||||||
learningRecords: {
|
learningRecords: {
|
||||||
pageIndex: 1, //第几页
|
pageIndex: 1, //第几页
|
||||||
@@ -521,7 +515,6 @@ export default {
|
|||||||
pageIndex: this.learningSituation.pageIndex,
|
pageIndex: this.learningSituation.pageIndex,
|
||||||
pageSize: this.learningSituation.pageSize
|
pageSize: this.learningSituation.pageSize
|
||||||
};
|
};
|
||||||
this.downParams = params;
|
|
||||||
apicourseStudy.studyContentRecords(params).then(res => {
|
apicourseStudy.studyContentRecords(params).then(res => {
|
||||||
if (res.status === 200) {
|
if (res.status === 200) {
|
||||||
this.learningSituation.list = res.result.list;
|
this.learningSituation.list = res.result.list;
|
||||||
@@ -531,77 +524,6 @@ export default {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
downLoad(){
|
|
||||||
if(this.learningSituation.list.length == 0){
|
|
||||||
this.$message.warning('暂无数据');
|
|
||||||
return
|
|
||||||
}
|
|
||||||
this.isTrue = true;
|
|
||||||
let params = {
|
|
||||||
courseName:this.manageStudyData.name,
|
|
||||||
courseId: this.manageStudyData.id,
|
|
||||||
status: this.downParams.status || '',
|
|
||||||
name: this.downParams.name || '',
|
|
||||||
contentId: this.contentId,
|
|
||||||
}
|
|
||||||
// window.open(`/systemapi/xboe/m/course/portal/export?contentId=${params.contentId}&courseName=${params.courseName}&courseId=${params.courseId}&status=${params.status}&name=${params.name}`)
|
|
||||||
const url = `/systemapi/xboe/m/course/portal/export?contentId=${params.contentId}&courseName=${params.courseName}&courseId=${params.courseId}&status=${params.status}&name=${params.name}`
|
|
||||||
axios({
|
|
||||||
method: 'get',
|
|
||||||
url: url,
|
|
||||||
// responseType: 'blob',
|
|
||||||
headers: { 'X-Access-Token': getToken() }
|
|
||||||
}).then((res) => {
|
|
||||||
this.isTrue = false;
|
|
||||||
if(res.data.status == 200){
|
|
||||||
if(res.data.result.includes('upload')){
|
|
||||||
window.open('/upload'+res.data.result.split('upload')[1])
|
|
||||||
}else{
|
|
||||||
this.$message.warning(res.data.result)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}).catch(err=>{
|
|
||||||
this.isTrue = false;
|
|
||||||
this.$message.error(err.response.data.message)
|
|
||||||
})
|
|
||||||
// axios({
|
|
||||||
// method: 'get',
|
|
||||||
// url: url,
|
|
||||||
// responseType: 'blob',
|
|
||||||
// headers: { 'X-Access-Token': getToken() }
|
|
||||||
// }).then((response) => {
|
|
||||||
// if (response.status === 200) {
|
|
||||||
// this.isTrue = false;
|
|
||||||
// if (!(response.headers['content-type']).startsWith('application/json')) {
|
|
||||||
// this.resolveBlob(response, 'application/zip', `${params.courseName}【作业】`);
|
|
||||||
// } else {
|
|
||||||
// console.log(response,'response')
|
|
||||||
// const reader = new FileReader();
|
|
||||||
// reader.onload = (e) => {
|
|
||||||
// const errorData = JSON.parse(e.target.result)
|
|
||||||
// this.$message.error(errorData.result)
|
|
||||||
// };
|
|
||||||
// reader.readAsText(response.data);
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// }).catch((error) => {
|
|
||||||
// this.isTrue = false;
|
|
||||||
// // 错误处理
|
|
||||||
// console.log(error);
|
|
||||||
// this.$message.error(error.data ? error.data.message : error.toString());
|
|
||||||
// });
|
|
||||||
},
|
|
||||||
resolveBlob(res, mimeType,filename) {
|
|
||||||
const link = document.createElement('a');// 创建a标签
|
|
||||||
let blob = new Blob([res.data], { type: mimeType }); // 设置文件类型
|
|
||||||
link.style.display = "none";
|
|
||||||
link.href = URL.createObjectURL(blob); // 创建URL
|
|
||||||
link.setAttribute("download", `${filename}`);
|
|
||||||
document.body.appendChild(link);
|
|
||||||
link.click();
|
|
||||||
URL.revokeObjectURL(link.href);
|
|
||||||
document.body.removeChild(link);
|
|
||||||
},
|
|
||||||
handleSizeChangeSituation(val) {
|
handleSizeChangeSituation(val) {
|
||||||
this.learningSituation.pageSize = val;
|
this.learningSituation.pageSize = val;
|
||||||
this.learningSituation.pageIndex = 1;
|
this.learningSituation.pageIndex = 1;
|
||||||
@@ -800,16 +722,11 @@ export default {
|
|||||||
this.getSignupList();
|
this.getSignupList();
|
||||||
},
|
},
|
||||||
getCatalogue(row,type) {
|
getCatalogue(row,type) {
|
||||||
if(type==61){
|
if(type=='考试'){
|
||||||
this.typePress = true
|
this.typePress = true
|
||||||
}else{
|
}else{
|
||||||
this.typePress = true
|
this.typePress = true
|
||||||
}
|
}
|
||||||
if(type == 60){
|
|
||||||
this.isHomeWork = true
|
|
||||||
}else{
|
|
||||||
this.isHomeWork = false
|
|
||||||
}
|
|
||||||
this.contentId = row.id;
|
this.contentId = row.id;
|
||||||
this.study.catalogueShow = true;
|
this.study.catalogueShow = true;
|
||||||
this.learningSituation.pageIndex = 1;//重置为第一页
|
this.learningSituation.pageIndex = 1;//重置为第一页
|
||||||
@@ -863,19 +780,4 @@ export default {
|
|||||||
height: 400px;
|
height: 400px;
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
.el-tabs__nav-wrap::after {
|
|
||||||
display: none; /* 隐藏滚动条轨道 */
|
|
||||||
}
|
|
||||||
|
|
||||||
.el-tabs__nav-scroll {
|
|
||||||
overflow: hidden; /* 隐藏滚动条滑块 */
|
|
||||||
}
|
|
||||||
|
|
||||||
/* 隐藏垂直滚动条 */
|
|
||||||
.el-table .el-table__body-wrapper::-webkit-scrollbar {
|
|
||||||
display: none; /* Chrome, Safari, Opera*/
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ export default {
|
|||||||
if (typeof val !== 'string') return
|
if (typeof val !== 'string') return
|
||||||
const themeCluster = this.getThemeCluster(val.replace('#', ''))
|
const themeCluster = this.getThemeCluster(val.replace('#', ''))
|
||||||
const originalCluster = this.getThemeCluster(oldVal.replace('#', ''))
|
const originalCluster = this.getThemeCluster(oldVal.replace('#', ''))
|
||||||
console.log(themeCluster, originalCluster)
|
// console.log(themeCluster, originalCluster)
|
||||||
|
|
||||||
const $message = this.$message({
|
const $message = this.$message({
|
||||||
message: ' Compiling the theme',
|
message: ' Compiling the theme',
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
:default-active="activeMenu"
|
:default-active="activeMenu"
|
||||||
router
|
router
|
||||||
active-text-color="#3379FB"
|
active-text-color="#3379FB"
|
||||||
:default-openeds="['manageTodo','manageFinish','teacherTodo','teacherFinish','lecturer','myqa','notice','mystudy','myGrowth', 'course', 'exam', 'u001', 'u002', 'u003', 'u004','mylecnotes','mycaseRecord']"
|
:default-openeds="['manageTodo','manageFinish','teacherTodo','teacherFinish','lecturer','myqa','notice','mystudy', 'course', 'exam', 'u001', 'u002', 'u003', 'u004','mylecnotes','mycaseRecord']"
|
||||||
class="el-menu-vertical"
|
class="el-menu-vertical"
|
||||||
@open="handleOpen"
|
@open="handleOpen"
|
||||||
@close="handleClose"
|
@close="handleClose"
|
||||||
@@ -242,20 +242,6 @@
|
|||||||
<svg-icon :icon-class="activeMenu == '/user/medal'?'myxunzhang-active':'myxunzhang'"></svg-icon>
|
<svg-icon :icon-class="activeMenu == '/user/medal'?'myxunzhang-active':'myxunzhang'"></svg-icon>
|
||||||
<span slot="title">我的勋章</span>
|
<span slot="title">我的勋章</span>
|
||||||
</el-menu-item>
|
</el-menu-item>
|
||||||
<template v-if="showGrowthNav">
|
|
||||||
<el-submenu index="myGrowth" v-show="curIdentity == 1">
|
|
||||||
<template slot="title">
|
|
||||||
<!-- <i class="el-icon-s-grid"></i> -->
|
|
||||||
<img src="../../assets/images/myGrowth.jpg" style="width: 1em;height: 1em;margin-right: 8px;"></img>
|
|
||||||
<span>我的必修</span>
|
|
||||||
</template>
|
|
||||||
<el-menu-item index="/growth/growthPage">
|
|
||||||
<!-- <i class="el-icon-menu"></i> -->
|
|
||||||
<span slot="title" class="study textl">专业力必修</span>
|
|
||||||
</el-menu-item>
|
|
||||||
</el-submenu>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<el-submenu index="mystudy" v-show="curIdentity == 1">
|
<el-submenu index="mystudy" v-show="curIdentity == 1">
|
||||||
<template slot="title">
|
<template slot="title">
|
||||||
<!-- <i class="el-icon-s-grid"></i> -->
|
<!-- <i class="el-icon-s-grid"></i> -->
|
||||||
@@ -399,7 +385,6 @@ import { mapGetters } from 'vuex';
|
|||||||
import apicourseStudy from "../../api/modules/courseStudy.js"
|
import apicourseStudy from "../../api/modules/courseStudy.js"
|
||||||
import {pageList} from "@/api/modules/lecturer"
|
import {pageList} from "@/api/modules/lecturer"
|
||||||
import courseImage from "@/components/Course/courseImage.vue"
|
import courseImage from "@/components/Course/courseImage.vue"
|
||||||
import { listData } from "@/api/growth/growthpath"
|
|
||||||
import testUser from '@/utils/testUsers.js'
|
import testUser from '@/utils/testUsers.js'
|
||||||
export default {
|
export default {
|
||||||
name: 'UcMenu',
|
name: 'UcMenu',
|
||||||
@@ -428,8 +413,7 @@ export default {
|
|||||||
isCollapse: false,
|
isCollapse: false,
|
||||||
lastStudy:{},
|
lastStudy:{},
|
||||||
overlayShow: false,
|
overlayShow: false,
|
||||||
instructor:0,
|
instructor:0
|
||||||
showGrowthNav: false
|
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
@@ -438,11 +422,6 @@ export default {
|
|||||||
this.getLastStudy();
|
this.getLastStudy();
|
||||||
//获取讲师认证中条数
|
//获取讲师认证中条数
|
||||||
this.instructorCertification()
|
this.instructorCertification()
|
||||||
console.log(this.userInfo,'userInfouserInfo')
|
|
||||||
//如果专业力必修没有学习任务则隐藏“我的必修按钮”
|
|
||||||
listData().then(res => {
|
|
||||||
this.showGrowthNav = !!res.data.length
|
|
||||||
})
|
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
//console.log(this.userInfo.loginName,'this.userInfo.loginName');
|
//console.log(this.userInfo.loginName,'this.userInfo.loginName');
|
||||||
@@ -487,10 +466,10 @@ export default {
|
|||||||
})
|
})
|
||||||
},
|
},
|
||||||
handleOpen(key, keyPath) {
|
handleOpen(key, keyPath) {
|
||||||
console.log(key, keyPath);
|
// console.log(key, keyPath);
|
||||||
},
|
},
|
||||||
handleClose(key, keyPath) {
|
handleClose(key, keyPath) {
|
||||||
console.log(key, keyPath);
|
// console.log(key, keyPath);
|
||||||
},
|
},
|
||||||
toPage(url) {
|
toPage(url) {
|
||||||
this.$router.push({ path: url });
|
this.$router.push({ path: url });
|
||||||
|
|||||||
@@ -18,6 +18,7 @@
|
|||||||
@keydown.right.prevent="forwardCurrentTime"
|
@keydown.right.prevent="forwardCurrentTime"
|
||||||
@keydown.up.prevent="increaseVolume"
|
@keydown.up.prevent="increaseVolume"
|
||||||
@keydown.down.prevent="lowerVolume"
|
@keydown.down.prevent="lowerVolume"
|
||||||
|
@keydown.esc.prevent="toggleFullScreen"
|
||||||
tabindex="0"
|
tabindex="0"
|
||||||
width="100%"
|
width="100%"
|
||||||
height="100%"
|
height="100%"
|
||||||
@@ -39,12 +40,12 @@
|
|||||||
:isPlaying="isPlaying"
|
:isPlaying="isPlaying"
|
||||||
:biBarrageXml="biBarrageXml"
|
:biBarrageXml="biBarrageXml"
|
||||||
/>
|
/>
|
||||||
<!-- 加载动画(应该当前视频没有缓存时显示加载动画) && isCrowd && isShowPlayer -->
|
<!-- 加载动画 -->
|
||||||
<div v-show="isShowLoading" class="player-loading" @click="videoDom.focus({preventScroll: true})">
|
<div v-show="isShowLoading && isCrowd && isShowPlayer" class="player-loading" @click="videoDom.focus({preventScroll: true})">
|
||||||
<img src="@/components/VideoPlayer/images/loading.svg" alt="loading"/>
|
<img src="@/components/VideoPlayer/images/loading.svg" alt="loading"/>
|
||||||
</div>
|
</div>
|
||||||
<!-- 控制栏 -->
|
<!-- 控制栏 -->
|
||||||
<div v-show="isCrowd" class="player-controls-container" @click="videoDom.focus({preventScroll: true})">
|
<div v-show="!isShowLoading && isCrowd" class="player-controls-container" @click="videoDom.focus({preventScroll: true})">
|
||||||
<div v-show="isShowVolumeHint" class="player-volumeHint">
|
<div v-show="isShowVolumeHint" class="player-volumeHint">
|
||||||
<span class="player-volumeHint-text">当前音量:{{volumePercent}}%</span>
|
<span class="player-volumeHint-text">当前音量:{{volumePercent}}%</span>
|
||||||
</div>
|
</div>
|
||||||
@@ -70,7 +71,6 @@
|
|||||||
<div :class="{'player-controls': true, 'cursor-lasting-static': isCursorStatic}">
|
<div :class="{'player-controls': true, 'cursor-lasting-static': isCursorStatic}">
|
||||||
<div class="player-progress-bar">
|
<div class="player-progress-bar">
|
||||||
<progressBar
|
<progressBar
|
||||||
:blobId="blobId"
|
|
||||||
:currentProgress="currentProgress"
|
:currentProgress="currentProgress"
|
||||||
v-on:updateProgress="updateProgressByClickBar"
|
v-on:updateProgress="updateProgressByClickBar"
|
||||||
v-on:getMouseDownStatus="getMouseDownStatusOfProgressBar"
|
v-on:getMouseDownStatus="getMouseDownStatusOfProgressBar"
|
||||||
@@ -241,11 +241,6 @@ export default {
|
|||||||
type: String,
|
type: String,
|
||||||
default: null,
|
default: null,
|
||||||
},
|
},
|
||||||
// 视频链接对应的content Id
|
|
||||||
blobId: {
|
|
||||||
type: String,
|
|
||||||
default: null,
|
|
||||||
},
|
|
||||||
// 主题色
|
// 主题色
|
||||||
primaryColor: {
|
primaryColor: {
|
||||||
type: String,
|
type: String,
|
||||||
@@ -271,7 +266,7 @@ export default {
|
|||||||
},
|
},
|
||||||
isDrag:{
|
isDrag:{
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: true,
|
default: null,
|
||||||
},
|
},
|
||||||
isCrowd:{
|
isCrowd:{
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
@@ -317,17 +312,6 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
setInterval(() => {
|
setInterval(() => {
|
||||||
console.log('当前状态:',this.currentProgress,this.isDrag,this.videoDom.currentTime , this.videoDom.duration)
|
|
||||||
// 视频播放时本地记录视频实时播放时长,视频设置了禁止拖动时执行
|
|
||||||
if(!this.isDrag){
|
|
||||||
var time = localStorage.getItem('videoProgressData')
|
|
||||||
var arr = time&&JSON.parse(time) || {}
|
|
||||||
if(arr[this.blobId] < this.currentProgress || !arr[this.blobId]){
|
|
||||||
arr[this.blobId] = parseFloat((this.currentProgress).toFixed(8))
|
|
||||||
if(arr[this.blobId]) localStorage.setItem('videoProgressData',JSON.stringify(arr))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// 定时更新进度条
|
// 定时更新进度条
|
||||||
if (this.isPlaying && !this.isMousedownProgress) {
|
if (this.isPlaying && !this.isMousedownProgress) {
|
||||||
this.currentProgress =
|
this.currentProgress =
|
||||||
@@ -364,11 +348,6 @@ export default {
|
|||||||
}
|
}
|
||||||
// 根据视频的readyState判断下一帧是否已加载,并控制loading的显示
|
// 根据视频的readyState判断下一帧是否已加载,并控制loading的显示
|
||||||
this.isShowLoading = this.videoDom.readyState < 3;
|
this.isShowLoading = this.videoDom.readyState < 3;
|
||||||
console.log("当前缓存:"+this.videoDom.readyState)
|
|
||||||
if (this.videoDom.readyState < 3){
|
|
||||||
console.log("详细信息",this.videoDom)
|
|
||||||
console.log("卡了",this.videoDom.readyState)
|
|
||||||
}
|
|
||||||
//if()
|
//if()
|
||||||
//console.log(this.videoDom.readyState,'this.videoDom.readyState');
|
//console.log(this.videoDom.readyState,'this.videoDom.readyState');
|
||||||
}, 1000);
|
}, 1000);
|
||||||
@@ -377,50 +356,20 @@ export default {
|
|||||||
this.isCursorStatic = false;
|
this.isCursorStatic = false;
|
||||||
this.timeoutControlsHint = 2000;
|
this.timeoutControlsHint = 2000;
|
||||||
});
|
});
|
||||||
this.videoDom.addEventListener('loadstart', function(){
|
|
||||||
console.log('\x1b[34m%s\x1b[0m','*****************视频加载中**************')
|
|
||||||
})
|
|
||||||
|
|
||||||
this.videoDom.addEventListener('loadeddata', function(){
|
|
||||||
console.log('\x1b[32m%s\x1b[0m','*****************加载完毕*************')
|
|
||||||
})
|
|
||||||
|
|
||||||
this.videoDom.addEventListener('error', function(){
|
|
||||||
console.log('\x1b[31m%s\x1b[0m','*****************加载失败**********')
|
|
||||||
})
|
|
||||||
// 监听全屏事件的变化,保存数据
|
// 监听全屏事件的变化,保存数据
|
||||||
window.addEventListener("F", () => {
|
window.addEventListener("fullscreenchange", () => {
|
||||||
this.isFullscreen = this.isFullScreen();
|
this.isFullscreen = this.isFullScreen();
|
||||||
});
|
});
|
||||||
document.addEventListener('fullscreenchange',this.handleFullscreenChange);
|
|
||||||
document.addEventListener('webkitfullscreenchange',this.handleFullscreenChange );
|
|
||||||
// this.videoDom.addEventListener('keydown', function(e){
|
|
||||||
// //console.log('\x1b[31m%s\x1b[0m','*****************加载失败**********')
|
|
||||||
// console.log("video is exit");
|
|
||||||
// if(e.key === "Escape"){
|
|
||||||
// console.log("按键 退出全屏 执行")
|
|
||||||
// }
|
|
||||||
// })
|
|
||||||
|
|
||||||
// this.videoDom.addEventListener("keydown", (e) => {
|
|
||||||
// console.log("是否监听到");
|
|
||||||
// if(e.keyCode == 27){
|
|
||||||
// console.log("是否监听到 esc");
|
|
||||||
// this.toggleFullScreen();
|
|
||||||
// }
|
|
||||||
// });
|
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
//当视频由于需要缓冲下一帧而停止,解决一直计时的问题
|
//当视频由于需要缓冲下一帧而停止,解决一直计时的问题
|
||||||
onWaiting(){
|
onWaiting(){
|
||||||
console.log('触发了onWairing');
|
// console.log('触发了onWairing');
|
||||||
this.isShowLoading = true
|
|
||||||
this.$emit('onPlayerPause', {})
|
this.$emit('onPlayerPause', {})
|
||||||
},
|
},
|
||||||
//当音频/视频在已因缓冲而暂停或停止后已就绪时
|
//当音频/视频在已因缓冲而暂停或停止后已就绪时
|
||||||
onPlaying(){
|
onPlaying(){
|
||||||
console.log('触发缓存结束onPlaying');
|
// console.log('触发缓存结束onPlaying');
|
||||||
this.isShowLoading = false
|
|
||||||
if(this.videoDom.paused){
|
if(this.videoDom.paused){
|
||||||
this.$emit('onPlayerPause', {})
|
this.$emit('onPlayerPause', {})
|
||||||
}else{
|
}else{
|
||||||
@@ -441,7 +390,7 @@ export default {
|
|||||||
this.isPlaying = true;
|
this.isPlaying = true;
|
||||||
this.isInit = true;
|
this.isInit = true;
|
||||||
this.$emit('onPlayerPlay', {});//播放(播放时会调用)
|
this.$emit('onPlayerPlay', {});//播放(播放时会调用)
|
||||||
console.log('播放');
|
// console.log('播放');
|
||||||
} else {
|
} else {
|
||||||
this.videoDom.pause();
|
this.videoDom.pause();
|
||||||
this.isPlaying = false;
|
this.isPlaying = false;
|
||||||
@@ -511,14 +460,6 @@ export default {
|
|||||||
updateProgressBySetTime(newCurrentTime) {
|
updateProgressBySetTime(newCurrentTime) {
|
||||||
this.currentProgress = newCurrentTime / this.videoDom.duration;
|
this.currentProgress = newCurrentTime / this.videoDom.duration;
|
||||||
},
|
},
|
||||||
/* 点击进度条更新视频播放进度2
|
|
||||||
*/
|
|
||||||
updateProgressByClickBar2(newCurrentTime,progressVideo) {
|
|
||||||
this.currentProgress = progressVideo;
|
|
||||||
this.barrageTimelineStart = newCurrentTime;
|
|
||||||
this.videoDom.currentTime = newCurrentTime;
|
|
||||||
this.updateProgressText();
|
|
||||||
},
|
|
||||||
/* 提高视频音量
|
/* 提高视频音量
|
||||||
*/
|
*/
|
||||||
increaseVolume() {
|
increaseVolume() {
|
||||||
@@ -569,7 +510,6 @@ export default {
|
|||||||
/* 切换“全屏”和“非全屏”模式
|
/* 切换“全屏”和“非全屏”模式
|
||||||
*/
|
*/
|
||||||
toggleFullScreen() {
|
toggleFullScreen() {
|
||||||
console.log("toggleFullScreen 执行 ",this.isFullScreen())
|
|
||||||
let element = this.$refs.area;
|
let element = this.$refs.area;
|
||||||
if (!this.isFullScreen()) {
|
if (!this.isFullScreen()) {
|
||||||
if (element.requestFullscreen) {
|
if (element.requestFullscreen) {
|
||||||
@@ -626,24 +566,6 @@ export default {
|
|||||||
const currentTime = this.$refs.video.currentTime;
|
const currentTime = this.$refs.video.currentTime;
|
||||||
this.$emit('onTimeUpdate', currentTime);
|
this.$emit('onTimeUpdate', currentTime);
|
||||||
},
|
},
|
||||||
/**
|
|
||||||
* 监听全屏变化
|
|
||||||
*/
|
|
||||||
handleFullscreenChange() {
|
|
||||||
console.log("handleFullscreenChange gx this.isFullScreen()",this.isFullScreen())
|
|
||||||
console.log("handleFullscreenChange gx this.isFullscreen",this.isFullscreen)
|
|
||||||
|
|
||||||
if(this.isFullscreen){
|
|
||||||
this.isFullscreen = !!document.fullscreenElement;
|
|
||||||
if (!this.isFullscreen) {
|
|
||||||
// 退出全屏后的逻辑(如暂停视频、更新 UI 等)
|
|
||||||
console.log('ESC 已退出全屏 handleFullscreenChange',this.isFullscreen);
|
|
||||||
this.$emit('onFullscreen',false);//全屏
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
currentVolume: function () {
|
currentVolume: function () {
|
||||||
|
|||||||