Compare commits

..

1 Commits

Author SHA1 Message Date
zhangsir
98c891bc23 修改15秒超时,并且删除打印 2024-09-05 10:56:02 +08:00
200 changed files with 3565 additions and 24356 deletions

View File

@@ -41,7 +41,6 @@ VUE_APP_PUBLIC_PATH='/pc'
VUE_APP_MANAGER_PATH='/manage'
VUE_APP_STUDENT_PATH='/fe-student'
VUE_APP_MANAGER_API_PATH='/manageApi'
VUE_APP_GROWTH_API_PATH=''
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true

View File

@@ -37,7 +37,6 @@ VUE_APP_PUBLIC_PATH='/pc-release'
VUE_APP_MANAGER_PATH='/manage-release'
VUE_APP_STUDENT_PATH='/fe-student-release'
VUE_APP_MANAGER_API_PATH='/manageApi-release'
VUE_APP_GROWTH_API_PATH='/growth'
# 登录地址
VUE_APP_LOGIN_URL='https://u.boe.com/web-release/'

View File

@@ -37,7 +37,6 @@ VUE_APP_PUBLIC_PATH='/pc'
VUE_APP_MANAGER_PATH='/manage'
VUE_APP_STUDENT_PATH='/fe-student'
VUE_APP_MANAGER_API_PATH='/manageApi'
VUE_APP_GROWTH_API_PATH='/growth'
# 登录地址
VUE_APP_LOGIN_URL='https://u.boe.com/web/'

View File

@@ -36,7 +36,6 @@ VUE_APP_PUBLIC_PATH='/pc'
VUE_APP_MANAGER_PATH='/manage'
VUE_APP_STUDENT_PATH='/fe-student'
VUE_APP_MANAGER_API_PATH='/manageApi'
VUE_APP_GROWTH_API_PATH='/growth'
# 登录地址
VUE_APP_LOGIN_URL='https://u-pre.boe.com/web/'

View File

@@ -1 +0,0 @@
60ab8a4b97b446b2dcd32889

16540
package-lock.json generated

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 689 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 665 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 169 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 957 B

View File

@@ -16,9 +16,9 @@
<meta name="referrer" content="strict-origin-when-cross-origin"/>
<link rel="icon" href="<%= BASE_URL %>logo/favicon.ico">
<title>京东方大学堂</title>
<script>
// if(window.top != window.self){
// window.top.location=window.self.location;
// }

View File

@@ -41,7 +41,7 @@ const formRequest=axios.create({
}
return config
}, error => {
console.log(error)
// console.log(error)
Promise.reject(error)
});
formRequest.interceptors.response.use(res => {
@@ -66,7 +66,7 @@ const formRequest=axios.create({
}
},
error => {
console.log('err' + error)
// console.log('err' + error)
let { message } = error;
if (message == "Network Error") {
message = "网络异常,请稍后重试";

View File

@@ -30,7 +30,7 @@ const formRequest=axios.create({
// axios中请求配置有baseURL选项表示请求URL公共部分
// baseURL: process.env.VUE_APP_CESOURCE_BASE_API,
//超时
timeout: 10000,
timeout: 15000,
})
//发送json对象的拦截器
formRequest.interceptors.request.use(config => {
@@ -43,7 +43,7 @@ const formRequest=axios.create({
}
return config
}, error => {
console.log(error)
// console.log(error)
Promise.reject(error)
});
formRequest.interceptors.response.use(res => {
@@ -68,7 +68,7 @@ const formRequest=axios.create({
}
},
error => {
console.log('err',error)
// console.log('err',error)
let { message } = error;
if (message == "Network Error") {
message = "网络异常,请稍后重试";

View File

@@ -28,7 +28,7 @@ const jsonRequest=axios.create({
// axios中请求配置有baseURL选项表示请求URL公共部分
baseURL: process.env.VUE_APP_BOE_BASE_API,
//超时
timeout: 10000,
timeout: 15000,
});
//发送json对象的拦截器
jsonRequest.interceptors.request.use(config => {
@@ -39,7 +39,7 @@ jsonRequest.interceptors.request.use(config => {
}
return config
}, error => {
console.log(error)
// console.log(error)
Promise.reject(error)
})
@@ -69,7 +69,7 @@ jsonRequest.interceptors.response.use(res => {
}
},
error => {
console.log('err' + error)
// console.log('err' + error)
let { message } = error;
if (message == "Network Error") {
message = "网络异常,请稍后重试";
@@ -96,7 +96,7 @@ const formRequest=axios.create({
// axios中请求配置有baseURL选项表示请求URL公共部分
baseURL: process.env.VUE_APP_BOE_BASE_API,
//超时
timeout: 10000,
timeout: 15000,
})
//发送json对象的拦截器
formRequest.interceptors.request.use(config => {
@@ -107,7 +107,7 @@ formRequest.interceptors.request.use(config => {
}
return config
}, error => {
console.log(error)
// console.log(error)
Promise.reject(error)
});
formRequest.interceptors.response.use(res => {
@@ -132,7 +132,7 @@ formRequest.interceptors.response.use(res => {
}
},
error => {
console.log('err' + error)
// console.log('err' + error)
let { message } = error;
if (message == "Network Error") {
message = "网络异常,请稍后重试";

View File

@@ -1,6 +1,5 @@
/**我的授课记录*/
import ajax from '@/api/boe/boeApiAjax.js'
import ajax2 from '@/api/unionAjax.js'
import axios from 'axios'
import { getToken } from '@/utils/token'
const baseURL = process.env.VUE_APP_BOE_BASE_API;
@@ -61,63 +60,13 @@ const exportStudentOfTearcher = function(userId) {
const courseRecordList = function(data) {
return ajax.postJson('/b1/system/teacher/teacher-course-list',data);
}
const getListByToken = function(data) {
return ajax2.get('/manageApi',`/admin/teacherRecord/getListByToken?courseName=${data.courseName}&pageNo=${data.pageNo}&pageSize=${data.pageSize}`);
}
/**
* 导出授课记录
*
* @param {Object} data
*/
const courseRecordExport2 = function(data) {
return axios.request({
baseURL: "/manageApi",
url: '/admin/export/exportInTeacherRecord',
method: 'get',
data:data,
headers:{'Content-Type':'application/json;charset=utf-8'},
responseType: 'blob'
})
}
/**
* 导出课程下的学员信息
*
*/
const exportStudentOfCourse2 = function(courseId,courseType) {
return axios.request({
baseURL: "/manageApi",
url: '/admin/export/exportTeacherRecordStudentInfo?courseId='+courseId+'&courseType='+courseType,
method: 'get'
// headers:{'Content-Type':'application/json;charset=utf-8'},
// responseType: 'blob'
})
}
/**
* 导出教师下的所有授课记录下的学员信息
*
*/
const exportStudentOfTearcher2 = function(userId) {
return axios.request({
baseURL: "/manageApi",
url: '/b1/system/teacher/teacher-course-student-export?userId='+userId,
method: 'post',
headers:{'Content-Type':'application/json;charset=utf-8'},
responseType: 'blob'
})
}
export default {
courseRecordExport,
courseRecordExport2,
courseRecordList,
getListByToken,
exportStudentOfCourse,
exportStudentOfCourse2,
exportStudentOfTearcher,
exportStudentOfTearcher2,
exportStudentOfTearcher
}

View File

@@ -26,7 +26,7 @@ const jsonRequest=axios.create({
// axios中请求配置有baseURL选项表示请求URL公共部分
baseURL: process.env.VUE_APP_CESOURCE_BASE_API,
//超时
timeout: 10000,
timeout: 15000,
});
//发送json对象的拦截器
jsonRequest.interceptors.request.use(config => {
@@ -37,7 +37,7 @@ jsonRequest.interceptors.request.use(config => {
}
return config
}, error => {
console.log(error)
// console.log(error)
Promise.reject(error)
})
@@ -65,7 +65,7 @@ jsonRequest.interceptors.response.use(res => {
}
},
error => {
console.log('err' + error)
// console.log('err' + error)
let { message } = error;
if (message == "Network Error") {
message = "网络异常,请稍后重试";
@@ -91,7 +91,7 @@ const formRequest=axios.create({
// axios中请求配置有baseURL选项表示请求URL公共部分
baseURL: process.env.VUE_APP_CESOURCE_BASE_API,
//超时
timeout: 10000,
timeout: 15000,
})
//发送json对象的拦截器
formRequest.interceptors.request.use(config => {
@@ -102,7 +102,7 @@ formRequest.interceptors.request.use(config => {
}
return config
}, error => {
console.log(error)
// console.log(error)
Promise.reject(error)
});
formRequest.interceptors.response.use(res => {
@@ -126,7 +126,7 @@ formRequest.interceptors.response.use(res => {
}
},
error => {
console.log('err' + error)
// console.log('err' + error)
let { message } = error;
if (message == "Network Error") {
message = "网络异常,请稍后重试";

View File

@@ -26,7 +26,7 @@ const jsonRequest=axios.create({
// axios中请求配置有baseURL选项表示请求URL公共部分
baseURL: process.env.VUE_APP_STAT_BASE_API,
//超时
timeout: 10000,
timeout: 15000,
});
//发送json对象的拦截器
jsonRequest.interceptors.request.use(config => {
@@ -37,7 +37,7 @@ jsonRequest.interceptors.request.use(config => {
}
return config
}, error => {
console.log(error)
// console.log(error)
Promise.reject(error)
})
@@ -65,7 +65,7 @@ jsonRequest.interceptors.response.use(res => {
}
},
error => {
console.log('err' + error)
// console.log('err' + error)
let { message } = error;
if (message == "Network Error") {
message = "网络异常,请稍后重试";
@@ -91,7 +91,7 @@ const formRequest=axios.create({
// axios中请求配置有baseURL选项表示请求URL公共部分
baseURL: process.env.VUE_APP_STAT_BASE_API,
//超时
timeout: 10000,
timeout: 15000,
})
//发送json对象的拦截器
formRequest.interceptors.request.use(config => {
@@ -102,7 +102,7 @@ formRequest.interceptors.request.use(config => {
}
return config
}, error => {
console.log(error)
// console.log(error)
Promise.reject(error)
});
formRequest.interceptors.response.use(res => {
@@ -126,7 +126,7 @@ formRequest.interceptors.response.use(res => {
}
},
error => {
console.log('err' + error)
// console.log('err' + error)
let { message } = error;
if (message == "Network Error") {
message = "网络异常,请稍后重试";

View File

@@ -1,8 +0,0 @@
// import ajax from '@/utils/xajax.js'
import ajax from '../ajax';
// const baseURL = process.env.VUE_APP_GROWTH_API_PATH;
const baseURL = '/growth';
// 查询专业力必修列表
export const listData = (obj) => ajax.get(baseURL, '/professional/student/studentGrowthList', { params: obj })
// 查询专业力统计
export const getTotalGrowthTaskDetail = (obj) => ajax.get(baseURL, '/professional/student/getTotalGrowthTaskDetail', { params: obj })

View File

@@ -34,48 +34,9 @@ const userRsSginupCourse = function(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(data){
return ajax.postJson(baseURL,'/stu/project/signUpBpmProjectAgain',data);
}
/**
* 社招新员工
* add by zhengsongbo on 2025-07-14
*/
const getNewSocialHireProject = function(){
return ajax.get(baseURL,'/stu/project/getNewSocialHireProject');
}
export default {
getTaskNum,
userTaskList,
userDeleteStudy,
userRsSginupCourse,
getStudntProjectInfo,
signUpBpmProjectNow,
signUpBpmProjectAgain,
getNewSocialHireProject
userRsSginupCourse
}

View File

@@ -1,6 +1,6 @@
/* 案例模块的相关处理*/
import ajax from '@/utils/xajax.js'
import ajaxs from '@/api/ajax.js'
/**首页查询
* pageSize
* orderField
@@ -88,12 +88,6 @@ const usernameList = function (pageSize) {
const queryPraises = function (pageSize) {
return ajax.get(`/xboe/m/boe/cases/query-praises?pageSize=${pageSize}`);
}
const queryPraisesNew = function (pageSize,rankType) {
return ajax.get(`/xboe/m/boe/cases/queryPopularity?pageSize=${pageSize}&rankType=${rankType}`);
}
const queryRecommendRank = function (pageSize) {
return ajax.get(`/xboe/m/boe/cases/queryRecommendRank?pageSize=${pageSize}`);
}
/*
好评榜
@param pageSize 长度
@@ -101,9 +95,6 @@ const queryRecommendRank = function (pageSize) {
const queryComments = function (pageSize) {
return ajax.get(`/xboe/m/boe/cases/query-comments?pageSize=${pageSize}`);
}
const queryCommentsNew = function (pageSize,rankType) {
return ajax.get(`/xboe/m/boe/cases/queryHighOpinion?pageSize=${pageSize}&rankType=${rankType}`);
}
/**
* 专业分类
@@ -195,36 +186,11 @@ const endReadTimer = (data)=> ajax.postJson('/xboe/m/boe/cases/recommend/record
const caseYears = function (query = {}) {
return ajax.post('/xboe/m/boe/cases/caseYears', query);
}
//案例推荐榜单
const getQueryRecommendRank = function (params) {
return ajax.get(`/xboe/m/boe/cases/queryRecommendRank?pageSize=${params.pageSize}`)
}
//案例上榜
const riseIntoRank = (data) => ajax.post(`/xboe/m/boe/cases/riseIntoRank?caseId=${data.caseId}`)
//取消上榜
const cancelRiseIntoRank = (data) => ajax.post(`/xboe/m/boe/cases/cancelRiseIntoRank?caseId=${data.caseId}`)
//调整榜单
const adjustRank = (data) => ajax.post(`/xboe/m/boe/cases/adjustRank?caseIds=${data.caseIds}`)
//收藏案例
const queryFavoriteCaseOfIndex = (params) => ajax.get(`/xboe/m/boe/cases/queryFavoriteCaseOfIndex?pageIndex=${params.pageIndex}&pageSize=${params.pageSize}&orderField=${params.orderField}&orderAsc=${params.orderAsc}`)
//浏览记录
const queryViewRecord = (data) => ajaxs.post(`/statApi/xboe/m/stat/userdynamic/list?pageIndex=${data.pageIndex}&pageSize=${data.pageSize}&contentType=${data.contentType}&aid=${data.aid}&hidden=${data.hidden}&eventKey=${data.eventKey}`)
//浏览量TOP榜单
const queryPopularityOfMajor = (params) => ajax.get(`/xboe/m/boe/cases/queryPopularityOfMajor?pageSize=${params.pageSize}&rankMonth=${params.rankMonth}&majorId=${params.majorId}`)
//浏览记录新
const browsingHistory = (params) => ajax.get(`/xboe/m/boe/cases/browsingHistory?pageIndex=${params.pageIndex}&pageSize=5`)
//获取所有的专业月份
const queryAllTimePopularityOfMajor = () => ajax.get('/xboe/m/boe/cases/queryAllTimePopularityOfMajor')
export default {
queryAllTimePopularityOfMajor,
getQueryRecommendRank,
queryPopularityOfMajor,
browsingHistory,
queryViewRecord,
queryFavoriteCaseOfIndex,
riseIntoRank,
cancelRiseIntoRank,
adjustRank,
indexList,
queryList,
queryListV2,
@@ -236,10 +202,7 @@ export default {
query,
usernameList,
queryPraises,
queryPraisesNew,
queryRecommendRank,
queryComments,
queryCommentsNew,
majorTypes,
details,
ids,

View File

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

View File

@@ -1,64 +0,0 @@
/**课程标签模块的相关处理*/
import ajax from '@/utils/xajax.js'
/**
* 分页查询:标签列表
* @param {Object} query
*/
const portalPageList = function(query) {
return ajax.post('/xboe/m/coursetag/page', query);
}
//改变标签的公共属性
const changeTagPublic = function (row){
// 返回 Promise 的 API 调用
return ajax.post('/xboe/m/coursetag/changePublicStatus', {
id: row.id,
isPublic: row.isPublic
});
}
//改变标签的热点属性
const changeTagHot = function (row){
// 返回 Promise 的 API 调用
return ajax.post('/xboe/m/coursetag/changeHotStatus', {
id: row.id,
isHot: row.isHot
});
}
//查询指定id的标签关联的所有课程
const showCourseByTag = function (query){
return ajax.post('/xboe/m/coursetag/showCourseByTag', query);
}
//解除指定id的课程和某个标签之间的关联关系
const unbindCourseTagRelation = function (params){
return ajax.post('/xboe/m/coursetag/unbind', params);
}
//编辑课程:标签模糊查询
const searchTags = function (params){
return ajax.post('/xboe/m/coursetag/searchTags', params);
}
//编辑课程:创建标签(与当前课程关联)
const createTag = function (params){
return ajax.post('/xboe/m/coursetag/createTag', params);
}
//获取最新前10个热点标签
const getHotTagList = function (params){
return ajax.post('/xboe/m/coursetag/getHotTagList', params);
}
export default {
portalPageList,
changeTagPublic,
changeTagHot,
showCourseByTag,
unbindCourseTagRelation,
searchTags,
createTag,
getHotTagList
}

View File

@@ -72,9 +72,6 @@ const querypaper = function(data) {
const getPaperContent = function(id) {
return ajax.get('/xboe/m/exam/paper/paper-content?id=' + id);
}
const newPaperContent = function(id){
return ajax.get('/xboe/m/course/content/exam/paper-content?courseExamId='+id);
}
export default {
detail,
update,
@@ -83,7 +80,6 @@ export default {
querylist,
querypaper,
getPaperContent,
newPaperContent,
batchImportCount,
batchImportData
}

View File

@@ -1,5 +1,5 @@
import ajax from '@/utils/xajax.js'
import ajax2 from '../unionAjax.js';
/**
* 按名称查询
@@ -9,9 +9,7 @@ const findByName = function(name) {
return ajax.get('/xboe/teacher/name?name=' + name);
}
const findByNameNew = function(name) {
return ajax2.get('/manageApi/admin/teacher/selectTeacher?name=' + name);
}
const updateTeacher=function(data){
return ajax.postJson('/xboe/teacher/update-teacher',data);
}
@@ -38,7 +36,7 @@ const detailTeacher=function (id){
* tlevelId级别
* salaryId发薪地
* tsystemId
* } query
* @returns
*/
@@ -219,7 +217,7 @@ export default {
update,
del,
detail,
findByNameNew,
findByName,
updateSysId,
has,
start,

View File

@@ -31,7 +31,7 @@ const formRequest = axios.create({
// axios中请求配置有baseURL选项表示请求URL公共部分
// baseURL: process.env.VUE_APP_CESOURCE_BASE_API,
//超时
timeout: 10000,
timeout: 15000,
})
//发送json对象的拦截器
formRequest.interceptors.request.use(config => {
@@ -44,7 +44,7 @@ formRequest.interceptors.request.use(config => {
}
return config
}, error => {
console.log(error)
// console.log(error)
Promise.reject(error)
});
formRequest.interceptors.response.use(res => {
@@ -71,7 +71,7 @@ formRequest.interceptors.response.use(res => {
}
},
error => {
console.log('err', error)
// console.log('err', error)
let {message} = error;
if (message == "Network Error") {
message = "网络异常,请稍后重试";

Binary file not shown.

Before

Width:  |  Height:  |  Size: 360 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 467 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 412 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 474 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 427 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 471 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 424 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 461 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 689 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 625 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 514 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 665 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 576 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 475 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 528 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 476 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 540 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 387 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 413 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 425 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 398 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 69 KiB

After

Width:  |  Height:  |  Size: 362 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 437 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 657 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 220 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 84 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 111 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 244 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 186 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.5 KiB

View File

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

View File

@@ -29,7 +29,7 @@ export default {
created() {
this.getBreadcrumb();
this.levelList.forEach(function(one){
console.log(one);
// console.log(one);
})
},
methods: {

View File

@@ -100,7 +100,7 @@ export default {
})
}
}
console.log(item)
// console.log(item)
this.$router.push({path:'/case/detail',query:{id:item.cases.id}})
// window.open(`${this.webBaseUrl}/article/detail?id=${item.objId}`)

View File

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

View File

@@ -425,28 +425,28 @@ export default {
return this.sysTypeMap.get(code);
},
onPlayerPlay() {
console.log("开始播放");
// console.log("开始播放");
},
onPlayerPause() {
console.log("暂停");
// console.log("暂停");
},
onPlayerEnded() {
console.log("播放结束");
// console.log("播放结束");
},
onPlayerPlaying(itme) {
console.log("当前播放" + itme);
// console.log("当前播放" + itme);
},
audioPlaying(item) {
console.log("当前播放" + item);
// console.log("当前播放" + item);
},
audioPlay() {
console.log("开始播放");
// console.log("开始播放");
},
audioPause() {
console.log("暂停");
// console.log("暂停");
},
audioEnd() {
console.log("播放结束");
// console.log("播放结束");
},
// 场景过滤
sceneFilter(forScene) {
@@ -541,7 +541,7 @@ export default {
this.tagList = result;
}
} catch (error) {
console.log(error);
// console.log(error);
}
} else {
this.tagList = [];
@@ -555,7 +555,7 @@ export default {
this.sceneList = result;
}
} catch (error) {
console.log(error);
// console.log(error);
}
},
// 教师列标,远程查询
@@ -637,9 +637,7 @@ export default {
}
this.teacherList = rs.result.teachers;
this.teacherName = rs.result.teachers;
this.teacher = rs.result.teachers.map(item => {
return `${item.teacherName}(${item.userNo})`
});
this.teacher = rs.result.teachers.map(res => res.teacherName);
this.totalContent = rs.result.contents.length; //计算总内容数
if (this.courseInfo.tags != "") {
this.showTags = this.courseInfo.tags.split(",");

View File

@@ -462,28 +462,28 @@ export default {
return this.sysTypeMap.get(code);
},
onPlayerPlay(){
console.log("开始播放");
// console.log("开始播放");
},
onPlayerPause(){
console.log("暂停");
// console.log("暂停");
},
onPlayerEnded(){
console.log("播放结束");
// console.log("播放结束");
},
onPlayerPlaying(itme){
console.log("当前播放"+itme);
// console.log("当前播放"+itme);
},
audioPlaying(item){
console.log("当前播放"+item);
// console.log("当前播放"+item);
},
audioPlay(){
console.log("开始播放");
// console.log("开始播放");
},
audioPause(){
console.log("暂停");
// console.log("暂停");
},
audioEnd(){
console.log("播放结束");
// console.log("播放结束");
},
// 场景过滤
sceneFilter(forScene) {
@@ -583,7 +583,7 @@ export default {
this.tagList = result;
}
} catch (error) {
console.log(error);
// console.log(error);
}
} else {
this.tagList = [];
@@ -597,7 +597,7 @@ export default {
this.sceneList = result;
}
} catch (error) {
console.log(error);
// console.log(error);
}
},
// 教师列标,远程查询
@@ -681,9 +681,7 @@ export default {
}
this.teacherList = rs.result.teachers;
this.teacherName = rs.result.teachers;
this.teacher = rs.result.teachers.map(item => {
return `${item.teacherName}(${item.userNo})`
});
this.teacher = rs.result.teachers.map(item => item.teacherName);
this.showTags = this.courseInfo.tags.split(",");
if (rs.result.course.resOwner3 == "") {
this.resOwnerArray = [

View File

@@ -284,7 +284,7 @@
this.type = 0;
},
handleChange(val) {
console.log(val);
// console.log(val);
},
formatChoose(format) {
let text = '';

View File

@@ -470,13 +470,13 @@
}
},
updateName(value){
console.log(value);
// console.log(value);
if(this.content.id==''){
return;
}
apiCourse.updateContentName({id:this.content.id,name:value}).then(rs=>{
if(rs.status!=200){
console.log('更新名称失败:'+rs.message);
// console.log('更新名称失败:'+rs.message);
}
})
},

View File

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

View File

@@ -85,28 +85,6 @@
<el-form-item label="考试说明">
<el-input type="textarea" show-word-limit v-model="examInfo.info" placeholder="关于考试的说明(限255字以内)" maxlength="255"></el-input>
</el-form-item>
<el-form-item label="随机模式">
<el-col :span="4">
<el-radio-group v-model="examInfo.randomMode">
<el-radio :label="true"></el-radio>
<el-radio :label="false"></el-radio>
</el-radio-group>
</el-col>
<el-col :span="20" v-if="examInfo.randomMode&&examInfo.paperType==1">
<el-form-item label="数量">
<el-input-number v-model="examInfo.qnum" :min="1" :max="examPaper.items.length" label="数量"></el-input-number>
<span style="margin-left:10px;" v-if="examPaper.items.length==0">先添加试题</span>
<span style="margin-left:10px;" v-if="examPaper.items.length>0">试卷有 {{examPaper.items.length}} 道试题</span>
</el-form-item>
</el-col>
<el-col :span="20" v-if="examInfo.randomMode&&examInfo.paperType==2">
<el-form-item label="数量">
<el-input-number v-model="examInfo.qnum" :min="1" :max="usePaper.counts" label="数量"></el-input-number>
<span style="margin-left:10px;" v-if="usePaper.counts==0">先选择试卷</span>
<span style="margin-left:10px;" v-if="usePaper.counts>0">试卷有 {{usePaper.counts}} 道试题</span>
</el-form-item>
</el-col>
</el-form-item>
</el-form>
</div>
<div v-if="examInfo.paperType==1">
@@ -307,9 +285,7 @@
return;
}
}
if(!this.examInfo.randomMode){
this.examInfo.qnum = 0
}
this.$emit("save",this.examInfo);
},
deleteExam(){ //删除
@@ -318,8 +294,6 @@
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.examInfo.randomMode = false;
this.examInfo.qnum = 0;
this.$emit("remove",this.examInfo);
}).catch(() => {

View File

@@ -253,9 +253,6 @@
</el-select> -->
<choice :teacherValue="teacherValues" @getTeacherList="getTeacherList"></choice>
</el-form-item>
<el-form-item label="标签" required>
<courseTag ref="courseTag" :courseId="curCourseId" :sysTypeList="sysTypeList" :initialTags="courseTags" @change="handleTagsChange"></courseTag>
</el-form-item>
<el-form-item label="关键字">
<el-input v-model.trim="keywords" maxlength="100" @keyup.enter.native="changeKeywords" placeholder="请输入关键字"></el-input>
<el-tag v-for="(tag,index) in tips" size="small" :key="index" closable type="info" @close="closeKeywordsTag(tag,index)">
@@ -405,7 +402,6 @@
</div>
</template>
<script>
import courseTag from "@/components/Course/courseTag.vue";
import choice from '@/components/Course/choice.vue';
import agreement from '@/components/Portal/agreement.vue';
import weikeContent from '@/components/Course/weikeContent.vue';
@@ -422,7 +418,6 @@ import apiCourse from '../../api/modules/course.js';
import apiCourseAudit from '../../api/modules/courseAudit.js';
import apiOrg from '../../api/system/organiza.js';
import apiUser from '../../api/system/user.js';
import apiCourseTag from '../../api/modules/courseTag.js';
import WxEditor from '@/components/Editor/index.vue';
import catalogSort from '@/components/Course/catalogSort.vue';
import { courseType, getType } from '../../utils/tools.js';
@@ -431,7 +426,7 @@ import filecloud from '@/components/FileCloud/index.vue';
import chooseOrg from '@/components/System/chooseOrg.vue';
export default {
props: {},
components: { courseTag, weikeContent, catalogCourseware, imageUpload, WxEditor, catalogSort,agreement,filecloud,choice,chooseOrg},
components: { weikeContent, catalogCourseware, imageUpload, WxEditor, catalogSort,agreement,filecloud,choice,chooseOrg},
data() {
return {
keywords:'',//关键字的定义
@@ -471,7 +466,6 @@ export default {
orgName:'',
orgNamePath:'',
orgKid:'',
courseTags:[],
courseInfo: {
id: '',
name: '',
@@ -598,15 +592,6 @@ export default {
closeKeywordsTag(item,index){
this.tips.splice(index, 1);
},
// 处理标签变化事件
handleTagsChange(tags) {
console.log("父组件:",tags)
let ids = "";
tags.forEach(tag=>{
ids += tag.id + ',';
})
this.courseInfo.tags = ids;
},
showChooseOrg(){
this.$refs.refChooseOrg.dlgShow = true;
},
@@ -737,7 +722,6 @@ export default {
this.$emit('close');
},
initShow(editData) {
console.log('初始化显示内容============', editData)
//console.log(this.$refs.weikePanel,'this.$refs.weikePanel');
//this.$refs.weikePanel.init();
//this.$refs.onlineCourse.resetData();
@@ -785,8 +769,6 @@ export default {
this.tips=[];
if (!editData) {
this.tips=[];
this.courseTags=[],
//console.log("新建课程?");
//以下为了保证初始化处理
this.weikeReset = Math.round(Math.random()) + '';
@@ -883,8 +865,6 @@ export default {
if (rs.status == 200) {
this.courseChooseShow = false;
this.courseInfo = rs.result;
this.curCourseId = this.courseInfo.id
console.log('保存课程成功',this.curCourseId)
if (this.courseChooseId == 1) {
this.weike.dlgShow = true;
} else {
@@ -913,8 +893,6 @@ export default {
try {
const { result, status } = await apiCourse.detail(id);
if (status === 200) {
this.courseTags = result.tagList;
console.log('获取课程信息成功', this.courseTags);
//把数据附给三个对象
if(result.course.visible==''){
result.course.visible=false;
@@ -980,6 +958,7 @@ export default {
}
});
}
this.resOwnerArray=[];
if (result.course.resOwner1 == '') {
this.resOwnerArray.push(result.course.resOwner1);
@@ -1050,7 +1029,7 @@ export default {
//this.requireSaveCourse=false;//不需要保存
}
} catch (error) {
console.log(error);
// console.log(error);
}
},
changeTeachers(t) {
@@ -1183,7 +1162,7 @@ export default {
this.tagList = result;
}
} catch (error) {
console.log(error);
// console.log(error);
}
} else {
this.tagList = [];
@@ -1264,7 +1243,7 @@ export default {
teachers: saveTeachers,
crowds:crowds
};
console.log(postData);
//console.log(postData);
//this.btnLoading=false;
apiCourse
.saveBase(postData)
@@ -1601,7 +1580,7 @@ export default {
this.sceneList = result;
}
} catch (error) {
console.log(error);
// console.log(error);
}
},
setCurContent(item) {

View File

@@ -48,17 +48,13 @@ export default {
let name = '';
if (this.course && this.course.name && this.course.name !== '') {
name = this.course.name.replace('color:#FF0000', 'color:#fff');
console.log("name gengxindata1 : ",name)
}
if (this.course && this.course.courseName && this.course.courseName !== '') {
name = this.course.courseName.replace('color:#FF0000', 'color:#fff');
console.log("name gengxindata2 : ",name)
}
if (this.course && this.course.title && this.course.title !== '') {
name = this.course.title.replace('color:#FF0000', 'color:#fff');
console.log("name gengxindata3 : ",name)
}
console.log("name gengxindata4 : ",name)
return name;
// course.name || course.courseName || course.title
},

View File

@@ -1,200 +0,0 @@
<template>
<div class="tag-container">
<el-select style="width: 100%;"
v-model="selectedTags"
multiple
filterable
value-key="id"
remote
reserve-keyword
:remote-method="debouncedSearch"
:loading="loading"
:disabled="sysTypeList.length===0"
placeholder="按回车键Enter创建标签"
@remove-tag="handleTagRemove"
@change="handleSelectionChange"
@keyup.enter.native="handleEnterKey"
>
<el-option
v-for="item in searchResults"
:key="item.id"
:label="item.tagName"
:value="item"
/>
</el-select>
</div>
</template>
<script>
import { debounce } from 'lodash'
import apiCourseTag from '@/api/modules/courseTag.js'
import { mapGetters } from 'vuex';
export default {
props: {
courseId:{
type:String,
require:true,
},
sysTypeList:{
type:Array,
require:true,
default: []
},
maxTags: {
type: Number,
default: 10
},
// 添加接收初始标签数据的props
initialTags: {
type: Array,
default: () => []
}
},
data() {
return {
selectedTags: [],
searchResults: [],
loading: false,
tagMap: new Map(),
inputBuffer: '',
params: {},
tag: {}
}
},
computed: {
...mapGetters(['userInfo']),
displayTags() {
return this.selectedTags.map(tag =>
typeof tag === 'object' ? tag : this.tagMap.get(tag)
).filter(Boolean)
}
},
created() {
this.debouncedSearch = debounce(this.doSearch, 500)
console.log("----------sysTypeList.length---------->"+this.sysTypeList.length)
console.log("----------sysTypeList.length---------->"+(this.sysTypeList.length===0))
},
// 添加:挂载时初始化标签数据
mounted() {
if (this.initialTags && this.initialTags.length > 0) {
this.selectedTags = this.initialTags;
this.searchResults = this.initialTags;
// 将初始标签添加到tagMap中确保删除功能正常
this.initialTags.forEach(tag => {
if (tag.id) {
this.tagMap.set(tag.id, tag);
}
});
}
},
watch: {
// 监听课程ID变化重置所有状态
courseId(newVal) {
this.resetTagState();
},
// 监听初始标签变化,重新加载
initialTags(newVal) {
this.selectedTags = newVal || [];
this.searchResults = newVal || [];
this.tagMap.clear(); // 清空旧缓存
newVal.forEach(tag => {
if (tag.id) this.tagMap.set(tag.id, tag);
});
}
},
methods: {
// 新增:重置标签状态的方法
resetTagState() {
this.selectedTags = [];
this.searchResults = [];
this.tagMap.clear();
this.loading = false;
this.params = {};
},
async doSearch(query) {
if (!query.trim()) {
this.searchResults = []
return
}
this.loading = true
try {
const {result:tags} = await apiCourseTag.searchTags({tagName:query})
tags.forEach(item => {
this.tagMap.set(item.id, item)
})
this.searchResults = tags
} finally {
this.loading = false
}
},
handleTagRemove(tagId) {
this.selectedTags = this.selectedTags.filter(id => id !== tagId)
this.$emit('change', this.displayTags)
},
removeTag(tagId) {
this.handleTagRemove(tagId)
},
//按回车键,创建新标签
handleEnterKey(event) {
const inputVal = event.target.value?.trim()
if (!this.searchResults.length && inputVal && this.selectedTags.length < this.maxTags) {
this.createNewTag(event.target.value.trim())
event.target.value = ''
}
},
// 新增:处理选择变化事件
handleSelectionChange() {
this.$emit('change', this.displayTags)
},
//创建新标签
async createNewTag(tagName) {
// 标签不能超过八个字
if (tagName.length > 8) {
this.$message.error('标签不能超过8个字')
return;
}
this.loading = true
try {
this.params.courseId = this.courseId;
this.params.tagName = tagName;
// 分类
if (this.sysTypeList.length > 0) {
this.params.sysType1 = this.sysTypeList[0]; //一级的id
}
if (this.sysTypeList.length > 1) {
this.params.sysType2 = this.sysTypeList[1]; //二级的id
}
if (this.sysTypeList.length > 2) {
this.params.sysType3 = this.sysTypeList[2]; //三级的id
}
const {result:newTag} = await apiCourseTag.createTag(this.params)
this.$message.success('标签创建成功');
this.searchResults.push(newTag)
console.log("----------newTag---------->",this.searchResults)
this.tagMap.set(newTag.id, newTag)
this.$emit('change', this.displayTags)
} finally {
this.loading = false
}
},
}
}
</script>
<style scoped>
.tag-container {
position: relative;
}
.tag-preview {
margin-top: 8px;
}
.el-tag {
margin-right: 6px;
margin-bottom: 6px;
}
</style>

View File

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

View File

@@ -1,61 +1,61 @@
<template>
<div>
<div v-if="has" class="homework-div">
<div>
<div class="homework-title">作业名称</div>
<div class="homework-content">{{info.name}}</div>
</div>
<div>
<div class="homework-title">内容</div>
<div class="homework-content">{{info.content}}</div>
</div>
<div v-if="info.file">
<div class="homework-title">附件</div>
<div class="homework-content" style="color: blue">
<a :href="fileBaseUrl+info.file" target="_blank">下载作业附件</a></div>
</div>
<div>
<div class="homework-title">截止时间</div>
<div class="homework-content" :style="{color:close? 'red':''}">{{info.deadTime}}</div>
</div>
<div v-show="!close && showSubmit">
<div v-if="info.submitMode>1">
<div class="homework-title">作业内容</div>
<div class="homework-content">
<el-input type="textarea" rows="5" show-word-limit maxlength="255" v-model="answer" placeholder="(限255个字)"></el-input>
<div>
<div v-if="has" class="homework-div">
<div>
<div class="homework-title">作业名称</div>
<div class="homework-content">{{info.name}}</div>
</div>
<div>
<div class="homework-title">内容</div>
<div class="homework-content">{{info.content}}</div>
</div>
<div v-if="info.file">
<div class="homework-title">附件</div>
<div class="homework-content" style="color: blue">
<a :href="fileBaseUrl+info.file" target="_blank">下载作业附件</a></div>
</div>
<div>
<div class="homework-title">截止时间</div>
<div class="homework-content" :style="{color:close? 'red':''}">{{info.deadTime}}</div>
</div>
<div v-show="!close && showSubmit">
<div v-if="info.submitMode>1">
<div class="homework-title">作业内容</div>
<div class="homework-content">
<el-input type="textarea" rows="5" show-word-limit maxlength="255" v-model="answer" placeholder="(限255个字)"></el-input>
</div>
</div>
<div v-if="info.submitMode==1 || info.submitMode==3">
<div class="homework-title">上传作业</div>
<div class="homework-content">
<div v-if="filePath!=''">
<el-tag closable type="success" @close="removeHomeworkFile">作业附件</el-tag><span style="margin-left: 10px;">请点击下面的提交</span>
</div>
<div v-else >
<file-upload dir="files" :isShowTip="false" @success="uploadHomeworkFile" @remove="removeHomeworkFile"></file-upload>
</div>
</div>
</div>
<div style="text-align: center;padding-bottom: 10px;">
<el-button type="primary" :disabled="isSubmit" @click="submitHomework()">{{records.length>0?'重新提交':'提交'}}</el-button>
</div>
</div>
<div v-show="showRecord"><!--作业提交记录-->
<el-table :data="records" style="width: 100%" border>
<el-table-column prop="endTime" label="提交时间" width="100" align="center"></el-table-column>
<el-table-column label="内容">
<template slot-scope="scope">
<div>{{scope.row.hwAnswer}}</div>
<div style="padding-top: 5px;" v-if="scope.row.filePath!=''">
<a :href="fileBaseUrl+scope.row.filePath" target="_blank">下载上传的作业文件</a>
</div>
</template>
</el-table-column>
</el-table>
</div>
</div>
<div v-else style="text-align: center;padding-top: 20px;color: red;">此课程无作业</div>
</div>
</div>
<div v-if="info.submitMode==1 || info.submitMode==3">
<div class="homework-title">上传作业</div>
<div class="homework-content">
<div v-if="filePath!=''">
<el-tag closable type="success" @close="removeHomeworkFile">作业附件</el-tag><span style="margin-left: 10px;">请点击下面的提交</span>
</div>
<div v-else >
<file-upload dir="files" :isShowTip="false" @success="uploadHomeworkFile" @remove="removeHomeworkFile"></file-upload>
</div>
</div>
</div>
<div style="text-align: center;padding-bottom: 10px;">
<el-button type="primary" :disabled="isSubmit" @click="submitHomework()">{{records.length>0?'重新提交':'提交'}}</el-button>
</div>
</div>
<div v-show="showRecord"><!--作业提交记录-->
<el-table :data="records" style="width: 100%" border>
<el-table-column prop="endTime" label="提交时间" width="100" align="center"></el-table-column>
<el-table-column label="内容">
<template slot-scope="scope">
<div>{{scope.row.hwAnswer}}</div>
<div style="padding-top: 5px;" v-if="scope.row.filePath!=''">
<a :href="fileBaseUrl+scope.row.filePath" target="_blank">下载上传的作业文件</a>
</div>
</template>
</el-table-column>
</el-table>
</div>
</div>
<div v-else style="text-align: center;padding-top: 20px;color: red;">此课程无作业</div>
</div>
</template>
<script>
@@ -65,21 +65,21 @@ import FileUpload from '@/components/FileUpload/index.vue';
export default {
components: { FileUpload },
props:{
studyId: {
type: String,
},
showRecord:{
type:Boolean,
default:true
},
showSubmit:{
type:Boolean,
default:true
},
content: {
type: Object,
default:()=>{}
}
studyId: {
type: String,
},
showRecord:{
type:Boolean,
default:true
},
showSubmit:{
type:Boolean,
default:true
},
content: {
type: Object,
default:()=>{}
}
},
data() {
return {
@@ -106,26 +106,26 @@ export default {
methods: {
loadHomeworkInfo(){
apiCourse.getHomework(this.content.id).then(res=>{
if(res.status==200){
this.info=res.result;
//检查是否过期
if(res.result.deadTime!='' && res.result.deadTime != null){
var d = new Date(res.result.deadTime);
var now=new Date();
if(now.getTime() > d.getTime()){
this.close=true;
} else {
this.close=false;
}
if(res.status==200){
this.info=res.result;
//检查是否过期
if(res.result.deadTime!=''){
var d = new Date(res.result.deadTime);
var now=new Date();
if(now.getTime() > d.getTime()){
this.close=true;
} else {
this.close=false;
}
if(!this.showTest && this.showRecord){
this.loadRecord();
}
}else if(res.status==404){
//没有找到作业信息
}else{
this.$message.error(res.message);
}
}
if(!this.showTest && this.showRecord){
this.loadRecord();
}
}else if(res.status==404){
//没有找到作业信息
}else{
this.$message.error(res.message);
}
});
//
},
@@ -149,15 +149,15 @@ export default {
this.filePath = res.result.filePath;
},
removeHomeworkFile(){
this.$confirm('您确定要删除已上传的附件吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.filePath='';
//从服务器端删除
this.$message({ type: 'success', message: '删除成功!' });
})
this.$confirm('您确定要删除已上传的附件吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.filePath='';
//从服务器端删除
this.$message({ type: 'success', message: '删除成功!' });
})
},
submitHomework() {//提交作业
@@ -192,16 +192,16 @@ export default {
}
apiCourseStudy.saveHomework(pamars).then(res=>{
this.isSubmit = false
if(res.status==200){
this.$message.success("作业已提交");
this.filePath='';
this.answer='';
this.studyItemId=res.result.id;
this.records=[res.result];
this.$emit("submit", this.content);
}else {
this.$message.error(res.message);
}
if(res.status==200){
this.$message.success("作业已提交");
this.filePath='';
this.answer='';
this.studyItemId=res.result.id;
this.records=[res.result];
this.$emit("submit", this.content);
}else {
this.$message.error(res.message);
}
})
},
@@ -210,27 +210,27 @@ export default {
</script>
<style scoped lang="scss">
.homework-div {
border: 1px solid #dadada;
min-height: 500px;
padding: 20px;
font-size: 14px;
display: flex;
flex-direction: column;
align-items: flex-start;
>div{
width: 100%;
text-align: left;
.homework-title {
margin-bottom: 10px;
font-weight: 600;
}
.homework-content {
color: #666;
margin-bottom: 10px;
width: 100%;
}
.homework-div {
border: 1px solid #dadada;
min-height: 500px;
padding: 20px;
font-size: 14px;
display: flex;
flex-direction: column;
align-items: flex-start;
>div{
width: 100%;
text-align: left;
.homework-title {
margin-bottom: 10px;
font-weight: 600;
}
.homework-content {
color: #666;
margin-bottom: 10px;
width: 100%;
}
}
}
</style>

View File

@@ -236,7 +236,7 @@ export default {
// }, 10000);
},
noteEdit(note) {
console.log(note)
// console.log(note)
this.isEdit = true;
this.mynoteData = note;
this.editNodeOpenType = note.openType;

View File

@@ -401,28 +401,6 @@
<el-form-item label="考试说明">
<el-input type="textarea" show-word-limit v-model="exam.info.info" placeholder="关于考试的说明(限255字以内)" maxlength="255"></el-input>
</el-form-item>
<el-form-item label="随机模式">
<el-col :span="4">
<el-radio-group v-model="exam.info.randomMode">
<el-radio :label="true"></el-radio>
<el-radio :label="false"></el-radio>
</el-radio-group>
</el-col>
<el-col :span="20" v-if="exam.info.randomMode&&exam.info.paperType==1">
<el-form-item label="数量">
<el-input-number v-model="exam.info.qnum" :min="1" :max="exam.paperJson.items.length" label="数量"></el-input-number>
<span style="margin-left:10px;" v-if="exam.paperJson.items.length==0">先添加试题</span>
<span style="margin-left:10px;" v-if="exam.paperJson.items.length>0">试卷有 {{exam.paperJson.items.length}} 道试题</span>
</el-form-item>
</el-col>
<el-col :span="20" v-if="exam.info.randomMode&&exam.info.paperType==2">
<el-form-item label="数量">
<el-input-number v-model="exam.info.qnum" :min="1" :max="usePaper.counts" label="数量"></el-input-number>
<span style="margin-left:10px;" v-if="usePaper.counts==0">先选择试卷</span>
<span style="margin-left:10px;" v-if="usePaper.counts>0">试卷有 {{usePaper.counts}} 道试题</span>
</el-form-item>
</el-col>
</el-form-item>
</el-form>
</div>
<div v-if="exam.info.paperType==1">
@@ -1081,14 +1059,12 @@
if(this.exam.info.paperType==2){
if(!this.exam.info.paperId){
this.$message.error("您还未选择任何试卷");
this.loading=false;
return;
}
}else{
//检查是不是所有的试题都有了答案
if(this.exam.paperJson.items.length==0){
this.$message.error("您还没有添加考试的试题");
this.loading=false;
return;
}
let pass=true;
@@ -1111,9 +1087,6 @@
}
this.exam.info.paperContent=JSON.stringify(this.exam.paperJson);
}
if(!this.exam.info.randomMode){
this.exam.info.qnum = 0
}
postData.exam=this.exam.info;
postData.content.contentName='考试';
this.examChange = deepClone(this.exam);
@@ -1179,8 +1152,6 @@
postData.id=this.exam.content.id;
postData.ctype=this.exam.content.contentType;
curContent=this.exam.content;
this.exam.info.randomMode = false;
this.exam.info.qnum = 0
}else if(index==4){
postData.id=this.assess.content.id;
postData.ctype=this.assess.content.contentType;

View File

@@ -164,7 +164,7 @@ export default {
change(e) {
let file = e.target.files[0]
const formData = new FormData()
console.log(file,'file');
// console.log(file,'file');
formData.append('file', file)
upload(formData)
.then(res => {

View File

@@ -285,7 +285,7 @@
}
if(hasItem!=null){
console.log(hasItem);
// console.log(hasItem);
this.$message.error('选择的试题重复:'+hasItem.title)
return
}

View File

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

View File

@@ -51,7 +51,7 @@
watch:{
has(newVal,oldVal){
this.has=newVal;
console.log(newVal,oldVal,'测试问题');
// console.log(newVal,oldVal,'测试问题');
this.hasFollow=newVal;
if(newVal!=oldVal && this.auto){
this.autoCheck();

View File

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

View File

@@ -290,7 +290,7 @@ import apiUser from "@/api/system/user.js";
//console.log(this.mypageList,'this.mypageList');
$this.getUserData(res.result.list,2);
}else{
console.log('加载关注我数据错误:'+res.message);
// console.log('加载关注我数据错误:'+res.message);
}
})
},

View File

@@ -102,13 +102,13 @@ export default {
document.documentElement.scrollTop = 0;
},
loadProgress(e){
console.log(e,'loadProgress');
// console.log(e,'loadProgress');
},
loadedPageHandle(e){
this.pdfpage = e;
},
loadPdfHandle(e){
console.log(e,'loadPdfHandle');
// console.log(e,'loadPdfHandle');
},
clickMore(){
if(this.totalPages>this.showPages){

View File

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

View File

@@ -92,19 +92,11 @@
<div class="comment-btns">
<!-- <a><svg-icon icon-class="like"></svg-icon><span>66</span></a> -->
<div style="display: flex" v-show="btnsShowRowId==com.id">
<div v-show="btnsShowRowId==com.id">
<a style="display: flex;align-items: center;" @click="showReply(com)">
<!-- <svg-icon icon-class="comment" style="margin-right: 0px;font-size: 16px;"></svg-icon> -->
<div class="is_comment"></div>
<span>回复</span>
</a>
<a @click="showReply(com)"><svg-icon icon-class="comment" style="margin-right: 0px;font-size: 16px;"></svg-icon><span>回复</span></a>
<!--必须当前登录人是一个人-->
<a style="display: flex;align-items: center;" v-if="userInfo.aid==com.sysCreateAid" @click="delCommnet(com,comIdx)">
<!-- <svg-icon icon-class="remove" style="margin-right: 0px;font-size: 16px;"></svg-icon> -->
<div class="is_remove"></div>
<span>删除</span>
</a>
<a v-if="userInfo.aid==com.sysCreateAid" @click="delCommnet(com,comIdx)"><svg-icon icon-class="remove" style="margin-right: 0px;font-size: 16px;"></svg-icon><span>删除</span></a>
<a v-if="com.replyList && com.replyList.length==5" @click="showMoreReply(com)" ><svg-icon icon-class="all" style="margin-right: 0px;font-size: 16px;"></svg-icon><span>全部</span></a>
</div>
</div>
@@ -431,7 +423,7 @@
})
});
}else{
console.log('加载用户头像信息:'+res.error);
// console.log('加载用户头像信息:'+res.error);
//this.$message.error(res.message);
}
});
@@ -558,7 +550,7 @@
this.$message.error(res.message);
}
});
this.loadData(false);
}
},
@@ -633,7 +625,6 @@
this.$message.error(res.message);
}
});
this.loadData(false);
},
delCommnet(com,idx){
if(com.replyList!='' && com.replyList.length>0){
@@ -969,28 +960,6 @@
line-height: 35px;
a{
margin-right:15px;
&:hover{
.is_comment{
background: url('../../assets/images/case/Frame(9).png');
background-size: 100%;
}
.is_remove{
background: url('../../assets/images/case/Frame(15).png');
background-size: 100%;
}
}
.is_comment{
width: 16px;
height: 16px;
background: url('../../assets/images/case/Frame.png');
background-size: 100%;
}
.is_remove{
width: 16px;
height: 16px;
background: url('../../assets/images/case/Frame(8).png');
background-size: 100%;
}
span{
margin-left: 6px;
color: #8590A6;

View File

@@ -268,7 +268,7 @@ export default {
conType,
}
apiMessage.save(message).then(res=>{
if(res.status!=200){ console.log('发送消息失败') }
// if(res.status!=200){ console.log('发送消息失败') }
})
},
checkHas(){
@@ -301,7 +301,7 @@ export default {
},
addPraise(){
if(this.type==0){
console.log('未设置type值,1表课程,2表文章3表案例4表问答,6笔记')
// console.log('未设置type值,1表课程,2表文章3表案例4表问答,6笔记')
return;
}
//需要判断是否已点赞,已点赞的不再加
@@ -359,7 +359,7 @@ export default {
}
this.$message({message:'取消点赞',type:'success'})
}else{
console.log('取消失败:'+res.message);
// console.log('取消失败:'+res.message);
}
})
} else {
@@ -430,7 +430,7 @@ export default {
this.$store.dispatch("userTrigger", event);
}
}else{
console.log('点赞失败:'+res.message);
// console.log('点赞失败:'+res.message);
}
})
}
@@ -443,7 +443,7 @@ export default {
return
}
if(this.type==0){
console.log('未设置type值,1表课程,2表文章3表案例4表问答')
// console.log('未设置type值,1表课程,2表文章3表案例4表问答')
return;
}
//需要判断是否已点赞,已点赞的不再加
@@ -479,7 +479,7 @@ export default {
this.$message({message:'已取消收藏',type:'success'});
//this.$emit('addFavorite',res.result);//添加收藏,如果是true代表添加成功false代表已存在
}else{
console.log('取消收藏失败:'+res.message);
// console.log('取消收藏失败:'+res.message);
}
})
} else {
@@ -499,7 +499,7 @@ export default {
this.$message({message:'已加入收藏',type:'success'});
//this.$emit('addFavorite',res.result);//添加收藏,如果是true代表添加成功false代表已存在
}else{
console.log('加入收藏失败:'+res.message);
// console.log('加入收藏失败:'+res.message);
}
})
}

View File

@@ -10,8 +10,7 @@
<el-tooltip effect="light" :content="type == 4 || type == 5 ?'回答':'回复'" placement="left" :visible-arrow="false" popper-class="text-tooltip">
<!-- <svg-icon style="margin-right: 0;" icon-class="comment"></svg-icon> -->
<!-- <img style="width:16px;height:14px;vertical-align: middle;" :src="require('@/assets/images/icon/answers.png')"> -->
<!-- <svg-icon style="margin-right: 0;font-size: 14px;" icon-class="comment"></svg-icon> -->
<div class="is_comment"></div>
<svg-icon style="margin-right: 0;font-size: 14px;" icon-class="comment"></svg-icon>
</el-tooltip>
<span class="interact-bar-value"> {{ data.answers? data.answers:0}}</span>
</div>
@@ -24,16 +23,14 @@
</div>
<div v-if="comments" class="interact-bar-btn" :style="`min-width: ${nodeWidth};`" :class="{cursor:!readonly}">
<el-tooltip effect="light" content="评论" placement="left" :visible-arrow="false" popper-class="text-tooltip">
<!-- <svg-icon style="margin-right: 0;font-size: 14px;" icon-class="comment"></svg-icon> -->
<div class="is_comment"></div>
<svg-icon style="margin-right: 0;font-size: 14px;" icon-class="comment"></svg-icon>
</el-tooltip>
<span class="interact-bar-value"> {{data.comments? data.comments:0}}</span>
</div>
<div v-if="praises" @click="addPraise()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
<el-tooltip effect="light" content="点赞" placement="top" :visible-arrow="false" popper-class="text-tooltip">
<!-- <svg-icon style="margin-right: 0;font-size: 14px;" :icon-class="isPraise?'praised':'like'"></svg-icon> -->
<div class="is_praise" :class="isPraise?'is_praise_a':'is_praise'"></div>
<svg-icon style="margin-right: 0;font-size: 14px;" :icon-class="isPraise?'praised':'like'"></svg-icon>
</el-tooltip>
<span class="interact-bar-value"> {{ data.praises? data.praises:0}}</span>
</div>
@@ -41,22 +38,19 @@
<div v-if="favorites" @click.stop="addFavorite()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
<el-tooltip effect="light" content="收藏" placement="top" :visible-arrow="false" popper-class="text-tooltip">
<svg-icon v-if="courseExclusive" style="font-size: 32px;margin-right: 0;" :icon-class="isFavorite?'collectedCourse':'collectionCourse'"></svg-icon>
<!-- <svg-icon v-else style="margin-right: 0;" :style="{'font-size':(size+2)+'px'}" :icon-class="isFavorite?'scactive2':'xihuan'"></svg-icon> -->
<div v-else class="is_favorite" :class="isFavorite?'is_favorite_a':'is_favorite'"></div>
<svg-icon v-else style="margin-right: 0;" :style="{'font-size':(size+2)+'px'}" :icon-class="isFavorite?'scactive2':'xihuan'"></svg-icon>
</el-tooltip>
<span v-if="!courseExclusive" class="interact-bar-value"> {{ data.favorites? data.favorites:0}}</span>
</div>
<div v-if="shares" @click="addShare()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
<el-tooltip effect="light" content="分享" placement="top" :visible-arrow="false" popper-class="text-tooltip">
<!-- <svg-icon icon-class="share" style="margin-right: 0;" :style="{'font-size':(size+2)+'px'}"></svg-icon> -->
<div class="is_share"></div>
<svg-icon icon-class="share" style="margin-right: 0;" :style="{'font-size':(size+2)+'px'}"></svg-icon>
</el-tooltip>
<span class="interact-bar-value"> {{data.shares}}</span>
</div>
<div v-if="views" style="cursor: default;" :style="`min-width: ${nodeWidth};margin-left:${data.views>1000? '20px':'20px'}`" class="interact-bar-btn ese-view" :class="{cursor:!readonly}">
<el-tooltip effect="light" content="浏览量" placement="top" :visible-arrow="false" popper-class="text-tooltip">
<!-- <svg-icon style="margin-right: 0; font-size:22px;" icon-class="eyes"></svg-icon> -->
<div class="is_view"></div>
<svg-icon style="margin-right: 0; font-size:22px;" icon-class="eyes"></svg-icon>
</el-tooltip>
<!-- <div style="float:right;margin-left:8px"> -->
<span class="interact-bar-value eyes-view" > {{ formatNum(data.views)}}</span>
@@ -327,7 +321,7 @@ export default {
conType,
}
apiMessage.save(message).then(res=>{
if(res.status!=200){ console.log('发送消息失败') }
// if(res.status!=200){ console.log('发送消息失败') }
})
},
checkHas(){
@@ -360,7 +354,7 @@ export default {
},
addPraise(){
if(this.type==0){
console.log('未设置type值,1表课程,2表文章3表案例4表问答,6笔记')
// console.log('未设置type值,1表课程,2表文章3表案例4表问答,6笔记')
return;
}
//需要判断是否已点赞,已点赞的不再加
@@ -418,7 +412,7 @@ export default {
}
this.$message({message:'取消点赞',type:'success'})
}else{
console.log('取消失败:'+res.message);
// console.log('取消失败:'+res.message);
}
})
} else {
@@ -489,7 +483,7 @@ export default {
this.$store.dispatch("userTrigger", event);
}
}else{
console.log('点赞失败:'+res.message);
// console.log('点赞失败:'+res.message);
}
})
}
@@ -502,7 +496,7 @@ export default {
return
}
if(this.type==0){
console.log('未设置type值,1表课程,2表文章3表案例4表问答')
// console.log('未设置type值,1表课程,2表文章3表案例4表问答')
return;
}
//需要判断是否已点赞,已点赞的不再加
@@ -536,10 +530,9 @@ export default {
this.$store.dispatch("unicomFavorites",false)
}
this.$message({message:'已取消收藏',type:'success'});
this.$emit('deleteFavorite',true)
//this.$emit('addFavorite',res.result);//添加收藏,如果是true代表添加成功false代表已存在
}else{
console.log('取消收藏失败:'+res.message);
// console.log('取消收藏失败:'+res.message);
}
})
} else {
@@ -559,7 +552,7 @@ export default {
this.$message({message:'已加入收藏',type:'success'});
//this.$emit('addFavorite',res.result);//添加收藏,如果是true代表添加成功false代表已存在
}else{
console.log('加入收藏失败:'+res.message);
// console.log('加入收藏失败:'+res.message);
}
})
}
@@ -720,77 +713,6 @@ export default {
justify-content: flex-end;
.interact-bar-btn {
margin: 0 0 0 15px;
display: flex;
justify-content: end;
align-items: center;
&:hover{
.is_praise{
background: url('../../assets/images/case/Frame\(10\).png');
}
.is_favorite{
background: url('../../assets/images/case/Frame\(11\).png');
background-size: 100%;
}
.is_share{
background: url('../../assets/images/case/Frame\(14\).png');
background-size: 100%;
}
.is_view{
background: url('../../assets/images/case/Frame\(12\).png');
background-size: 100%;
}
.is_comment{
background: url('../../assets/images/case/Frame\(9\).png');
background-size: 100%;
}
}
.is_comment{
width: 16px;
height: 16px;
background: url('../../assets/images/case/Frame.png');
background-size: 100%;
margin-right: 4px;
}
.is_view{
width: 17px;
height: 17px;
background: url('../../assets/images/case/Frame\(5\).png');
background-size: 100%;
margin-right: 4px;
}
.is_share{
width: 16px;
height: 16px;
background: url('../../assets/images/case/Frame\(7\).png');
background-size: 100%;
margin-right: 4px;
}
.is_praise{
width: 14px;
height: 14px;
background: url('../../assets/images/case/Frame\(1\).png');
margin-right: 4px;
}
.is_praise_a{
width: 14px;
height: 14px;
background: url('../../assets/images/case/Frame\(10\).png');
margin-right: 4px;
}
.is_favorite{
width: 16px;
height: 16px;
background: url('../../assets/images/case/Frame\(2\).png');
background-size: 100%;
margin-right: 4px;
}
.is_favorite_a{
width: 16px;
height: 16px;
background: url('../../assets/images/case/Frame\(11\).png');
background-size: 100%;
margin-right: 4px;
}
}
.interact-bar-value{
// color:#6E7B84; ui图给的颜色但是效果于ui图效果不一样也没有透明度所以找一个相近的和谐的颜色

View File

@@ -309,7 +309,7 @@
})
});
}else{
console.log('加载用户头像信息:'+res.error);
// console.log('加载用户头像信息:'+res.error);
//this.$message.error(res.message);
}
});

View File

@@ -245,7 +245,7 @@ export default {
},
toNeedCourse(){
// 需要先切换标签
console.log('this.identity='+this.identity);
// console.log('this.identity='+this.identity);
if(this.identity==5 || this.identity==2){
this.$store.dispatch('SetCurIdentity',2);
// this.$router.push('/need/course?open=new');

View File

@@ -51,8 +51,7 @@
<el-dropdown placement="bottom" @command="handleContributor">
<span class="el-dropdown-link" style="font-size:16px;cursor: pointer;" :style="{color:textColor}">贡献者大会</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="three">2024</el-dropdown-item>
<el-dropdown-item command="one" divided>2023</el-dropdown-item>
<el-dropdown-item command="one">2023</el-dropdown-item>
<el-dropdown-item command="two" divided>2022</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
@@ -137,30 +136,6 @@
</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>
<popup></popup><yearMedal></yearMedal>
</div>
@@ -168,9 +143,7 @@
<script>
import { mapGetters, mapActions } from 'vuex';
import apiMessage from '@/api/system/message.js';
import apiManage from '@/api/manage/manage.js';
import popup from '@/components/AlertPopup.vue';
import { getToken } from '@/utils/token.js';
import yearMedal from '@/components/Popup/China2023.vue';
import apiBoeCourse from '@/api/boe/course.js';
import {userAvatarText} from "@/utils/tools.js";
@@ -214,7 +187,7 @@ export default {
},
watch:{
keywords(newval){
console.log(newval,9999);
// console.log(newval,9999);
if(this.findType == '1'){
this.keyword = newval
}
@@ -230,8 +203,6 @@ export default {
keyword: '',
isTiao: false,
sex:'',
projectDialogVisible: false,
studentInfo: {},
};
},
mounted() {
@@ -242,27 +213,12 @@ export default {
//this.loadPopupConfig();
},
methods: {
//BPM项目:立即报名
signUpNow(){
const pid = this.studentInfo.projectId;
apiManage.signUpBpmProjectNow(pid).then(res=>{
this.projectDialogVisible = false;
})
},
//BPM项目重新报名
signUpAgain(){
const pid = this.studentInfo.projectId;
const studentId=this.studentInfo.studentId;
const data = {"pid":pid,"studentId":studentId};
apiManage.signUpBpmProjectAgain(data).then(res=>{
this.projectDialogVisible = false;
})
},
setCurIdentity(iden){
this.$store.dispatch('SetCurIdentity',iden);
},
tomy(){
console.log('lll')
// console.log('lll')
},
loadBoeData() {
if(this.studyTaskCount>0){
@@ -290,39 +246,14 @@ export default {
let obj = {
one: urlPre + "/web/contributornew/index",
two: urlPre + "/web/contributor/index",
three: urlPre + "/web/contributor_2024/index"
};
// console.log(obj[val] + "?token=" + encodeURIComponent(getToken()), 'getOrgToken()::',getToken(), encodeURIComponent(getToken()));
window.open(obj[val] + "?token=" + encodeURIComponent(getToken()));
// window.location.href = obj[val] + "?token=" + encodeURIComponent(getToken());
window.open(obj[val]);
},
handleCommand(val) {
if (val === "four") {
window.open("https://m.qingxuetang.com/x/?appId=qxtcorp306130")
// 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&params=' + params);
}else if(bpmStatus == 3){//已拒绝--则弹窗含“重新报名”
this.studentInfo.bpmStatusName="已拒绝(含个人撤回)";
this.projectDialogVisible=true;
}
})
} else {
} else {
let urlPre = window.location.protocol + "//" + window.location.host;
// process.env.VUE_APP_BOE_WEB_URL
let obj = {
@@ -331,7 +262,7 @@ export default {
two: urlPre + "/grow180/login",
three: this.webBaseUrl + "/study/index?study=1",
// 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",
seven: this.webBaseUrl + '/grateful/index'
};
@@ -665,27 +596,4 @@ text-align: center;
margin-right: 8px;
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>

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