Commit b754316f3ce354e01860ce646c8afd046871356a
1 parent
fc3b987b
wip: bug修复
Showing
2 changed files
with
27 additions
and
12 deletions
src/views/basic/askTestQuestion/components/wrongQuestionDialog.vue
@@ -37,6 +37,7 @@ | @@ -37,6 +37,7 @@ | ||
37 | style="padding: 0 200px" | 37 | style="padding: 0 200px" |
38 | /> | 38 | /> |
39 | </div> | 39 | </div> |
40 | + <div></div> | ||
40 | <div class="test-group"> | 41 | <div class="test-group"> |
41 | <div | 42 | <div |
42 | class="outer-item" | 43 | class="outer-item" |
@@ -158,10 +159,18 @@ | @@ -158,10 +159,18 @@ | ||
158 | >分 | 159 | >分 |
159 | </div> | 160 | </div> |
160 | <div class="edit-button"> | 161 | <div class="edit-button"> |
161 | - <el-button class="button-width" type="primary" @click="handleSava" | 162 | + <el-button |
163 | + :disabled="testData.length < 1" | ||
164 | + class="button-width" | ||
165 | + type="primary" | ||
166 | + @click="handleSava" | ||
162 | >保存试卷</el-button | 167 | >保存试卷</el-button |
163 | > | 168 | > |
164 | - <el-button class="button-width" plain @click="handleSava('print')" | 169 | + <el-button |
170 | + :disabled="testData.length < 1" | ||
171 | + class="button-width" | ||
172 | + plain | ||
173 | + @click="handleSava('print')" | ||
165 | >保存并打印</el-button | 174 | >保存并打印</el-button |
166 | > | 175 | > |
167 | <el-button | 176 | <el-button |
@@ -727,6 +736,11 @@ export default { | @@ -727,6 +736,11 @@ export default { | ||
727 | ); | 736 | ); |
728 | this.$emit("setQuestions"); | 737 | this.$emit("setQuestions"); |
729 | this.handleClose(); | 738 | this.handleClose(); |
739 | + this.$message({ | ||
740 | + message: "已保存到“即时测-组卷-我自编的", | ||
741 | + type: "success", | ||
742 | + }); | ||
743 | + | ||
730 | if (type == "print") { | 744 | if (type == "print") { |
731 | this.$request | 745 | this.$request |
732 | .tPaperDetail({ | 746 | .tPaperDetail({ |
@@ -743,7 +757,7 @@ export default { | @@ -743,7 +757,7 @@ export default { | ||
743 | // 清空 | 757 | // 清空 |
744 | handleClear() { | 758 | handleClear() { |
745 | this.$confirm("确定要清空试题篮内的全部题目吗?", "提示", { | 759 | this.$confirm("确定要清空试题篮内的全部题目吗?", "提示", { |
746 | - confirmButtonText: "确定", | 760 | + confirmButtonText: "清空", |
747 | cancelButtonText: "取消", | 761 | cancelButtonText: "取消", |
748 | confirmButtonClass: "el-button--danger1", | 762 | confirmButtonClass: "el-button--danger1", |
749 | cancelButtonClass: "el-button--primary", | 763 | cancelButtonClass: "el-button--primary", |
@@ -804,7 +818,7 @@ export default { | @@ -804,7 +818,7 @@ export default { | ||
804 | .test { | 818 | .test { |
805 | flex: 1; | 819 | flex: 1; |
806 | height: fit-content; | 820 | height: fit-content; |
807 | - max-height: 742px; | 821 | + height: 742px; |
808 | overflow-y: auto; | 822 | overflow-y: auto; |
809 | box-shadow: 0 0 10px 0 #cfcfcf; | 823 | box-shadow: 0 0 10px 0 #cfcfcf; |
810 | margin-right: 20px; | 824 | margin-right: 20px; |
src/views/basic/askTestQuestion/wrongQuestion.vue
1 | <template> | 1 | <template> |
2 | <div class="page-content" v-loading="queryLoading"> | 2 | <div class="page-content" v-loading="queryLoading"> |
3 | <div class="page-title"> | 3 | <div class="page-title"> |
4 | - <span class="default-title">错题组卷</span> | 4 | + <span class="default-title" |
5 | + >错题组卷 | ||
6 | + <span class="font-weight size" style="color: #666666" | ||
7 | + >(暂仅包含即时测内使用"导入的试卷"测验后产生的错题,不包含授课端截屏保存的错题)</span | ||
8 | + ></span | ||
9 | + > | ||
10 | + | ||
5 | <div> | 11 | <div> |
6 | <el-select | 12 | <el-select |
7 | v-model="formData.grade" | 13 | v-model="formData.grade" |
@@ -172,7 +178,6 @@ | @@ -172,7 +178,6 @@ | ||
172 | </div> | 178 | </div> |
173 | 179 | ||
174 | <iframe | 180 | <iframe |
175 | - class="topic-info" | ||
176 | :src="item.screenshot" | 181 | :src="item.screenshot" |
177 | :ref="'iframe' + index" | 182 | :ref="'iframe' + index" |
178 | style="width: 100%; border: none" | 183 | style="width: 100%; border: none" |
@@ -206,7 +211,7 @@ | @@ -206,7 +211,7 @@ | ||
206 | plain | 211 | plain |
207 | style="padding: 5px 10px; margin-right: 20px" | 212 | style="padding: 5px 10px; margin-right: 20px" |
208 | @click="handleDel(item)" | 213 | @click="handleDel(item)" |
209 | - >移除试卷</el-button | 214 | + >移出试卷</el-button |
210 | > | 215 | > |
211 | </div> | 216 | </div> |
212 | </div> | 217 | </div> |
@@ -243,7 +248,7 @@ | @@ -243,7 +248,7 @@ | ||
243 | v-else | 248 | v-else |
244 | plain | 249 | plain |
245 | style="padding: 5px 10px; margin-right: 20px" | 250 | style="padding: 5px 10px; margin-right: 20px" |
246 | - >移除本页</el-button | 251 | + >移出本页</el-button |
247 | > | 252 | > |
248 | </div> | 253 | </div> |
249 | <div class="shopping" @click="handleShop"> | 254 | <div class="shopping" @click="handleShop"> |
@@ -738,10 +743,6 @@ export default { | @@ -738,10 +743,6 @@ export default { | ||
738 | padding: 0 20px; | 743 | padding: 0 20px; |
739 | border-radius: 5px 5px 0 0; | 744 | border-radius: 5px 5px 0 0; |
740 | } | 745 | } |
741 | - .topic-info { | ||
742 | - overflow-y: auto; | ||
743 | - max-height: 300px; | ||
744 | - } | ||
745 | .topic-bottom { | 746 | .topic-bottom { |
746 | height: 45px; | 747 | height: 45px; |
747 | display: flex; | 748 | display: flex; |