mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git
synced 2025-12-10 03:16:42 +08:00
Compare commits
3 Commits
master_new
...
zcwy_0822_
| Author | SHA1 | Date | |
|---|---|---|---|
|
1b3064f2ab | ||
|
|
c5f6f5c83e | ||
|
|
45027ca77e |
Binary file not shown.
@@ -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,7 +111,7 @@ const getStudyContentItem = function(studyId,contentId) {
|
||||
* @returns
|
||||
*/
|
||||
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);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -119,7 +119,7 @@ const studyVideoTime = function(data) {
|
||||
* @returns
|
||||
*/
|
||||
const lastStudy = function() {
|
||||
return ajax.get('/xboe/school/study/course/last-study');
|
||||
return ajax.get('/xboe/school/study/course/last-study');
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -136,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);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -150,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);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -161,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);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -173,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);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -185,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);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -200,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);
|
||||
}
|
||||
/**
|
||||
* 当前课程学习记录
|
||||
@@ -216,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);
|
||||
}
|
||||
|
||||
|
||||
@@ -241,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);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -261,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);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -279,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);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -288,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);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -297,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);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -306,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);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -318,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);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -327,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});
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -338,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);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -351,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);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -360,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}`);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -389,48 +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,
|
||||
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
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import ajax from '@/utils/xajax.js'
|
||||
import ajax2 from '../unionAjax.js';
|
||||
|
||||
|
||||
/**
|
||||
* 按名称查询
|
||||
@@ -9,9 +9,7 @@ const findByName = function(name) {
|
||||
return ajax.get('/xboe/teacher/name?name=' + name);
|
||||
}
|
||||
|
||||
const findByNameNew = function(name) {
|
||||
return ajax2.get('/manageApi/admin/teacher/selectTeacher?name=' + name);
|
||||
}
|
||||
|
||||
const updateTeacher=function(data){
|
||||
return ajax.postJson('/xboe/teacher/update-teacher',data);
|
||||
}
|
||||
@@ -219,7 +217,7 @@ export default {
|
||||
update,
|
||||
del,
|
||||
detail,
|
||||
findByNameNew,
|
||||
findByName,
|
||||
updateSysId,
|
||||
has,
|
||||
start,
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 212 KiB |
BIN
src/assets/images/hotforum/04.png
Normal file
BIN
src/assets/images/hotforum/04.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 220 KiB |
@@ -110,7 +110,7 @@ body {margin: 0px;padding: 0px;}
|
||||
padding-bottom:12px
|
||||
}
|
||||
.ranking-data{
|
||||
min-height: 246px;
|
||||
min-height: 196px;
|
||||
margin: 0px;
|
||||
overflow-y: auto;
|
||||
}
|
||||
@@ -130,7 +130,7 @@ body {margin: 0px;padding: 0px;}
|
||||
padding-bottom:12px
|
||||
}
|
||||
.ranking-data{
|
||||
min-height: 246px;
|
||||
min-height: 196px;
|
||||
margin: 0px;
|
||||
// overflow-y: auto;
|
||||
}
|
||||
|
||||
@@ -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> -->
|
||||
|
||||
@@ -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(",");
|
||||
|
||||
@@ -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 = [
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
</el-input>
|
||||
<div class="choice-box" v-if="teacherDownList.length>0">
|
||||
<ul>
|
||||
<li v-for="te in teacherDownList" :key="te.key" @click="changeTeachers(te)">{{te.teacherName + '(' + te.teacherCode + ')'}}</li>
|
||||
<li v-for="te in teacherDownList" :key="te.key" @click="changeTeachers(te)">{{te.teacherName + te.teacherCode}}</li>
|
||||
</ul>
|
||||
</div>
|
||||
<!-- <el-select
|
||||
@@ -88,15 +88,15 @@
|
||||
if (this.teacherValues !== '') {
|
||||
this.loading = true;
|
||||
try {
|
||||
const { data, message, code } = await apiTeacher.findByNameNew(this.teacherValues);
|
||||
const { result, message, status } = await apiTeacher.findByName(this.teacherValues);
|
||||
this.loading = false;
|
||||
if (code === 200) {
|
||||
if (status === 200) {
|
||||
let list = [];
|
||||
data.forEach(item => {
|
||||
result.forEach(item => {
|
||||
list.push({
|
||||
teacherId: item.id,
|
||||
teacherName: item.name,
|
||||
teacherCode: item.mobile
|
||||
teacherCode: item.code
|
||||
});
|
||||
});
|
||||
this.teacherDownList = list;
|
||||
|
||||
@@ -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(() => {
|
||||
|
||||
|
||||
@@ -326,11 +326,12 @@ export default {
|
||||
return qitems;
|
||||
},
|
||||
startTest(){
|
||||
apiExamPaper.newPaperContent(this.info.id).then(res=>{
|
||||
if(res.error == ''&&res.result != ''){
|
||||
if(this.info.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];
|
||||
@@ -339,74 +340,34 @@ export default {
|
||||
this.timer=setInterval(this.changeTimer,60000);
|
||||
this.testStart=true;
|
||||
}else{
|
||||
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){
|
||||
@@ -571,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),
|
||||
}
|
||||
//计划考试的时长
|
||||
|
||||
@@ -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!=''){
|
||||
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>
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -51,7 +51,8 @@
|
||||
<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="one">2023</el-dropdown-item>
|
||||
<el-dropdown-item command="three">2024</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-menu>
|
||||
</el-dropdown>
|
||||
@@ -209,7 +210,7 @@ export default {
|
||||
this.sex = this.userInfo.sex;
|
||||
this.$store.dispatch('refrashMsg');
|
||||
this.loadBoeData();
|
||||
// console.log('this.userInfo::',this.userInfo)
|
||||
console.log('this.userInfo::',this.userInfo)
|
||||
//this.loadPopupConfig();
|
||||
},
|
||||
methods: {
|
||||
@@ -246,6 +247,7 @@ export default {
|
||||
let obj = {
|
||||
one: urlPre + "/web/contributornew/index",
|
||||
two: urlPre + "/web/contributor/index",
|
||||
three: urlPre + "/web/contributor_2024/index"
|
||||
};
|
||||
window.open(obj[val]);
|
||||
},
|
||||
|
||||
@@ -192,7 +192,7 @@
|
||||
</el-table-column>-->
|
||||
<el-table-column label="学习人员" width="110">
|
||||
<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>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -292,7 +292,6 @@
|
||||
<el-form-item>
|
||||
<el-button type="primary" @click="studyContentRecordsSearch">搜索</el-button>
|
||||
</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-table max-height="500" border :data="learningSituation.list" style="width: 100%">
|
||||
<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 apiUser from '@/api/system/user.js';
|
||||
import apiStudy from '@/api/modules/courseStudy.js';
|
||||
import { getToken } from '@/utils/token'
|
||||
import axios from 'axios'
|
||||
export default {
|
||||
components: {auditCourse1,auditCourse2},
|
||||
computed: {
|
||||
@@ -355,10 +352,7 @@ export default {
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
downParams: {},
|
||||
typePress: false,
|
||||
isHomeWork: false,
|
||||
isTrue: false,
|
||||
catalogRecordTree:[],
|
||||
catalogRecordList:[],
|
||||
resOwnerListMap:[],
|
||||
@@ -383,8 +377,8 @@ export default {
|
||||
count: 0,
|
||||
type: "",
|
||||
list: [],
|
||||
status: '',
|
||||
name: '',
|
||||
status: '',
|
||||
},
|
||||
learningRecords: {
|
||||
pageIndex: 1, //第几页
|
||||
@@ -521,7 +515,6 @@ export default {
|
||||
pageIndex: this.learningSituation.pageIndex,
|
||||
pageSize: this.learningSituation.pageSize
|
||||
};
|
||||
this.downParams = params;
|
||||
apicourseStudy.studyContentRecords(params).then(res => {
|
||||
if (res.status === 200) {
|
||||
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) {
|
||||
this.learningSituation.pageSize = val;
|
||||
this.learningSituation.pageIndex = 1;
|
||||
@@ -800,16 +722,11 @@ export default {
|
||||
this.getSignupList();
|
||||
},
|
||||
getCatalogue(row,type) {
|
||||
if(type==61){
|
||||
if(type=='考试'){
|
||||
this.typePress = true
|
||||
}else{
|
||||
this.typePress = true
|
||||
}
|
||||
if(type == 60){
|
||||
this.isHomeWork = true
|
||||
}else{
|
||||
this.isHomeWork = false
|
||||
}
|
||||
this.contentId = row.id;
|
||||
this.study.catalogueShow = true;
|
||||
this.learningSituation.pageIndex = 1;//重置为第一页
|
||||
|
||||
@@ -40,12 +40,12 @@
|
||||
:isPlaying="isPlaying"
|
||||
: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"/>
|
||||
</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">
|
||||
<span class="player-volumeHint-text">当前音量:{{volumePercent}}%</span>
|
||||
</div>
|
||||
@@ -71,7 +71,6 @@
|
||||
<div :class="{'player-controls': true, 'cursor-lasting-static': isCursorStatic}">
|
||||
<div class="player-progress-bar">
|
||||
<progressBar
|
||||
:blobId="blobId"
|
||||
:currentProgress="currentProgress"
|
||||
v-on:updateProgress="updateProgressByClickBar"
|
||||
v-on:getMouseDownStatus="getMouseDownStatusOfProgressBar"
|
||||
@@ -242,11 +241,6 @@ export default {
|
||||
type: String,
|
||||
default: null,
|
||||
},
|
||||
// 视频链接对应的content Id
|
||||
blobId: {
|
||||
type: String,
|
||||
default: null,
|
||||
},
|
||||
// 主题色
|
||||
primaryColor: {
|
||||
type: String,
|
||||
@@ -318,17 +312,6 @@ export default {
|
||||
}
|
||||
|
||||
setInterval(() => {
|
||||
//console.log('this.currentProgress::',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) {
|
||||
this.currentProgress =
|
||||
@@ -373,17 +356,6 @@ export default {
|
||||
this.isCursorStatic = false;
|
||||
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("fullscreenchange", () => {
|
||||
this.isFullscreen = this.isFullScreen();
|
||||
@@ -393,13 +365,11 @@ export default {
|
||||
//当视频由于需要缓冲下一帧而停止，解决一直计时的问题
|
||||
onWaiting(){
|
||||
console.log('触发了onWairing');
|
||||
this.isShowLoading = true
|
||||
this.$emit('onPlayerPause', {})
|
||||
},
|
||||
//当音频/视频在已因缓冲而暂停或停止后已就绪时
|
||||
onPlaying(){
|
||||
console.log('触发缓存结束onPlaying');
|
||||
this.isShowLoading = false
|
||||
if(this.videoDom.paused){
|
||||
this.$emit('onPlayerPause', {})
|
||||
}else{
|
||||
|
||||
@@ -38,9 +38,6 @@ export default {
|
||||
isDrag:{
|
||||
type: Boolean,
|
||||
default: true,
|
||||
},
|
||||
blobId:{
|
||||
type: String,
|
||||
}
|
||||
},
|
||||
data() {
|
||||
@@ -60,12 +57,10 @@ export default {
|
||||
window.addEventListener("mousemove", (e) => {
|
||||
if (this.is_mousedown_progress) {
|
||||
this.move(e);
|
||||
e.preventDefault();
|
||||
}
|
||||
});
|
||||
window.addEventListener("mouseup", (e) => {
|
||||
this.up(e);
|
||||
e.preventDefault();
|
||||
});
|
||||
},
|
||||
beforeDestroy() {
|
||||
@@ -73,7 +68,7 @@ export default {
|
||||
},
|
||||
methods: {
|
||||
down(e) {
|
||||
// if(this.isDrag) {
|
||||
if(this.isDrag) {
|
||||
this.$emit("getMouseDownStatus", true);
|
||||
this.is_mousedown_progress = true;
|
||||
// 获取完整进度条的clientX（dom左上角）
|
||||
@@ -81,50 +76,30 @@ export default {
|
||||
// 计算调整后的当前进度条的长度
|
||||
this.current_width_px = e.clientX - init_clientX;
|
||||
// 设置当前的播放进度（同时作用于当前进度条的样式）
|
||||
let current = (e.clientX - init_clientX) / this.dom_full.clientWidth;
|
||||
if(current>1) current = 1;
|
||||
if(current<0) current = 0;
|
||||
var time = localStorage.getItem('videoProgressData');
|
||||
var arr = time&&JSON.parse(time) || {}
|
||||
//console.log('down arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
|
||||
// 禁止拖动
|
||||
if(!this.isDrag && time && arr[this.blobId] < current) return;
|
||||
|
||||
let current =
|
||||
(e.clientX - init_clientX) / this.dom_full.clientWidth;
|
||||
this.$emit("updateProgress", current);
|
||||
// }
|
||||
}
|
||||
|
||||
},
|
||||
move(e) {
|
||||
if (this.is_mousedown_progress) {
|
||||
if (this.is_mousedown_progress && this.isDrag) {
|
||||
let init_clientX = this.dom_full.getBoundingClientRect().left;
|
||||
this.current_width_px = e.clientX - init_clientX;
|
||||
let current = (e.clientX - init_clientX) / this.dom_full.clientWidth;
|
||||
if(current>1) current = 1;
|
||||
if(current<0) current = 0;
|
||||
var time = localStorage.getItem('videoProgressData');
|
||||
var arr = time&&JSON.parse(time) || {}
|
||||
//console.log('move arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
|
||||
// 禁止拖动
|
||||
if(!this.isDrag && time && arr[this.blobId] < current) return;
|
||||
let current =
|
||||
(e.clientX - init_clientX) / this.dom_full.clientWidth;
|
||||
this.$emit("updateProgress", current);
|
||||
}
|
||||
},
|
||||
up() {
|
||||
if (this.is_mousedown_progress) {
|
||||
if (this.is_mousedown_progress && this.isDrag) {
|
||||
// 标记鼠标不处于按下的状态了
|
||||
this.is_mousedown_progress = false;
|
||||
// 松开鼠标后，即调整进度条后，此时的进度（0-1）
|
||||
let current = this.current_width_px / this.dom_full.clientWidth;
|
||||
if(current>1) current = 1;
|
||||
if(current<0) current = 0;
|
||||
var time = localStorage.getItem('videoProgressData');
|
||||
var arr = time&&JSON.parse(time) || {}
|
||||
//console.log('up arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
|
||||
this.$emit("getMouseDownStatus", false);
|
||||
// 禁止拖动
|
||||
if(!this.isDrag && time && arr[this.blobId] < current) return;
|
||||
let current =
|
||||
this.current_width_px / this.dom_full.clientWidth;
|
||||
this.$emit("updateProgress", current);
|
||||
|
||||
this.$emit("getMouseDownStatus", false);
|
||||
}
|
||||
},
|
||||
},
|
||||
|
||||
@@ -423,7 +423,6 @@ export function translate(field) {
|
||||
let name = '';
|
||||
switch (field) {
|
||||
case 'total':name = '累计'; break;
|
||||
case 'now':name = '当前'; break;
|
||||
case 'weeks':name = '本周'; break;
|
||||
case 'months':name = '本月'; break;
|
||||
case 'years':name = '本年'; break;
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
<li v-if="testPaper.deadlineTime">结束时间: {{ testPaper.deadlineTime }}</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div v-if="testPaper.testFront && testPaper.testFront != 'null'" style="padding: 20px;text-align: center;" v-html="testPaper.testFront">
|
||||
<div v-if="testPaper.testFront" style="padding: 20px;text-align: center;" v-html="testPaper.testFront">
|
||||
<!--考前说明-->
|
||||
</div>
|
||||
<div v-if="canExam" class="test-time" style="margin-top:20px" >
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
imgData:[
|
||||
{img:'01',url:'1265897142383042560'},
|
||||
{img:'02',url:'1265697724606210048'},
|
||||
{img:'003',url:'1280185851054231552'},
|
||||
{img:'4',url:''},
|
||||
{img:'03',url:''},
|
||||
{img:'04',url:'1321778585966247936'},
|
||||
],
|
||||
}
|
||||
},
|
||||
|
||||
@@ -391,7 +391,7 @@ export default {
|
||||
timedOut = true;
|
||||
xmlhttp.abort();
|
||||
}, 5000);
|
||||
xmlhttp.open("HEAD", window.location.protocol + "//uapi.boe.com.cn/500.html", true);
|
||||
xmlhttp.open("HEAD", window.location.protocol + "//uapi.boe.com.cn", true);
|
||||
xmlhttp.send();
|
||||
xmlhttp.onreadystatechange = function () {
|
||||
if (xmlhttp.readyState == 4) {
|
||||
|
||||
@@ -360,25 +360,17 @@ export default {
|
||||
}
|
||||
} else if(r.contentType == 40) {
|
||||
//let url = this.fileBaseUrl + r.content;
|
||||
if(r.content!='' && r.content.indexOf('.pdf')==-1){
|
||||
apiCourseFile.detail(r.contentRefId).then(cfrs=>{
|
||||
if(cfrs.status==200){
|
||||
r.content=cfrs.result.previewFilePath;
|
||||
//console.log(r.content);
|
||||
}else{
|
||||
$this.$message.error('加载pdf课件文件失败');
|
||||
}
|
||||
});
|
||||
}
|
||||
if(r.content==''){
|
||||
apiCourseFile.detail(r.contentRefId).then(cfrs=>{
|
||||
if(cfrs.status==200){
|
||||
r.content=cfrs.result.previewFilePath;
|
||||
}else{
|
||||
$this.$message.error('加载pdf课件文件失败');
|
||||
}
|
||||
});
|
||||
}
|
||||
if(r.content!='' && r.content.indexOf('.pdf')==-1){
|
||||
apiCourseFile.detail(r.contentRefId).then(cfrs=>{
|
||||
if(cfrs.status==200){
|
||||
r.content=cfrs.result.previewFilePath;
|
||||
//console.log(r.content);
|
||||
}else{
|
||||
$this.$message.error('加载pdf课件文件失败');
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
this.contentData = r;
|
||||
},
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
<course-image v-if="courseInfo.id != ''" :course="courseInfo"></course-image>
|
||||
</div>
|
||||
<div v-if="resType == 10" style="position: relative;">
|
||||
<videoPlayer ref="myVideoPlayer" id="myVideoPlayer" @progress="progress" :src="blobUrl" :blobId="blobId" @onPlayerPlaying="onPlayerPlaying"
|
||||
<videoPlayer ref="myVideoPlayer" id="myVideoPlayer" @progress="progress" :src="blobUrl" @onPlayerPlaying="onPlayerPlaying"
|
||||
:initTime="contentData.lastStudyTime" :notePlay="notePlay" @onPlayerPlay="onPlayerPlay"
|
||||
:isDrag="curriculumData.isDrag" @onFullscreen="onFullscreen" @onPlayerPause="onPlayerPause"
|
||||
@onPlayerEnded="onPlayerEnded" :isCrowd="isCrowd" @onTimeUpdate="handleAudioTimeUpdate"></videoPlayer>
|
||||
@@ -501,7 +501,7 @@
|
||||
}
|
||||
treeList.push(treeNode);
|
||||
});
|
||||
// console.log(treeList,'treeList')
|
||||
console.log(treeList,'treeList')
|
||||
return treeList;
|
||||
}
|
||||
},
|
||||
@@ -652,8 +652,6 @@
|
||||
} else {
|
||||
this.blobUrl = process.env.VUE_APP_BASE_API + '/xboe/m/course/cware/resource?sign=' + urlSign;
|
||||
}
|
||||
// console.log('this.contentData.id:',this.contentData.id)
|
||||
this.blobId = this.contentData.id
|
||||
//console.log(this.blobUrl,'this.blobUrl');
|
||||
},
|
||||
widthOpen(url) {
|
||||
@@ -816,28 +814,6 @@
|
||||
$this.controlHeight=h-95;
|
||||
//console.log(h,$this.controlHeight,'$this.controlHeight');
|
||||
})
|
||||
|
||||
|
||||
//console.log('this.contentData11:',this.contentData,this.curriculumData)
|
||||
// 视频设置禁用处理逻辑,如果用户已全部观看完该视频，则设置为能全部拖动的逻辑，把isDrag设置为true即可,同时删除本地存储的数据
|
||||
if(this.contentData.progressVideo ===1){
|
||||
var obj = JSON.parse(this.contentData.content)
|
||||
obj.isDrag = true
|
||||
this.contentData.content = JSON.stringify(obj)
|
||||
this.curriculumData.isDrag = true
|
||||
var time = localStorage.getItem('videoProgressData')
|
||||
var arr = time&&JSON.parse(time) || {}
|
||||
//alert(con.progressVideo+'--'+con.id + '--'+JSON.stringify(arr))
|
||||
delete arr[this.contentData.id];
|
||||
localStorage.setItem('videoProgressData',JSON.stringify(arr))
|
||||
}
|
||||
if(this.contentData.progressVideo>0 && this.contentData.progressVideo !==1){
|
||||
var time = localStorage.getItem('videoProgressData')
|
||||
var arr = time&&JSON.parse(time) || {}
|
||||
arr[this.contentData.id] = this.contentData.progressVideo
|
||||
localStorage.setItem('videoProgressData',JSON.stringify(arr))
|
||||
}
|
||||
|
||||
},
|
||||
isShowTime(){
|
||||
if(this.isContentTypeTwo != this.contentData.contentType){
|
||||
@@ -1229,16 +1205,6 @@
|
||||
itemId: this.contentData.studyItemId,
|
||||
videoTime: intTime
|
||||
};
|
||||
//console.log('this.courseInfo:',this.contentData)
|
||||
if(!this.curriculumData.isDrag && this.contentData.progressVideo !=1){
|
||||
var time = localStorage.getItem('videoProgressData')
|
||||
var arr = time&&JSON.parse(time) || {}
|
||||
if(arr[this.blobId] && this.contentData.progressVideo<arr[this.blobId]) {
|
||||
postData.progressVideo = arr[this.blobId]
|
||||
postData.contentId = this.contentData.id
|
||||
postData.courseId = this.contentData.courseId
|
||||
}
|
||||
}
|
||||
//console.log('记录播放时间')
|
||||
apiStudy.studyVideoTime(postData).then(rs => {
|
||||
if (rs.status != 200) {
|
||||
@@ -1281,16 +1247,6 @@
|
||||
itemId: this.contentData.studyItemId,
|
||||
videoTime: intTime
|
||||
};
|
||||
//console.log('this.courseInfo:',this.contentData)
|
||||
if(!this.curriculumData.isDrag && this.contentData.progressVideo !=1){
|
||||
var time = localStorage.getItem('videoProgressData')
|
||||
var arr = time&&JSON.parse(time) || {}
|
||||
if(arr[this.blobId] && this.contentData.progressVideo<arr[this.blobId]) {
|
||||
postData.progressVideo = arr[this.blobId]
|
||||
postData.contentId = this.contentData.id
|
||||
postData.courseId = this.contentData.courseId
|
||||
}
|
||||
}
|
||||
//console.log('记录播放时间')
|
||||
apiStudy.studyVideoTime(postData).then(rs => {
|
||||
if (rs.status != 200) {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user