diff --git a/public/output/chtml/fonts/woff-v2/MathJax_Main-Regular.woff b/public/Temp/js/output/chtml/fonts/woff-v2/MathJax_Main-Regular.woff index c28398e..c28398e 100644 --- a/public/output/chtml/fonts/woff-v2/MathJax_Main-Regular.woff +++ b/public/Temp/js/output/chtml/fonts/woff-v2/MathJax_Main-Regular.woff diff --git a/public/output/chtml/fonts/woff-v2/MathJax_Math-Italic.woff b/public/Temp/js/output/chtml/fonts/woff-v2/MathJax_Math-Italic.woff index e62ff5f..e62ff5f 100644 --- a/public/output/chtml/fonts/woff-v2/MathJax_Math-Italic.woff +++ b/public/Temp/js/output/chtml/fonts/woff-v2/MathJax_Math-Italic.woff diff --git a/public/output/chtml/fonts/woff-v2/MathJax_Size2-Regular.woff b/public/Temp/js/output/chtml/fonts/woff-v2/MathJax_Size2-Regular.woff index 4048e4b..4048e4b 100644 --- a/public/output/chtml/fonts/woff-v2/MathJax_Size2-Regular.woff +++ b/public/Temp/js/output/chtml/fonts/woff-v2/MathJax_Size2-Regular.woff diff --git a/public/output/chtml/fonts/woff-v2/MathJax_Size3-Regular.woff b/public/Temp/js/output/chtml/fonts/woff-v2/MathJax_Size3-Regular.woff index 8278e3f..8278e3f 100644 --- a/public/output/chtml/fonts/woff-v2/MathJax_Size3-Regular.woff +++ b/public/Temp/js/output/chtml/fonts/woff-v2/MathJax_Size3-Regular.woff diff --git a/public/output/chtml/fonts/woff-v2/MathJax_Zero.woff b/public/Temp/js/output/chtml/fonts/woff-v2/MathJax_Zero.woff index d899809..d899809 100644 --- a/public/output/chtml/fonts/woff-v2/MathJax_Zero.woff +++ b/public/Temp/js/output/chtml/fonts/woff-v2/MathJax_Zero.woff diff --git a/public/index.html b/public/index.html index 7fb7fd6..8a23927 100644 --- a/public/index.html +++ b/public/index.html @@ -19,8 +19,8 @@ var link = document.querySelector("link[rel*='icon']") || document.createElement('link'); link.type = 'image/x-icon'; link.rel = 'shortcut icon'; - var isZS = window.location.host.includes('ezquiz.sunvotecloud') || window.location.host.includes('121.40.127.171') - link.href = isZS ? "./favicon.ico" : "./331icon.ico"; + var isZS = window.location.host.includes('121.199.53.164') + link.href = isZS ? "./331icon.ico" : "./favicon.ico"; document.getElementsByTagName('head')[0].appendChild(link); } diff --git a/src/assets/css/index.scss b/src/assets/css/index.scss index 45f89e6..282b94d 100644 --- a/src/assets/css/index.scss +++ b/src/assets/css/index.scss @@ -198,8 +198,7 @@ ul { } .screenshot-box { - width: 400px; - + width: 600px; .screenshot { width: 100%; box-shadow: none; diff --git a/src/views/basic/test/list.vue b/src/views/basic/test/list.vue index e2d88c2..ef1092f 100644 --- a/src/views/basic/test/list.vue +++ b/src/views/basic/test/list.vue @@ -54,8 +54,8 @@ @current-change="changePage" :current-page="page" :page-size="size"> - +
@@ -241,7 +241,7 @@ export default { }, //打开答卷录分 openScoreSet(obj) { - this.examId = obj.id; + this.examId = String(obj.id); this.examTitlt = obj.title; this.examScore = obj.examScore; this.diaScoreSet = true; diff --git a/src/views/examinationPaper/add.vue b/src/views/examinationPaper/add.vue index 5fc5411..a03778a 100644 --- a/src/views/examinationPaper/add.vue +++ b/src/views/examinationPaper/add.vue @@ -317,6 +317,10 @@ {{ question.questionTitle }} 共：{{ setNums(question.subQuestions) }}题 共：{{ setScore(question) }} 分 + + +

  • @@ -700,9 +704,15 @@ export default { answerScreenshot: "", //题目解析图片地址 knowledge: [], //知识点 }, + + //返回列表页参数记录 + listType: 1, + listShare: 0, }; }, async created() { + this.listType = this.$route.query.listType ? this.$route.query.listType : 1; + this.listShare = this.$route.query.listShare ? this.$route.query.listShare : 0; this.type = this.$route.query.type ? this.$route.query.type : 1; this.role = this.$store.getters.info.showRole || @@ -1230,6 +1240,9 @@ export default { //删除小题 delTabData(subIndex, index) { this.form.questionList[index].subQuestions.splice(subIndex, 1); + if(this.form.questionList[index].subQuestions.length == 0){ + this.form.questionList.splice(index, 1) + } this.formateQuestion() }, setScore(question) { @@ -1431,6 +1444,8 @@ export default { if (status == 0) { this.$router.push({ path: "/examinationPaper", + type: this.listType, + share: this.listShare, }); } else { this.$message.error(info); @@ -1531,11 +1546,14 @@ export default { }); if (status == 0) { this.form.title = data.title + "_副本"; - this.form.tagId = data.tagId === 0 ? "" : data.tagId; + this.form.examsDuration = data.examsDuration; if (this.role != "ROLE_PERSONAL") { this.form.sharingType = data.sharingType; } + if (data.sharingType != 1) { + this.form.tagId = data.tagId === 0 ? "" : data.tagId; + } this.formatData(data) } else { this.$message.error(info); @@ -1770,7 +1788,7 @@ export default { } .delete { - margin-right: 8px; + margin:0 8px; } .title-txt { @@ -1932,7 +1950,8 @@ export default { .stem-pic { display: block; margin: 0 auto 20px; - height: 200px; + max-width: 100%; + max-height: 200px; object-fit: cover; } } diff --git a/src/views/examinationPaper/addAsk.vue b/src/views/examinationPaper/addAsk.vue index f4e89e9..11fbd8c 100644 --- a/src/views/examinationPaper/addAsk.vue +++ b/src/views/examinationPaper/addAsk.vue @@ -109,6 +109,14 @@ {{ option }}

    +

    + + +

@@ -609,6 +617,28 @@ export default { }; } }, + //添加选项 + addOptions(subQuestions) { + let length = subQuestions.answerOptions.split(",").length; + if (length > 9) return; + subQuestions.selectNum = length + 1; + subQuestions.answerOptions = this.rightOptions + .slice(0, subQuestions.selectNum) + .join(","); + }, + //删除选项 + removeOptions(subQuestions) { + let length = subQuestions.answerOptions.split(",").length; + if (length < 3) return; + subQuestions.selectNum = length - 1; + subQuestions.answerOptions = this.rightOptions + .slice(0, subQuestions.selectNum) + .join(","); + subQuestions.correctAnswer = subQuestions.correctAnswer.slice( + 0, + subQuestions.selectNum + ); + }, //多选答案设置 setMultiple(obj, answer, type) { let elements = @@ -1322,7 +1352,8 @@ export default { .stem-pic { display: block; margin: 0 auto 20px; - height: 200px; + max-width: 100%; + max-height: 200px; object-fit: cover; } } diff --git a/src/views/examinationPaper/edit.vue b/src/views/examinationPaper/edit.vue index c9718d3..3b79a0b 100644 --- a/src/views/examinationPaper/edit.vue +++ b/src/views/examinationPaper/edit.vue @@ -23,8 +23,8 @@

卷面总分：{{ allScore }}分

-
-
+
    +
  • 题号
    题型
    分数
    @@ -33,19 +33,96 @@
    题干
    题目解析
    知识点
    -
-
- @@ -183,6 +124,7 @@ export default { }, ], query: { + type: 1, classId: "", subjectName: "", tagId: "", @@ -258,8 +200,6 @@ export default { query = { ...this.query }; } else { query = { title: this.query.title }; - this.query.type = ""; - this.query.subjectId = ""; } query.classId = this.query.classId; for (let key in query) { @@ -309,7 +249,7 @@ export default { }, // 查找科目 async _QuerySubjectList() { - let fetchSubjectList = + let fetchSubjectList = this.role == "ROLE_PERSONAL" ? this.$request.pSubjectList : this.$request.fetchSubjectList; @@ -332,7 +272,7 @@ export default { }, // 查找答题卡类型 async _QueryTypeList() { - let fetchTypeNames = + let fetchTypeNames = this.role == "ROLE_PERSONAL" ? this.$request.pPaperTagList : this.$request.fetchTypeNames; @@ -367,16 +307,19 @@ export default { .sel { min-width: 160px; } + :deep(.el-cascader__tags) { flex-wrap: nowrap; } } } + .content { margin: 0 20px; background: #f8f8f8; padding: 12px; border-radius: 20px; + .item { display: flex; align-items: center; @@ -387,9 +330,11 @@ export default { border-radius: 20px; background: #fff; margin-bottom: 12px; + &:last-of-type { margin-bottom: 0; } + .pic-box { width: 80px; height: 80px; @@ -400,12 +345,14 @@ export default { text-align: center; color: #fff; font-weight: 500; + .i-box { padding-top: 10px; font-size: 32px; margin-bottom: 3px; } } + .info { height: 80px; flex: 1; @@ -413,14 +360,17 @@ export default { display: flex; flex-direction: column; justify-content: space-between; + .s-line { padding: 0 5px; color: #e2e2e2; } + .title { font-size: 16px; color: #222; font-weight: 500; + .label { display: inline-block; font-size: 12px; @@ -432,12 +382,15 @@ export default { transform: translateY(-2px); } } + .person { color: #666; } } + .btn-box { flex-shrink: 0; + .edit { margin-right: 12px; }