From 0d6f6dda1c765d89304106a80c32f6da7947c8f1 Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Wed, 19 Oct 2022 18:15:17 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=90=86=E8=AE=BA=E9=A2=98=E7=9B=AE?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../competitionManage/bankList/index.vue | 142 ++++++++++++------ static/theoryTemplate/理论试题导入模板.xlsx | Bin 12305 -> 12316 bytes 2 files changed, 95 insertions(+), 47 deletions(-) diff --git a/src/views/competitionManage/bankList/index.vue b/src/views/competitionManage/bankList/index.vue index 1fd525785..9a31a89f0 100644 --- a/src/views/competitionManage/bankList/index.vue +++ b/src/views/competitionManage/bankList/index.vue @@ -135,7 +135,7 @@ export default { { text: '添 加', handler: this.doCreate }, { text: '导 入', fileType: 'file', handler: this.importQuestionBank }, // { text: '试卷规则管理', handler: this.questionsRuleManage}, - // { text: '导出', handler: this.exportTemplate} + // { text: '导出', handler: this.exportTemplate}, { text: '导出模板', handler: this.downloadTemplate} ] } @@ -249,11 +249,12 @@ export default { }; if (file) { try { - setTimeout(() => { - const that = this; - const reader = new FileReader(); - if (reader) { - reader.onload = function (e) { + // setTimeout(() => { + const that = this; + const reader = new FileReader(); + if (reader) { + reader.onload = function (e) { + try { let wb; const data = e.target.result; if (that.rABS) { @@ -269,46 +270,46 @@ export default { if (wb && wb.Sheets) { for (const index in wb.Sheets) { const dataList = convertSheetToList(wb.Sheets[index], true); - let questionTypeIndex; - let topicIndex; - let tagsIndex; - let option1Index; - let option2Index; - let option3Index; - let option4Index; - let option5Index; - let option6Index; - let answerIndex; + const objHeader = { + questionTypeIndex: '题型（必填）', + topicIndex: '题干（必填）', + tagsIndex: '标签', + option1Index: '选项A（必填）', + option2Index: '选项B（必填）', + option3Index: '选项C', + option4Index: '选项D', + option5Index: '选项E', + option6Index: '选项F', + answerIndex: '正确答案（必填）' + }; + const indexHeader = JSON.parse(JSON.stringify(objHeader)); dataList.forEach((item, ii) => { - if (!item[0] && !item[1] && item[2] === '题型（必填）') { - questionTypeIndex = ii; - } else if (!item[0] && !item[1] && item[2] === '题干（必填）') { - topicIndex = ii; - } else if (!item[0] && !item[1] && item[2] === '标签') { - tagsIndex = ii; - } else if (!item[0] && !item[1] && item[2] === '选项A（必填）') { - option1Index = ii; - } else if (!item[0] && !item[1] && item[2] === '选项B（必填）') { - option2Index = ii; - } else if (!item[0] && !item[1] && item[2] === '选项C') { - option3Index = ii; - } else if (!item[0] && !item[1] && item[2] === '选项D') { - option4Index = ii; - } else if (!item[0] && !item[1] && item[2] === '选项E') { - option5Index = ii; - } else if (!item[0] && !item[1] && item[2] === '选项F') { - option6Index = ii; - } else if (!item[0] && !item[1] && item[2] === '正确答案（必填）') { - answerIndex = ii; + Object.keys(objHeader).forEach(key => { + if (!item[0] && !item[1] && item[2] === objHeader[key]) { + indexHeader[key] = ii; + } + }); + }); + const errHeader = []; + Object.keys(objHeader).forEach(key => { + if (typeof indexHeader[key] != 'number') { + errHeader.push(objHeader[key]); } }); + let errInfo = errHeader.join('；'); + if (errInfo) { + const error = `以下列：${errInfo}，无法找到`; + throw error; + } + const errRow = []; + const {questionTypeIndex, topicIndex, tagsIndex, option1Index, option2Index, option3Index, option4Index, option5Index, option6Index, answerIndex } = indexHeader; if (questionTypeIndex || questionTypeIndex === 0) { dataList[questionTypeIndex].forEach((item, index) => { - if (item && item !== '题型（必填）') { + if (item && item !== '题型（必填）' && index > 2) { const param = { type: questionTypeMap[item], topic: dataList[topicIndex][index], - tags: dataList[tagsIndex][index], + tags: dataList[tagsIndex][index] ? dataList[tagsIndex][index].replace(/\s+/g, ',') : '', optionList: [] }; if (param.type === 'fill') { @@ -335,11 +336,51 @@ export default { param.optionList.push({content:dataList[option6Index][index], correct: dataList[answerIndex][index].includes('F')}); } } - param.id = questionList.length; + // param.id = questionList.length; questionList.push(param); + + if (!param.type || !param.topic || !dataList[option1Index][index] || !dataList[option2Index][index] || !dataList[answerIndex][index]) { + errRow.push(index + 1); + } + if (param.type === 'judge') { + const arr = ['√', '正确', '×', '错误']; + const asJudge = ['A', 'B']; + if (!arr.includes(dataList[option1Index][index]) || !arr.includes(dataList[option2Index][index]) || !asJudge.includes(dataList[answerIndex][index])) { + if (!errRow.includes(index + 1)) { + errRow.push(index + 1); + } + } + } + const asList = ['A', 'B', 'C', 'D', 'E', 'F']; + if (param.type === 'select') { + if (!asList.includes(dataList[answerIndex][index])) { + if (!errRow.includes(index + 1)) { + errRow.push(index + 1); + } + } + } + if (param.type === 'multi') { + if (dataList[answerIndex][index]) { + const list = dataList[answerIndex][index].split(''); + const sortNew = list.sort(function(a, b) { + return a.localeCompare(b); + }); + const fArr = sortNew.filter((item, ii) => { + return !asList.includes(item) || item == sortNew[ii + 1]; + }); + if (!errRow.includes(index + 1) && fArr.length) { + errRow.push(index + 1); + } + } + } } }); } + errInfo = errRow.join('，'); + if (errInfo) { + const error = `第${errInfo}行，数据错误，请检查！`; + throw error; + } } that.$store.dispatch('race/setPreTheoryData', questionList).then(() => { that.$router.push({ path: `/teaching/preTheoryImport`}); @@ -347,14 +388,21 @@ export default { that.$message.error('导入题库失败！'); }); } - }; - if (that.rABS) { - reader.readAsArrayBuffer(file); - } else { - reader.readAsBinaryString(file); + } catch (e) { + that.$message.warning('导入错误！' + e); + throw e; } + }; + reader.onerror = function (e) { + throw e; + }; + if (that.rABS) { + reader.readAsArrayBuffer(file); + } else { + reader.readAsBinaryString(file); } - }, 200); + } + // }, 200); } catch (e) { this.$message.error('请根据下载模板导入题目！'); } @@ -386,7 +434,7 @@ export default { exportTemplate() { const wb = XLSX.utils.book_new(); const data1 = [{A: '理论试题导入模板', B: '', C:'', D:'', E:'', F: '', G: '', H: '', I: '', J: '', K: ''}]; - const data2 = [{A: '说明：1、本表表头（第一行到第三行）内容不能修改删除;\n 2、支持批量导入的题型：单选题，多选题，判断题，题型不能自定义，只能按照表格提供的进行录入;\n 3、【判断题】在选项A中可填写√ 或正确，选项B中填写× 或错误，答案填写A或B\n 4、【分类】多个分类项使用空格隔开', B: '', C:'', D:'', E:'', F: '', G: '', H: '', I: '', J: '', K: ''}]; + const data2 = [{A: '说明：1、本表表头（第一行到第三行）内容不能修改删除;\n 2、支持批量导入的题型：单选题，多选题，判断题，题型不能自定义，只能按照表格提供的进行录入;\n 3、【判断题】在选项A中可填写√ 或正确，选项B中填写× 或错误，答案填写A或B\n 4、【标签】多个标签项使用空格隔开', B: '', C:'', D:'', E:'', F: '', G: '', H: '', I: '', J: '', K: ''}]; const data3 = [{A: '序号', B: '题干（必填）', C:'题型（必填）', D:'选项A（必填）', E:'选项B（必填）', F: '选项C', G: '选项D', H: '选项E', I: '选项F', J: '正确答案（必填）', K: '标签'}]; const data = [...data1, ...data2, ...data3]; const mapType = { @@ -421,7 +469,7 @@ export default { H: item.optionList[4] ? item.optionList[4].content : '', I: item.optionList[5] ? item.optionList[5].content : '', J: as, - K: item.tags + K: item.tags ? item.tags.replace(',', ' ') : '' }; data.push(obj); }); diff --git a/static/theoryTemplate/理论试题导入模板.xlsx b/static/theoryTemplate/理论试题导入模板.xlsx index 340b78411a074008b7b9e6fdebbc2b7c3fad250a..242cf9c627342e6ea37ec6c37cd2e6c5b3ca0f3b 100644 GIT binary patch delta 7234 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�t7aF8$Mlnl@5#}*(76ItQOuWIGNnRzN6Ud~IPWBE$9 z#qb9llUsD4JIhpvI$>pTGI*)nx02}Hf>dt6;gaK6>-i-Mb61xB*T+Ij7eOA+@hC5^ zntFT2dR@Gz_NY#!$ApEPfrbhPVhpf90k&bsaqWrk5!nn$Rjdrvo9|z>6Jl*1>mhzc z@Aihx6}FOOt1rCmy&iTsrz+Bs6~wfS`tX{jI|KX28z#;Yvk7c$i?~Pn1eF&RST>*4 z7-KY^;iuBsu3xt#+*`DHkQy2mVPu^N-qp4J%2nG+N~*ziO(oxofe&yx)aSW{?wxF@ z;B0DqCQR&Ae8~epeE2Q$9VZ~|GcY_-M)bBe3dY3a_a$o9NXn|LB492geFT+;PA)j^ zF`$XJ@uKiF7prP&vMlpH8>*zU_8G1dj?au3UNQN%Ir~_8vTsezc~6^Y_|2)-$(_x; z)p|Iy4r$2od`zf1VpM?V1RuE*oWjeh1z2QzYZc;Z71pG;L)tQ;LNcO5;5JEB>3qkz zl(NDbbHntdiys!U!wN^n&=0ayc}&Q2hOo#T&+p;l@69NdHAjJ;rnJZoagL&IQ{km) z*f7YUiD&+7s+As&ppGnpP6SZYi`STnh^&MI4(&t1Z6VIXvY zcV}Ua`*V@kXq9G64R=wkAT%5=P=_GK9K5IqNIVAw{pM{QgdGG$rGOwn{HPKTHck-b zA2B0e-?`mILAjCm%?A~Q7Wtb-4=JU82npl7&-}k{e*f7NMfP9!K*$pgTF7@!d{hC* f9w$GlA%uzR1?pRf6_?@P*I6(w@q5?oH_`tCL2WR? delta 7197 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 From 2754e14bfffcf470aab5f74afc6083c21886d680 Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Wed, 19 Oct 2022 18:46:22 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../competitionManage/bankList/preImport.vue | 38 ++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/src/views/competitionManage/bankList/preImport.vue b/src/views/competitionManage/bankList/preImport.vue index 679fdec12..5485412e5 100644 --- a/src/views/competitionManage/bankList/preImport.vue +++ b/src/views/competitionManage/bankList/preImport.vue @@ -153,6 +153,43 @@ export default { this.handlePreDataPaging(); }, doSave() { + const nameList = []; + const repetList = []; + const mapType = { + select: '单选题', + multi: '多选题', + judge: '判断题', + fill: '填空题', + answer: '问答题' + }; + this.$store.state.race.preTheoryData.forEach(item => { + const strName = `【${mapType[item.type]}】${item.topic}`; + if (nameList.includes(strName)) { + repetList.push(strName); + } else { + nameList.push(strName); + } + }); + if (repetList.length) { + const test = `以下题目重复，是否继续提交？`; + const messageData = [test]; + const h = this.$createElement; + repetList.forEach(item => { + messageData.push(h('p', null, item)); + }); + this.$confirm('有题目重复，是否继续提交？', '提 示', { + message: h('div', null, messageData), + confirmButtonText: '确 定', + cancelButtonText: '取 消', + type: 'warning' + }).then(() => { + this.submitData(); + }).catch( () => {}); + } else { + this.submitData(); + } + }, + submitData() { this.loading = true; let selectNum = 0; let judgeNum = 0; @@ -178,7 +215,6 @@ export default { break; } }); - // importQuestionBand(this.$store.state.race.preTheoryData, this.companyId).then(resp => { importQuestion(this.$store.state.race.preTheoryData).then(resp => { this.$store.dispatch('race/setPreTheoryData', []); // this.$message.success('导入题库成功!'); From b06248a366f14de98409436a26f9dd8078232669 Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Thu, 20 Oct 2022 10:17:38 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=90=86=E8=AE=BA=E9=A2=98=E7=9B=AE?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B8=85=E7=A9=BA=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/questionBank.js | 8 ++++++++ .../competitionManage/bankList/index.vue | 20 ++++++++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/src/api/questionBank.js b/src/api/questionBank.js index c5de0f8cf..096484cbc 100644 --- a/src/api/questionBank.js +++ b/src/api/questionBank.js @@ -83,3 +83,11 @@ export function testAnswer(questionId, data) { data }); } + +// 清空题库 +export function clearBank() { + return request({ + url: `/api/question/org/clear`, + method: 'get' + }); +} diff --git a/src/views/competitionManage/bankList/index.vue b/src/views/competitionManage/bankList/index.vue index 9a31a89f0..ea695eb14 100644 --- a/src/views/competitionManage/bankList/index.vue +++ b/src/views/competitionManage/bankList/index.vue @@ -8,7 +8,7 @@