Compare commits

..

2 Commits

Author SHA1 Message Date
wangjh12
8238bafc19 热点 2025-04-22 17:40:41 +08:00
wangjh12
0d4c6f958f 热点 2025-04-22 10:49:20 +08:00
12 changed files with 295 additions and 252 deletions

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
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 218 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 151 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 690 KiB

After

Width:  |  Height:  |  Size: 1.6 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 MiB

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

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

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

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

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

View File

@@ -1,40 +1,52 @@
<template>
<div class="hot">
<div>
<div>
<div class="hot_2025">
<div class="center">
<div class="item" :style="{marginRight:(i%2==0||i==0)?'49px':'0'}" v-for="(item,i) in imgData_2025" :key="i">
<img class="img" @click="goLearn(item.url)" :src="require(`../../assets/images/hotforum/${item.img}.png`)" alt="">
</div>
</div>
</div>
<div class="hot">
<div class="center">
<div class="item" :style="{marginRight:(i%2==0||i==0)?'49px':'0'}" v-for="item,i in imgData" :key="i">
<img class="img" @click="goLearn(item.url)" :src="require(`../../assets/images/hotforum/${item.img}.png`)" alt="">
</div>
</div>
<div style="display: flex;justify-content: center;margin-bottom: 52px;">
<img src="../../assets/images/hotforum/foot.png" alt="">
</div>
<!-- <div style="display: flex;justify-content: center;margin-bottom: 52px;" >-->
<!-- <img src="../../assets/images/hotforum/foot.png" alt="">-->
<!-- </div>-->
</div>
</div>
</template>
<script>
export default {
name: "hotforum",
data() {
return {
imgData:[
{img:'01',url:'1265897142383042560'},
{img:'02',url:'1265697724606210048'},
{img:'003',url:'1280185851054231552'},
{img:'4',url:''},
],
export default {
name: "hotforum",
data() {
return {
imgData_2025:[
{img:'005',url:'1351506180295131136'},
{img:'006',url:''},
],
imgData:[
{img:'01',url:'1265897142383042560'},
{img:'02',url:'1265697724606210048'},
{img:'003',url:'1280185851054231552'},
// {img:'4',url:''},
],
}
},
methods: {
goLearn(item){
if(item){
// this.$router.push({path:'/course/detail',query:{id:item}})
window.open(`https://u.boe.com/pc/course/detail?id=${item}`)
}
},
methods: {
goLearn(item){
if(item){
// this.$router.push({path:'/course/detail',query:{id:item}})
window.open(`https://u.boe.com/pc/course/detail?id=${item}`)
}
},
},
}
},
}
</script>
<style lang="scss" scoped>
@@ -72,108 +84,248 @@
/* 当窗口宽度大于3068px时的样式 */
}
@media (min-width: 3000px) {
.hot{
width: 100%;
// max-width: 1920px;
min-height: 100%;
// min-height: 1373px;
background: url("../../assets/images/hotforum/back.jpg") no-repeat;
background-size: 100% 100%;
display: flex;
justify-content: center;
.center {
max-width: 2560px;
max-height: 1300px;
margin-bottom: 5%;
margin-top: 30vh;
.hot{
width: 100%;
// max-width: 1920px;
min-height: 100%;
// min-height: 1373px;
background: url("../../assets/images/hotforum/back.jpg") no-repeat;
background-size: 100% 100%;
display: flex;
flex-wrap: wrap;
justify-content: center;
.center {
max-width: 2560px;
max-height: 1300px;
margin-bottom: 5%;
margin-top: 30vh;
display: flex;
flex-wrap: wrap;
.item {
width: 1220px;
height: 660px;
background: url("../../assets/images/hotforum/border.png") no-repeat;
background-size: 100%;
padding: 28px;
padding-top: 62px;
margin-bottom: 59px;
.img {
width: 100%; // 图片宽度占满item宽度
height: auto; // 自动调整高度
.item {
width: 1220px;
height: 660px;
background: url("../../assets/images/hotforum/border.png") no-repeat;
background-size: 100%;
padding: 28px;
padding-top: 62px;
margin-bottom: 59px;
.img {
width: 100%; // 图片宽度占满item宽度
height: auto; // 自动调整高度
}
}
}
}
}
}
@media (min-height: 1500px) {
.hot{
.hot{
width: 100%;
// max-width: 1920px;
min-height: 100%;
// min-height: 1373px;
background: url("../../assets/images/hotforum/back.jpg") no-repeat;
background-size: 100% 100%;
display: flex;
justify-content: center;
.center {
max-width: 1068px;
max-height: 580px;
margin-bottom: 5%;
margin-top: 30vh;
display: flex;
flex-wrap: wrap;
.item {
width: 500px;
height: 271px;
background: url("../../assets/images/hotforum/border.png") no-repeat;
background-size: 100%;
padding: 14px;
padding-top: 26px;
margin-bottom: 30px;
.img {
width: 100%; // 图片宽度占满item宽度
height: auto; // 自动调整高度
}
}
}
}
}
@media (min-width: 1928px) and (max-width: 3000px) {
.hot{
width: 100%;
// max-width: 1920px;
min-height: 100%;
// min-height: 1373px;
background: url("../../assets/images/hotforum/back.jpg") no-repeat;
background-size: 100% 100%;
display: flex;
justify-content: center;
.center {
max-width: 1800px;
max-height: 1100px;
margin-bottom: 5%;
margin-top: 35vh;
display: flex;
flex-wrap: wrap;
.item {
width: 860px;
height: 466px;
background: url("../../assets/images/hotforum/border.png") no-repeat;
background-size: 100%;
padding: 28px;
padding-top: 48px;
margin-bottom: 70px;
.img {
width: 100%; // 图片宽度占满item宽度
height: auto; // 自动调整高度
}
}
}
}
}
.hot_2025{
width: 100%;
// max-width: 1920px;
min-height: 100%;
// min-height: 1373px;
background: url("../../assets/images/hotforum/back.jpg") no-repeat;
background: url("../../assets/images/hotforum/back_2025.jpg") no-repeat;
background-size: 100% 100%;
display: flex;
justify-content: center;
.center {
max-width: 1068px;
max-height: 580px;
.center{
max-width: 1270px;
max-height: 700px;
margin-bottom: 5%;
margin-top: 30vh;
margin-top: 22%;
display: flex;
flex-wrap: wrap;
.item {
width: 500px;
height: 271px;
.item{
width: 610px;
height: 330px;
background: url("../../assets/images/hotforum/border.png") no-repeat;
background-size: 100%;
padding: 14px;
padding-top: 26px;
margin-bottom: 30px;
.img {
width: 100%; // 图片宽度占满item宽度
height: auto; // 自动调整高度
padding-top: 31px;
margin-bottom: 59px;
cursor: pointer;
.img{
width: 581px;
height: 283px;
}
}
}
/* 当窗口宽度大于3068px时的样式 */
}
@media (min-width: 3000px) {
.hot_2025{
width: 100%;
// max-width: 1920px;
min-height: 100%;
// min-height: 1373px;
background: url("../../assets/images/hotforum/back_2025.jpg") no-repeat;
background-size: 100% 100%;
display: flex;
justify-content: center;
.center {
max-width: 2560px;
max-height: 1300px;
margin-bottom: 5%;
margin-top: 30vh;
display: flex;
flex-wrap: wrap;
.item {
width: 1220px;
height: 660px;
background: url("../../assets/images/hotforum/border.png") no-repeat;
background-size: 100%;
padding: 28px;
padding-top: 62px;
margin-bottom: 59px;
.img {
width: 100%; // 图片宽度占满item宽度
height: auto; // 自动调整高度
}
}
}
}
}
@media (min-height: 1500px) {
.hot_2025{
width: 100%;
// max-width: 1920px;
min-height: 100%;
// min-height: 1373px;
background: url("../../assets/images/hotforum/back_2025.jpg") no-repeat;
background-size: 100% 100%;
display: flex;
justify-content: center;
.center {
max-width: 1068px;
max-height: 580px;
margin-bottom: 5%;
margin-top: 30vh;
display: flex;
flex-wrap: wrap;
.item {
width: 500px;
height: 271px;
background: url("../../assets/images/hotforum/border.png") no-repeat;
background-size: 100%;
padding: 14px;
padding-top: 26px;
margin-bottom: 30px;
.img {
width: 100%; // 图片宽度占满item宽度
height: auto; // 自动调整高度
}
}
}
}
}
@media (min-width: 1928px) and (max-width: 3000px) {
.hot{
width: 100%;
// max-width: 1920px;
min-height: 100%;
// min-height: 1373px;
background: url("../../assets/images/hotforum/back.jpg") no-repeat;
background-size: 100% 100%;
display: flex;
justify-content: center;
.center {
max-width: 1800px;
max-height: 1100px;
margin-bottom: 5%;
margin-top: 35vh;
.hot_2025{
width: 100%;
// max-width: 1920px;
min-height: 100%;
// min-height: 1373px;
background: url("../../assets/images/hotforum/back_2025.jpg") no-repeat;
background-size: 100% 100%;
display: flex;
flex-wrap: wrap;
justify-content: center;
.center {
max-width: 1800px;
max-height: 1100px;
margin-bottom: 5%;
margin-top: 35vh;
display: flex;
flex-wrap: wrap;
.item {
width: 860px;
height: 466px;
background: url("../../assets/images/hotforum/border.png") no-repeat;
background-size: 100%;
padding: 28px;
padding-top: 48px;
margin-bottom: 70px;
.item {
width: 860px;
height: 466px;
background: url("../../assets/images/hotforum/border.png") no-repeat;
background-size: 100%;
padding: 28px;
padding-top: 48px;
margin-bottom: 70px;
.img {
width: 100%; // 图片宽度占满item宽度
height: auto; // 自动调整高度
.img {
width: 100%; // 图片宽度占满item宽度
height: auto; // 自动调整高度
}
}
}
}
}
}
</style>
</style>

View File

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