From 88cf54392b77f1168de760d2ce17fc103582b31d Mon Sep 17 00:00:00 2001 From: daihh Date: Mon, 15 Aug 2022 12:55:40 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E8=80=83=E8=AF=95=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E9=A2=98=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/exam/Test.vue | 52 +++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/src/views/exam/Test.vue b/src/views/exam/Test.vue index 028be4f4..6473fad1 100644 --- a/src/views/exam/Test.vue +++ b/src/views/exam/Test.vue @@ -75,10 +75,10 @@
{{ i + 1 }}、{{ question.title }} （{{question.defaultScore}}分）
- 正确 + 正确
- 错误 + 错误
@@ -349,24 +349,25 @@ export default { answer.push(key); paperJson.forEach((item,index) => { item.result=true; - if(item.id == key) { - if(item.type==1){ - item.userAnswer=''; - }else if(item.type==2){ - item.userAnswer=[]; - }else{ - item.userAnswer='' - } - item.correctOptIdxs=[]; - item.userOptIdxs=[]; - if(item.type==1){ - item.userAnswer=answerJson[key]; - }else if(item.type==2){ - item.userAnswer.push(...answerJson[key].split(',')); - }else{ - item.userAnswer=answerJson[key] - } - data.push(item); + if(item.id == key) { + if(item.type==1){ + item.userAnswer=''; + }else if(item.type==2){ + item.userAnswer=[]; + }else{ + item.userAnswer='' + } + + item.correctOptIdxs=[]; + item.userOptIdxs=[]; + if(item.type==1){ + item.userAnswer=answerJson[key]; + }else if(item.type==2){ + item.userAnswer.push(...answerJson[key].split(',')); + }else{ + item.userAnswer=answerJson[key] + } + data.push(item); // item.userAnswer.push(answerJson[key]); } }); @@ -579,7 +580,7 @@ export default { } let str1=item.userAnswer.join(); let str2=tempAnswer.join(); - + if(str1==str2){ console.log('str1='+str1); console.log('str2='+str2); @@ -605,10 +606,12 @@ export default { }else if(qitem.type==2){ //多选 qitem.userAnswer=avalue.split(','); }else if(qitem.type==3){ //判断 - qitem.userAnswer=avalue=='true'? true:false; + qitem.userAnswer=avalue; + //console.log(avalue,'avalue'); } } }); + //console.log(this.paperQuestion,'this.paperQuestion') this.arrangeQuestion(); this.splitQuestionType(); //进入考试阶段 @@ -726,10 +729,9 @@ export default { if(this.judge.length > 0){ this.judge.forEach(item => { let judgeUserAnswer = ""; - if(String(item.userAnswer) && item.userAnswer != null){ - + //if(String(item.userAnswer) && item.userAnswer != null){ judgeUserAnswer = item.userAnswer + ""; - } + //} answer[item.id] = judgeUserAnswer; }); } From 2f1312fcc0b093df1e839d0d72ce353279ca3642 Mon Sep 17 00:00:00 2001 From: daihh Date: Mon, 15 Aug 2022 13:08:48 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E5=8A=A0=E4=BA=86=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E7=9A=84=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/exam/TestPaper.vue | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/views/exam/TestPaper.vue b/src/views/exam/TestPaper.vue index 861f65ac..227ebfb0 100644 --- a/src/views/exam/TestPaper.vue +++ b/src/views/exam/TestPaper.vue @@ -546,6 +546,24 @@ export default { if(!this.paper.testName) { return this.$message.warning('请您完善基本信息必填项！') } + //检查是否有重复的试卷 + let qidMap=new Map(); + let hasItem=null; + this.paper.data.some(qitem=>{ + if(qidMap.has(qitem.id)){ + hasItem=qitem; + return true; + }else{ + qidMap.set(qitem.id,qitem.id); + return false; + } + }) + if(hasItem!=null){ + console.log(hasItem); + this.$message.error('选择的试题重复：'+hasItem.title) + return + } + this.paper.resOwner1 = this.resOwner[0]; this.paper.resOwner2 = this.resOwner[1]; this.paper.resOwner3 = this.resOwner[2]; From 4b76617dae6145cafac97ffc993cc66bf3e9a56d Mon Sep 17 00:00:00 2001 From: daihh Date: Mon, 15 Aug 2022 14:02:55 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/Index.vue b/src/views/Index.vue index 1ee8146d..4974a676 100644 --- a/src/views/Index.vue +++ b/src/views/Index.vue @@ -41,7 +41,7 @@
- 5 + 5.0
From 99be2504cb940988472e49af49b959ee4d280fa3 Mon Sep 17 00:00:00 2001 From: daihh Date: Mon, 15 Aug 2022 14:23:26 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/Index.vue b/src/views/Index.vue index 4974a676..d212dfa2 100644 --- a/src/views/Index.vue +++ b/src/views/Index.vue @@ -37,7 +37,7 @@
- 2324人学习 + 2581人学习
From e51af03e1d5ee947ae823a2ecf5c80f20be5700e Mon Sep 17 00:00:00 2001 From: daihh Date: Mon, 15 Aug 2022 15:21:46 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=9D=A5=E6=BA=90?= =?UTF-8?q?=E5=BC=84=E9=94=99=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/portal/course/Index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue index 1d8b7be1..2266e6d4 100644 --- a/src/views/portal/course/Index.vue +++ b/src/views/portal/course/Index.vue @@ -100,7 +100,7 @@
-
+
From 52412b2f3a1c1d7e4ea10cdd7dd07358d1d1df35 Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Tue, 16 Aug 2022 10:15:21 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=A1=88=E4=BE=8B?= =?UTF-8?q?=E9=AB=98=E5=BA=A6=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Index.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/Index.vue b/src/views/Index.vue index d212dfa2..6e4569e3 100644 --- a/src/views/Index.vue +++ b/src/views/Index.vue @@ -695,12 +695,12 @@ export default { margin-bottom:8px; } .case-text{ - height: 57px; + height: 56px; font-size: 14px; overflow: hidden; - color: #888888; - // line-height: 18px; - margin-bottom:8px; + color: #888888; + // line-height: 18px; + margin-bottom:8px; } ::v-deep .case-inter{ width: 100%; From a8430ce45c2b42cc02f8f17fcb34d2cd328cb048 Mon Sep 17 00:00:00 2001 From: daihh Date: Fri, 19 Aug 2022 09:42:44 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/exam/ExamList.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/views/exam/ExamList.vue b/src/views/exam/ExamList.vue index 977d30ae..545d1dc3 100644 --- a/src/views/exam/ExamList.vue +++ b/src/views/exam/ExamList.vue @@ -470,6 +470,7 @@
搜索 + 导出成绩
@@ -1181,6 +1182,10 @@ export default { this.answerData.count = res.result.count; } }) + }, + //导入考试成绩 + exportAnswers(){ + }, handleSizeAnswerChange(val){ this.answerData.pageSize = val From 51efc63fb56ac2708089ca4e5d541432d08715ee Mon Sep 17 00:00:00 2001 From: 86182 Date: Fri, 19 Aug 2022 10:46:56 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E8=80=83=E8=AF=95=E6=88=90=E7=BB=A9?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/modules/test.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/api/modules/test.js b/src/api/modules/test.js index fea0bce1..1dcbb141 100644 --- a/src/api/modules/test.js +++ b/src/api/modules/test.js @@ -41,15 +41,25 @@ const pulish = function(id, publish) { if (!publish) { flag = publish; } - + return ajax.post('/xboe/m/exam/test/publish?id=' + id + '&publish=' + flag); } +/** + *@parma{ + * testId 考试id + *} + */ +const exports=function (query){ + return ajax.post('/xboe/m/exam/alone/answer/export',query); +} + export default { detail, update, del, save, querylist, - pulish + pulish, + exports } From 75669333e3b5ecc6024a8fcf094e6fccbe93180b Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Fri, 19 Aug 2022 13:58:58 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E6=88=90=E7=BB=A9=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/modules/test.js | 2 +- src/views/exam/ExamList.vue | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/api/modules/test.js b/src/api/modules/test.js index 1dcbb141..068039fc 100644 --- a/src/api/modules/test.js +++ b/src/api/modules/test.js @@ -51,7 +51,7 @@ const pulish = function(id, publish) { *} */ const exports=function (query){ - return ajax.post('/xboe/m/exam/alone/answer/export',query); + return ajax.post('/xboe/m/exam/alone/answer/export',query,{responseType: 'blob'}); } export default { diff --git a/src/views/exam/ExamList.vue b/src/views/exam/ExamList.vue index 977d30ae..649e7cd7 100644 --- a/src/views/exam/ExamList.vue +++ b/src/views/exam/ExamList.vue @@ -470,6 +470,7 @@
搜索 + 导出成绩
@@ -753,6 +754,26 @@ export default { this.loadData() }, methods: { + exportsList(){ + if(this.answerData.data.length == 0){ + return this.$message.warning('暂无导出数据！') + } + console.log(this.answerData.row.id,'this.answerData.row.id'); + apiTest.exports({testId: this.answerData.row.id}).then(res=>{ + if(res.status){ + this.$message.error(res.message) + } else { + const link = document.createElement('a');// 创建a标签 + let blob = new Blob([res],{type: 'application/vnd.ms-excel;charset=UTF-8'}); // 设置文件类型 + link.style.display = "none"; + link.href = URL.createObjectURL(blob); // 创建URL + link.setAttribute("download", "成绩.xls"); + document.body.appendChild(link); + link.click(); + document.body.removeChild(link); + } + }) + }, changePaper(e) { this.questDirOptions.forEach(item=>{ if(item.id == e) { From 5e2bf870ac3e5c6ae81656e705e835ad31b43dc9 Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Fri, 19 Aug 2022 14:11:10 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/StudyIndex.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/views/StudyIndex.vue b/src/views/StudyIndex.vue index 3c44cc33..1adfa426 100644 --- a/src/views/StudyIndex.vue +++ b/src/views/StudyIndex.vue @@ -130,11 +130,15 @@ // cmtask_status:this.cmtask_status, // cmtask_name:this.cmtask_name, } + apiBoeCourse.cmtaskList(params).then(res=>{ if(res.status==200){ this.total = res.result.count this.couresList = res.result.list; this.loading = false; + if(this.$route.fullPath != '/uc/study/task' && this.$route.fullPath != '/uc/study/courses' && this.$route.fullPath != '/study/index') { + return; + } if(res.result.count > 0) { this.$router.push('/uc/study/task') } else { @@ -147,8 +151,10 @@ }else{ this.$router.push('/uc/study/courses') } - // this.pageData.list = res.result.list; }).catch(err=>{ + if(this.$route.fullPath != '/uc/study/task' || this.$route.fullPath != '/uc/study/courses' || this.$route.fullPath != '/study/index') { + return; + } this.$router.push('/uc/study/courses'); }) }, From c398ba0ed0b7228a372c21943409e7011442c7f7 Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Fri, 19 Aug 2022 18:15:27 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/exam/ExamList.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/exam/ExamList.vue b/src/views/exam/ExamList.vue index c16ce37f..351b79c5 100644 --- a/src/views/exam/ExamList.vue +++ b/src/views/exam/ExamList.vue @@ -501,7 +501,7 @@ @@ -666,6 +666,7 @@ import { mapGetters,mapActions} from 'vuex'; import {examType,numberToLetter} from '@/utils/tools.js'; import usergroupApi from "@/api/modules/usergroup"; import pushRecordApi from "@/api/modules/pushRecord"; +import {toScoreTow} from '@/utils/tools.js' export default { name: 'articleItems', computed: { @@ -673,6 +674,7 @@ export default { }, data() { return { + toScoreTow, qnum:0,//这里默认是30吧 examDateTime:[], answerData:{ @@ -758,7 +760,6 @@ export default { if(this.answerData.data.length == 0){ return this.$message.warning('暂无导出数据！') } - console.log(this.answerData.row.id,'this.answerData.row.id'); apiTest.exports({testId: this.answerData.row.id}).then(res=>{ if(res.status){ this.$message.error(res.message)