From 2b8ad65bdf78b819785132ea9f89a6e24a570a78 Mon Sep 17 00:00:00 2001 From: 刘有才luck <14606842+liu-youcai-luck@user.noreply.gitee.com> Date: Fri, 6 Dec 2024 10:51:33 +0800 Subject: [PATCH] feat: 代码提交 --- src/assets/images/aside/wrong-question-default.png | Bin 0 -> 6243 bytes src/assets/images/aside/wrong-question.png | Bin 0 -> 6022 bytes src/router/index.js | 4 ++-- src/views/basic/askTestQuestion/components/wrongQuestionDialog.vue | 36 +++++++++++++++++++++++------------- src/views/basic/askTestQuestion/wrongQuestion.vue | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------- 5 files changed, 95 insertions(+), 47 deletions(-) create mode 100644 src/assets/images/aside/wrong-question-default.png create mode 100644 src/assets/images/aside/wrong-question.png diff --git a/src/assets/images/aside/wrong-question-default.png b/src/assets/images/aside/wrong-question-default.png new file mode 100644 index 0000000..93e6849 Binary files /dev/null and b/src/assets/images/aside/wrong-question-default.png differ diff --git a/src/assets/images/aside/wrong-question.png b/src/assets/images/aside/wrong-question.png new file mode 100644 index 0000000..7543ea6 Binary files /dev/null and b/src/assets/images/aside/wrong-question.png differ diff --git a/src/router/index.js b/src/router/index.js index 456cb56..18fc709 100755 --- a/src/router/index.js +++ b/src/router/index.js @@ -346,8 +346,8 @@ let addrouters = [ }, { path: "/wrongQuestion", - iconImage: require("@/assets/images/aside/suitangwen-baobiao-default.png"), - selectedIconImage: require("@/assets/images/aside/suitangwen-baobiao-selected.png"), + iconImage: require("@/assets/images/aside/wrong-question-default.png"), + selectedIconImage: require("@/assets/images/aside/wrong-question.png"), name: "错题组卷", demoRoles: ["ROLE_JIAOSHI"], component: wrongQuestion, diff --git a/src/views/basic/askTestQuestion/components/wrongQuestionDialog.vue b/src/views/basic/askTestQuestion/components/wrongQuestionDialog.vue index 007b9fe..0368c0c 100644 --- a/src/views/basic/askTestQuestion/components/wrongQuestionDialog.vue +++ b/src/views/basic/askTestQuestion/components/wrongQuestionDialog.vue @@ -59,7 +59,7 @@
@@ -95,7 +95,7 @@ left: tooltipPosition.x + 'px', }" > - 单击设置试卷标题 + 单击修改大题名称
-
+
题目排序 - (拖拽题号可拖拽排序)(拖拽题号可排序)
@@ -806,7 +806,7 @@ export default { height: fit-content; max-height: 742px; overflow-y: auto; - box-shadow: 0 0 10px 0 #999999; + box-shadow: 0 0 10px 0 #cfcfcf; margin-right: 20px; box-sizing: border-box; padding: 0 20px; @@ -833,8 +833,8 @@ export default { .test-group-title { position: relative; height: 40px; - line-height: 30px; - padding: 10px 0 0 0; + line-height: 40px; + padding: 0; } } } @@ -847,7 +847,8 @@ export default { .edit-title { width: 100%; height: 200px; - border: 1px solid #999999; + border: 1px solid #cfcfcf; + border-radius: 5px; .edit-title-info { height: 60px; @@ -879,11 +880,12 @@ export default { .edit-info { flex: 1; - border: 1px solid #999999; + border: 1px solid #cfcfcf; margin-top: 20px; max-height: 500px; padding: 10px; overflow: auto; + border-radius: 5px; .group-item { margin: 10px; @@ -903,14 +905,14 @@ export default { .questions { display: flex; flex-wrap: wrap; - + padding: 10px 0; .question-item { width: 35px; height: 35px; border: 1px solid rgb(172, 188, 249); border-radius: 4px; cursor: grab; - margin: 5px 8px; + margin: 0 10px 10px 10px; line-height: 35px; text-align: center; font-size: 16px !important; @@ -947,6 +949,7 @@ export default { .border { border: 1px solid rgb(173, 190, 250); position: relative; + border-radius: 3px; .border-del { position: absolute; @@ -959,7 +962,7 @@ export default { color: rgb(67, 141, 255); font-size: 14px !important; line-height: 28px; - font-weight: 600; + cursor: pointer; } } @@ -984,9 +987,16 @@ export default { background: rgb(233, 237, 253); width: fit-content; } +.borderTitle { + background: rgba(102, 127, 253, 0.1); + padding: 0; +} .title-bg { background: rgb(115, 142, 246); border-bottom: 1px solid rgb(115, 142, 246); } +.font-weight { + font-weight: 400; +} diff --git a/src/views/basic/askTestQuestion/wrongQuestion.vue b/src/views/basic/askTestQuestion/wrongQuestion.vue index 873c922..aa7ae39 100644 --- a/src/views/basic/askTestQuestion/wrongQuestion.vue +++ b/src/views/basic/askTestQuestion/wrongQuestion.vue @@ -71,7 +71,7 @@ 得分率: -
+
- 题型: - 道题)
+
+ 筛选条件下,暂无题目 +
- 第 {{ item.questionIndex }} 题 + + 第 {{ item.questionIndex }} 题 +
{{ @@ -149,15 +157,17 @@
得分率: {{ item.scoreRate }}% - ({{ item.joinClassNames }}) + ({{ item.joinClassNames }})
- 来自试卷:{{ item.paperName }} - 来自试卷:{{ item.paperName }} + 测试时间:{{ item.testTime }} + >{{ item.testTime }}
@@ -165,22 +175,26 @@ class="topic-info" :src="item.screenshot" :ref="'iframe' + index" - style="width: 100%" + style="width: 100%; border: none" @load="onIFrameLoad(index)" />
-
+
查看解析 - 知识点: - {{ item.knowledge }} + 知识点: + {{ + item.knowledge + }} + 未标注
移除试卷 @@ -219,6 +233,7 @@ questions.map((item) => item.id) ) " + style="margin-right: 20px" @click="handleAllTest()" >全选本页 @@ -227,7 +242,7 @@ class="button-size" v-else plain - style="padding: 5px 10px" + style="padding: 5px 10px; margin-right: 20px" >移除本页
@@ -290,8 +305,8 @@ export default { classList: [], // 时间选择 dateList: [ - { type: "onDay", name: "今天" }, { type: "onWeek", name: "本周" }, + { type: "onMonth", name: "本月" }, { type: "term", name: "本学期" }, ], // 题型选择 @@ -308,7 +323,7 @@ export default { formData: { classId: 1, // 班级选中 // type: "onDay", // 时间类型 - type: "onDay", // 时间类型 + type: "onWeek", // 时间类型 dateRange: ["2022-03-01", "2023-05-01"], // 开始结束时间 startScoreRate: 0, // 开始区间 endScoreRate: 60, // 结束区间 @@ -625,11 +640,23 @@ export default { // 获取ref onIFrameLoad(index) { const iframeRef = this.$refs["iframe" + index][0]; // 获取对应的 iframe + // const doc = iframeRef.contentDocument || iframeRef.contentWindow.document; + // const body = iframeRef.contentWindow.document.body; + // body.style.overflowX = "hidden"; // 不允许出现横向滚动条 + // const height = body.scrollHeight; // 获取内容的高度 + // iframeRef.style.height = `${height}px`; // 设置 iframe 的高度 + // // 获取第一个P标签 + // const firstP = doc.getElementsByTagName("p")[0]; + // // 或者修改第一个 < p > 标签的内容; + // if (firstP) { + // let a = this.processString(firstP.innerHTML); + // firstP.innerHTML = a; + // } const doc = iframeRef.contentDocument || iframeRef.contentWindow.document; const body = iframeRef.contentWindow.document.body; body.style.overflowX = "hidden"; // 不允许出现横向滚动条 const height = body.scrollHeight; // 获取内容的高度 - iframeRef.style.height = `${height}px`; // 设置 iframe 的高度 + iframeRef.style.height = `${height + 20}px`; // 设置 iframe 的高度 // 获取第一个P标签 const firstP = doc.getElementsByTagName("p")[0]; // 或者修改第一个 < p > 标签的内容; @@ -699,7 +726,7 @@ export default { margin-top: 15px; display: flex; flex-direction: column; - box-shadow: 0px 0px 9px 0px #999999; + box-shadow: 0px 0px 9px 0px #cfcfcf; border-radius: 5px; .topic-title { height: 45px; @@ -720,10 +747,9 @@ export default { display: flex; align-items: center; justify-content: space-between; - margin: 0 20px; font-weight: 600; box-sizing: border-box; - border-top: 1px solid #d2cdcd; + border-top: 1px solid #e0dbdb; .knowledge { color: rgb(105, 134, 205); margin-right: 30px; @@ -737,15 +763,14 @@ export default { display: flex; justify-content: space-between; align-items: center; - border-top: 1px solid #666666; + border-top: 1px solid #cfcfcf; background: #ffffff; - box-shadow: 0 0 3px 0 #666666; padding: 5px 20px 0 20px; } .shopping { - width: 40px; - height: 120px; + width: 50px; + height: 135px; position: fixed; top: 30%; right: 0; @@ -763,13 +788,13 @@ export default { text-align: center; cursor: pointer; .shopping-select { - width: 20px; - height: 20px; + width: 25px; + height: 25px; border-radius: 50%; - background: yellow; - color: red; - line-height: 20px; + background: #eb5151; + color: #ffffff; font-size: 12px !important; + line-height: 25px; } .size { font-size: 14px !important; @@ -785,6 +810,7 @@ export default { margin: 10px 0; display: flex; align-items: center; + font-size: 16px !important; } .button { background: #6b73f5; @@ -794,6 +820,7 @@ export default { padding: 5px 10px; border-radius: 5px; margin: 0 8px; + font-size: 16px !important; cursor: pointer; white-space: nowrap; width: fit-content; @@ -814,4 +841,15 @@ export default { .size { font-size: 14px !important; } +.font-weight { + font-weight: 400; +} +.filter-datePicker { + font-size: 16px !important; +} +::v-deep .el-button { + span { + font-size: 16px !important; + } +} -- libgit2 0.21.4