Commit 861f5e84fff80d5e1bc592ccc11f571178460bb6
1 parent
3587d377
录分设置
Showing
35 changed files
with
144 additions
and
97 deletions
src/api/apis/apis.js
src/api/urls/apis.js
src/components/backBox.vue
src/views/basic/analysis/index.vue
... | ... | @@ -174,7 +174,6 @@ export default { |
174 | 174 | (this.props.lazyLoad = function (node, resolve) { |
175 | 175 | const { level } = node; |
176 | 176 | if (level == 3) { |
177 | - console.log(node); | |
178 | 177 | that.$request |
179 | 178 | .tenantSubjectList({ |
180 | 179 | schoolId: node.path[0], |
... | ... | @@ -246,7 +245,6 @@ export default { |
246 | 245 | })[0]; |
247 | 246 | }, |
248 | 247 | secGraClaSubChange(event, index) { |
249 | - console.log(event); | |
250 | 248 | let txt = ""; |
251 | 249 | let xx = this.filterObj(this.gradeList, event[0]); |
252 | 250 | txt += xx.label; | ... | ... |
src/views/basic/analysis/indexOld.vue
src/views/basic/ask/analysis.vue
... | ... | @@ -137,7 +137,6 @@ export default { |
137 | 137 | // this.className = this.$route.query.className; |
138 | 138 | const queryData = JSON.parse(this.$route.query.params); |
139 | 139 | this.classIds = this.$route.query.classIds; |
140 | - console.log(this.$route.query); | |
141 | 140 | this.subjectNames = this.$route.query.subjectNames.split(","); |
142 | 141 | if (this.types == 1) { |
143 | 142 | this.tabList = [ |
... | ... | @@ -315,7 +314,6 @@ export default { |
315 | 314 | ...query, |
316 | 315 | }); |
317 | 316 | this.loading = false; |
318 | - console.log(data); | |
319 | 317 | if (status === 0) { |
320 | 318 | this.exportStudent = (data?.list && [...data?.list]) || []; |
321 | 319 | } else { | ... | ... |
src/views/basic/ask/archiving.vue
src/views/basic/ask/index.vue
... | ... | @@ -153,7 +153,6 @@ export default { |
153 | 153 | this.query.subjectNames = val ? this.subjectList : []; |
154 | 154 | }, |
155 | 155 | handleChecked(value) { |
156 | - console.log(value); | |
157 | 156 | let checkedCount = value.length; |
158 | 157 | this.allSubject = checkedCount === this.subjectList.length; |
159 | 158 | this.isIndeterminate = | ... | ... |
src/views/basic/card/index.vue
... | ... | @@ -177,7 +177,6 @@ export default { |
177 | 177 | async _QueryGradeList() { |
178 | 178 | this.loading = true; |
179 | 179 | const { data, status, info } = await this.$request.gradeList(); |
180 | - console.log(status); | |
181 | 180 | if (status === 0) { |
182 | 181 | if (!!data.list) { |
183 | 182 | this.gradeList = |
... | ... | @@ -272,7 +271,6 @@ export default { |
272 | 271 | size: 20, |
273 | 272 | }); |
274 | 273 | this.loading = false; |
275 | - console.log(status); | |
276 | 274 | if (status === 0) { |
277 | 275 | this.tableData = data.list || []; |
278 | 276 | this.total = data.count; | ... | ... |
src/views/basic/dataSync/index.vue
... | ... | @@ -98,7 +98,6 @@ export default { |
98 | 98 | query.exportData = formatDate(times, "yyyy-MM-dd"); |
99 | 99 | query.exportData = query.exportData.replaceAll("-", "") |
100 | 100 | } |
101 | - console.log({ ...query }) | |
102 | 101 | const exportData = this.role == "ROLE_PERSONAL" ? this.$request.pExportData : this.$request.exportData |
103 | 102 | const data = await exportData({ ...query }); |
104 | 103 | this.downLoading = false; | ... | ... |
src/views/basic/device/index.vue
... | ... | @@ -899,7 +899,6 @@ export default { |
899 | 899 | this._QueryData(false); |
900 | 900 | }, |
901 | 901 | handleSelectionChange(val) { |
902 | - console.log(val); | |
903 | 902 | this.selectionTabIds = val.map((item) => { |
904 | 903 | return item.id; |
905 | 904 | }); |
... | ... | @@ -908,7 +907,6 @@ export default { |
908 | 907 | this._ModifyUpgradeFlagBySchool(); |
909 | 908 | }, 800), |
910 | 909 | changeUpdate: _.debounce(function (event, obj) { |
911 | - console.log(this); | |
912 | 910 | if (event) { |
913 | 911 | this.autoUpDate(obj.id); |
914 | 912 | } else { |
... | ... | @@ -1115,7 +1113,6 @@ export default { |
1115 | 1113 | ...query, |
1116 | 1114 | }); |
1117 | 1115 | this.loadingAnswerEqu = false; |
1118 | - console.log(status); | |
1119 | 1116 | if (status === 0) { |
1120 | 1117 | this.diaAnswerEqu = false; |
1121 | 1118 | this.$message.success(info); | ... | ... |
src/views/basic/down/client.vue
... | ... | @@ -407,7 +407,6 @@ export default { |
407 | 407 | methods: { |
408 | 408 | setConfigForm(obj) { |
409 | 409 | let content = JSON.parse(obj.content); |
410 | - console.log(content); | |
411 | 410 | this.formData.configName = obj.configName; |
412 | 411 | for (let key in this.formData) { |
413 | 412 | content[key] ? (this.formData[key] = content[key]) : ""; | ... | ... |
src/views/basic/setUp/PersonalStudent.vue
... | ... | @@ -395,7 +395,6 @@ export default { |
395 | 395 | let hasName = this.studentList.find((item) => { |
396 | 396 | return item.studentName == this.formStu.studentName; |
397 | 397 | }); |
398 | - console.log(hasName); | |
399 | 398 | if (hasName) { |
400 | 399 | this.$message.warning("学生姓名已存在"); |
401 | 400 | return; |
... | ... | @@ -405,7 +404,6 @@ export default { |
405 | 404 | ...query, |
406 | 405 | }); |
407 | 406 | this.loading = false; |
408 | - console.log(status); | |
409 | 407 | if (status === 0) { |
410 | 408 | this.$message.success(info); |
411 | 409 | this.diaStu = false; |
... | ... | @@ -425,7 +423,7 @@ export default { |
425 | 423 | ...this.query, |
426 | 424 | }); |
427 | 425 | this.loading = false; |
428 | - console.log(status); | |
426 | + | |
429 | 427 | if (status === 0) { |
430 | 428 | this.studentList = data.list || []; |
431 | 429 | } else { | ... | ... |
src/views/basic/setUp/account.vue
... | ... | @@ -536,7 +536,6 @@ export default { |
536 | 536 | this.diaCount = true; |
537 | 537 | }, |
538 | 538 | handleDropdownClick(value, item) { |
539 | - console.log(item); | |
540 | 539 | //更多 |
541 | 540 | if (value == 2) { |
542 | 541 | this.$confirm("确定要删除这条账号信息吗?", "提示", { |
... | ... | @@ -605,7 +604,6 @@ export default { |
605 | 604 | }, |
606 | 605 | async updateUser(obj, type) { |
607 | 606 | let query = {}; |
608 | - console.log(query); | |
609 | 607 | if (type == 1) { |
610 | 608 | query.available = obj.available == 0 ? 1 : 0; |
611 | 609 | } | ... | ... |
src/views/basic/setUp/conglomerate.vue
src/views/basic/setUp/school.vue
... | ... | @@ -277,7 +277,7 @@ export default { |
277 | 277 | async _QuerySectionList() { |
278 | 278 | //学校学段 |
279 | 279 | const { data, status, info } = await this.$request.sectionList(); |
280 | - console.log(status); | |
280 | + | |
281 | 281 | if (status === 0) { |
282 | 282 | this.sectionsList = data?.list || []; |
283 | 283 | } else { |
... | ... | @@ -294,7 +294,6 @@ export default { |
294 | 294 | for (let key in this.formSchool) { |
295 | 295 | if (key == "sections") { |
296 | 296 | this.formSchool.sections = data[key].split(",").map((item) => { |
297 | - console.log(Number(item)); | |
298 | 297 | return Number(item); |
299 | 298 | }); |
300 | 299 | } else { |
... | ... | @@ -310,7 +309,7 @@ export default { |
310 | 309 | this.loading = true; |
311 | 310 | const { data, status, info } = await this.$request.gradeList(); |
312 | 311 | this.loading = false; |
313 | - console.log(status); | |
312 | + | |
314 | 313 | if (status === 0) { |
315 | 314 | this.tableData = data.list || []; |
316 | 315 | } else { | ... | ... |
src/views/basic/setUp/student.vue
... | ... | @@ -540,7 +540,6 @@ export default { |
540 | 540 | let hasName = this.studentList.find((item) => { |
541 | 541 | return item.studentName == this.formStu.studentName; |
542 | 542 | }); |
543 | - console.log(hasName); | |
544 | 543 | if (hasName) { |
545 | 544 | this.$message.warning("学生姓名已存在"); |
546 | 545 | this.loading = false; |
... | ... | @@ -551,7 +550,7 @@ export default { |
551 | 550 | ...query, |
552 | 551 | }); |
553 | 552 | this.loading = false; |
554 | - console.log(status); | |
553 | + | |
555 | 554 | if (status === 0) { |
556 | 555 | this.$message.success(info); |
557 | 556 | this.diaStu = false; |
... | ... | @@ -573,7 +572,6 @@ export default { |
573 | 572 | }, |
574 | 573 | //学生调班弹窗 |
575 | 574 | openChangeClazz(obj) { |
576 | - console.log(obj); | |
577 | 575 | this.formStuCla.classId = ""; |
578 | 576 | this.formStuCla.studentId = obj.id; |
579 | 577 | this.formStuCla.classList = obj.classList || []; |
... | ... | @@ -723,7 +721,7 @@ export default { |
723 | 721 | ...query, |
724 | 722 | }); |
725 | 723 | this.loading = false; |
726 | - console.log(status); | |
724 | + | |
727 | 725 | if (status === 0) { |
728 | 726 | this.studentList = (data.list && [...data?.list]) || []; |
729 | 727 | } else { |
... | ... | @@ -768,7 +766,6 @@ export default { |
768 | 766 | let classType = ""; |
769 | 767 | this.formStuCla.classList.map((item) => { |
770 | 768 | if (this.formStuCla.oldClassId == item.id) { |
771 | - console.log(item); | |
772 | 769 | classType = item.classType; |
773 | 770 | grade = item.grade; |
774 | 771 | } | ... | ... |
src/views/basic/setUp/teacher.vue
... | ... | @@ -722,7 +722,6 @@ export default { |
722 | 722 | this.$message.error(res.info); |
723 | 723 | } |
724 | 724 | } else { |
725 | - console.log(valid); | |
726 | 725 | this.$message.warning("输入有误请检查!"); |
727 | 726 | return false; |
728 | 727 | } |
... | ... | @@ -973,7 +972,7 @@ export default { |
973 | 972 | ...query, |
974 | 973 | }); |
975 | 974 | this.loading = false; |
976 | - console.log(status); | |
975 | + | |
977 | 976 | if (status === 0) { |
978 | 977 | this.teacherList = data.list || []; |
979 | 978 | if (type == 10) { | ... | ... |
src/views/basic/test/analysis.vue
... | ... | @@ -77,15 +77,15 @@ export default { |
77 | 77 | this.$store.getters.info.showRole || |
78 | 78 | this.$store.getters.info.permissions[0].role; |
79 | 79 | this.id = this.$route.query.id || ""; |
80 | - this.examType = this.$route.query.examType || 2; | |
80 | + this.examType = Number(this.$route.query.examType || 2); | |
81 | 81 | this.score = Number(this.$route.query.score) || 0; |
82 | 82 | this.ids = |
83 | 83 | (this.$route.query.ids && this.$route.query.ids.split(",")) || []; |
84 | 84 | this.type = this.$route.query.type; |
85 | - this.classIds = this.$route.query.classIds || []; | |
85 | + this.classIds = this.$route.query.classIds?.split(",") || []; | |
86 | + console.log(this.classIds); | |
86 | 87 | this.title = this.$route.query.title || ""; |
87 | 88 | this.subjectName = this.$route.query.subjectName || ""; |
88 | - console.log(this.classIds) | |
89 | 89 | }, |
90 | 90 | methods: {}, |
91 | 91 | }; | ... | ... |
src/views/basic/test/archiving.vue
... | ... | @@ -471,7 +471,6 @@ export default { |
471 | 471 | let leng = val.length - 1; |
472 | 472 | sub = val[leng]; |
473 | 473 | } |
474 | - console.log(val); | |
475 | 474 | this.query.subjectNames = val.filter((item) => { |
476 | 475 | return sub != "全部" ? item != "全部" : item == "全部"; |
477 | 476 | }); |
... | ... | @@ -487,7 +486,7 @@ export default { |
487 | 486 | status: 1, |
488 | 487 | type: 1, //试卷类型 |
489 | 488 | subjectName: obj.subjectName, |
490 | - classIds: [obj.classId], | |
489 | + classIds: obj.classId, | |
491 | 490 | params: JSON.stringify({ |
492 | 491 | ...this.query, |
493 | 492 | subjectNames: [this.query.subjectNames], |
... | ... | @@ -755,7 +754,6 @@ export default { |
755 | 754 | } |
756 | 755 | }); |
757 | 756 | }); |
758 | - console.log(dataList); | |
759 | 757 | this.tableData = data?.list.map((item) => { |
760 | 758 | let params = {}; |
761 | 759 | dataIdsList.map((ids, index) => { | ... | ... |
src/views/basic/test/components/contrast.vue
src/views/basic/test/components/scoreSet.vue
... | ... | @@ -43,7 +43,7 @@ |
43 | 43 | <el-table-column prop="score" label="总得分" align="center" fixed |
44 | 44 | ><template slot-scope="scoped"> |
45 | 45 | <el-input |
46 | - v-if="scoped.row.isSetScore" | |
46 | + v-if="showAllSetScore" | |
47 | 47 | type="number" |
48 | 48 | :min="0" |
49 | 49 | v-model="scoped.row.all" |
... | ... | @@ -54,21 +54,25 @@ |
54 | 54 | <el-table-column prop="objectiveScore" label="客观题分" align="center" |
55 | 55 | ><template slot-scope="scoped"> |
56 | 56 | <!-- <el-input |
57 | + v-if="scoped.row.showSetScore" | |
57 | 58 | type="number" |
58 | 59 | :min="0" |
59 | 60 | v-model="scoped.row.object" |
61 | + @input="setOtherScore($event, scoped.row)" | |
60 | 62 | ></el-input> --> |
61 | - {{ scoped.row.object }} | |
63 | + <template>{{ scoped.row.object }}</template> | |
62 | 64 | </template></el-table-column |
63 | 65 | > |
64 | 66 | <el-table-column prop="subjectiveScore" label="主观题分" align="center"> |
65 | 67 | <template slot-scope="scoped"> |
66 | 68 | <!-- <el-input |
69 | + v-if="scoped.row.showSetScore" | |
67 | 70 | type="number" |
68 | 71 | :min="0" |
69 | 72 | v-model="scoped.row.subject" |
73 | + @input="setOtherScore($event, scoped.row)" | |
70 | 74 | ></el-input> --> |
71 | - {{ scoped.row.subject }} | |
75 | + <template>{{ scoped.row.subject }}</template> | |
72 | 76 | </template> |
73 | 77 | </el-table-column> |
74 | 78 | <!-- <el-table-column v-for="(item, index) in questionList" :key="index" :label="'第' + cNum[index] + '大题'" --> |
... | ... | @@ -80,6 +84,7 @@ |
80 | 84 | > |
81 | 85 | <template slot-scope="scoped"> |
82 | 86 | <el-input |
87 | + v-if="showSetScore" | |
83 | 88 | type="number" |
84 | 89 | :min="0" |
85 | 90 | :max="question.questionScore" |
... | ... | @@ -94,6 +99,9 @@ |
94 | 99 | " |
95 | 100 | v-model="scoped.row.scoreMap[question.questionId]" |
96 | 101 | ></el-input> |
102 | + <template v-else>{{ | |
103 | + scoped.row.scoreMap[question.questionId] | |
104 | + }}</template> | |
97 | 105 | </template> |
98 | 106 | </el-table-column> |
99 | 107 | </el-table> |
... | ... | @@ -140,6 +148,8 @@ export default { |
140 | 148 | default: 0, |
141 | 149 | }, |
142 | 150 | diaScoreSet: false, |
151 | + showAllSetScore: false, | |
152 | + showSetScore: false, | |
143 | 153 | }, |
144 | 154 | data() { |
145 | 155 | return { |
... | ... | @@ -164,12 +174,12 @@ export default { |
164 | 174 | }, |
165 | 175 | }, |
166 | 176 | methods: { |
177 | + //设置小题分 | |
167 | 178 | setScore(val, max, obj, questionId, rowData) { |
168 | 179 | if (max && Number(val) > Number(max)) { |
169 | 180 | obj[questionId] = max; |
170 | 181 | } |
171 | 182 | let { score, object, subject } = this.getScore(rowData); |
172 | - rowData.isSetScore = false; | |
173 | 183 | rowData.all = score; |
174 | 184 | rowData.object = object; |
175 | 185 | rowData.subject = subject; |
... | ... | @@ -204,9 +214,6 @@ export default { |
204 | 214 | } else { |
205 | 215 | let num = Number(obj.scoreMap[keys]); |
206 | 216 | obj.scoreMap[keys] = num; |
207 | - if (num > 0) { | |
208 | - this.isSetScore = false; | |
209 | - } | |
210 | 217 | score += num; |
211 | 218 | if (question.questionType == 5) { |
212 | 219 | subject += num; |
... | ... | @@ -245,7 +252,6 @@ export default { |
245 | 252 | } |
246 | 253 | this.tableData = |
247 | 254 | studentList.map((item) => { |
248 | - item.isSetScore = true; | |
249 | 255 | item.all = item.all || 0; //总分 |
250 | 256 | item.object = item.object || 0; //客观题分数 |
251 | 257 | item.subject = item.subject || 0; //主观题分数 |
... | ... | @@ -261,9 +267,6 @@ export default { |
261 | 267 | } else { |
262 | 268 | let num = Number(item.scoreMap[keys]); |
263 | 269 | item.scoreMap[keys] = num; |
264 | - if (num > 0) { | |
265 | - item.isSetScore = false; | |
266 | - } | |
267 | 270 | } |
268 | 271 | }); |
269 | 272 | |
... | ... | @@ -291,7 +294,6 @@ export default { |
291 | 294 | scores: scoreMap, |
292 | 295 | }; |
293 | 296 | }); |
294 | - console.log(list); | |
295 | 297 | const { data, status, info } = await this.$request.submitScore({ |
296 | 298 | examId: this.id, |
297 | 299 | list, |
... | ... | @@ -341,7 +343,7 @@ export default { |
341 | 343 | width: calc(100% - 200px); |
342 | 344 | height: calc(100% - 70px); |
343 | 345 | background: #fff; |
344 | - z-index: 2000; | |
346 | + z-index: 200000; | |
345 | 347 | overflow-y: auto; |
346 | 348 | } |
347 | 349 | ... | ... |
src/views/basic/test/components/test.vue
... | ... | @@ -435,9 +435,28 @@ |
435 | 435 | !status && role != 'ROLE_BANZHUREN' && examReport.examPaperId != 0 |
436 | 436 | " |
437 | 437 | > |
438 | - <el-button type="primary" round @click="openScoreSet" | |
438 | + <el-button | |
439 | + class="score-set" | |
440 | + v-if="this.showSelect == false" | |
441 | + type="primary" | |
442 | + round | |
443 | + @click="openScoreSet(2)" | |
439 | 444 | >答卷录分</el-button |
440 | 445 | > |
446 | + <el-popover v-else placement="bottom" width="194"> | |
447 | + <div style="display: flex"> | |
448 | + <el-button size="mini" @click="openScoreSet(1)" | |
449 | + >录入总得分</el-button | |
450 | + > | |
451 | + <el-button type="primary" size="mini" @click="openScoreSet(2)" | |
452 | + >录入小题分</el-button | |
453 | + > | |
454 | + </div> | |
455 | + <el-button class="score-set" slot="reference" type="primary" round | |
456 | + >答卷录分</el-button | |
457 | + > | |
458 | + </el-popover> | |
459 | + | |
441 | 460 | <template |
442 | 461 | v-if="examReport.subjectiveScore != examReport.examPaperScore" |
443 | 462 | > |
... | ... | @@ -453,6 +472,8 @@ |
453 | 472 | :id="id" |
454 | 473 | :title="title" |
455 | 474 | :examScore="score" |
475 | + :showAllSetScore="showAllSetScore" | |
476 | + :showSetScore="showSetScore" | |
456 | 477 | :diaScoreSet="diaScoreSet" |
457 | 478 | @closeScoreSet="closeScoreSet" |
458 | 479 | @SuccessScoreSet="SuccessScoreSet" |
... | ... | @@ -521,7 +542,7 @@ export default { |
521 | 542 | title: String, |
522 | 543 | classIds: Array, |
523 | 544 | subjectName: String, |
524 | - examType: String, | |
545 | + examType: Number, | |
525 | 546 | score: { |
526 | 547 | type: Number, |
527 | 548 | default: 0, |
... | ... | @@ -581,6 +602,10 @@ export default { |
581 | 602 | //导出相关 |
582 | 603 | diaShow: false, |
583 | 604 | exportStudent: [], |
605 | + | |
606 | + showSelect: true, //是否显示录总分 | |
607 | + showAllSetScore: false, //当前操作试卷可录总分分状态 | |
608 | + showSetScore: false, //当前操作试卷可录小题分状态 | |
584 | 609 | }; |
585 | 610 | }, |
586 | 611 | created() { |
... | ... | @@ -596,8 +621,10 @@ export default { |
596 | 621 | } |
597 | 622 | }, |
598 | 623 | //打开答卷录分 |
599 | - openScoreSet() { | |
624 | + openScoreSet(type) { | |
600 | 625 | this.diaScoreSet = true; |
626 | + this.showAllSetScore = type == 1 ? true : false; | |
627 | + this.showSetScore = type == 2 ? true : false; | |
601 | 628 | }, |
602 | 629 | //关闭设置分数 |
603 | 630 | closeScoreSet() { |
... | ... | @@ -750,6 +777,9 @@ export default { |
750 | 777 | let params = {}; |
751 | 778 | |
752 | 779 | const detail = JSON.parse(item.detail); |
780 | + if (detail.length) { | |
781 | + this.showSelect = false; | |
782 | + } | |
753 | 783 | if (detail.length > optionsList.length) { |
754 | 784 | optionsList = [...detail]; |
755 | 785 | } |
... | ... | @@ -768,7 +798,6 @@ export default { |
768 | 798 | ...params, |
769 | 799 | }; |
770 | 800 | }); |
771 | - console.log(); | |
772 | 801 | this.questionList = optionsList.sort((a, b) => { |
773 | 802 | return a.id - b.id; |
774 | 803 | }); |
... | ... | @@ -963,6 +992,9 @@ div::-webkit-scrollbar-thumb { |
963 | 992 | display: flex; |
964 | 993 | justify-content: space-between; |
965 | 994 | } |
995 | +.score-set { | |
996 | + margin-right: 10px; | |
997 | +} | |
966 | 998 | |
967 | 999 | .hui-box { |
968 | 1000 | display: flex; | ... | ... |
src/views/basic/test/index.vue
... | ... | @@ -161,7 +161,6 @@ export default { |
161 | 161 | this.query.classId = val ? this.classList.map((item) => item.value) : []; |
162 | 162 | }, |
163 | 163 | changeclass(value) { |
164 | - console.log(value); | |
165 | 164 | if (this.role == "ROLE_BANZHUREN") { |
166 | 165 | this._QuerySubjectList(); |
167 | 166 | } else { |
... | ... | @@ -176,7 +175,6 @@ export default { |
176 | 175 | this.query.subjectNames = val ? this.subjectList : []; |
177 | 176 | }, |
178 | 177 | CheckedSub(value) { |
179 | - console.log(value); | |
180 | 178 | let checkedCount = value.length; |
181 | 179 | this.allSubject = checkedCount === this.subjectList.length; |
182 | 180 | this.isIndeterminateSub = | ... | ... |
src/views/basic/test/list.vue
... | ... | @@ -153,20 +153,45 @@ |
153 | 153 | </el-tooltip> |
154 | 154 | <template v-else>未设置答案</template> |
155 | 155 | </template> |
156 | - <el-tooltip | |
156 | + <template | |
157 | 157 | v-if="role != 'ROLE_BANZHUREN' && scoped.row.examPaperId != 0" |
158 | - effect="dark" | |
159 | - content="答卷录分" | |
160 | - placement="top" | |
161 | 158 | > |
162 | - <el-button | |
163 | - type="primary" | |
164 | - circle | |
165 | - size="mini" | |
166 | - @click="openScoreSet(scoped.row)" | |
167 | - >分</el-button | |
168 | - > | |
169 | - </el-tooltip> | |
159 | + <template> | |
160 | + <el-popover placement="bottom" width="194"> | |
161 | + <div | |
162 | + style="display: flex" | |
163 | + v-loading=" | |
164 | + scoped.row.showSelect == 0 || | |
165 | + scoped.row.showSelect == 1 | |
166 | + ? false | |
167 | + : true | |
168 | + " | |
169 | + > | |
170 | + <el-button | |
171 | + v-if="scoped.row.showSelect == 0" | |
172 | + size="mini" | |
173 | + @click="openScoreSet(scoped.row, 1)" | |
174 | + >录入总得分</el-button | |
175 | + > | |
176 | + <el-button | |
177 | + type="primary" | |
178 | + size="mini" | |
179 | + @click="openScoreSet(scoped.row, 2)" | |
180 | + >录入小题分</el-button | |
181 | + > | |
182 | + </div> | |
183 | + <el-button | |
184 | + class="remove-test" | |
185 | + slot="reference" | |
186 | + type="primary" | |
187 | + circle | |
188 | + size="mini" | |
189 | + @click="queryStatus(scoped.row)" | |
190 | + >分</el-button | |
191 | + > | |
192 | + </el-popover> | |
193 | + </template> | |
194 | + </template> | |
170 | 195 | <el-popconfirm |
171 | 196 | v-if="role != 'ROLE_BANZHUREN'" |
172 | 197 | title="确定删除吗?" |
... | ... | @@ -205,6 +230,8 @@ |
205 | 230 | :id="examId" |
206 | 231 | :title="examTitlt" |
207 | 232 | :examScore="examScore" |
233 | + :showAllSetScore="showAllSetScore" | |
234 | + :showSetScore="showSetScore" | |
208 | 235 | @closeScoreSet="closeScoreSet" |
209 | 236 | @SuccessScoreSet="SuccessScoreSet" |
210 | 237 | /> |
... | ... | @@ -231,6 +258,8 @@ export default { |
231 | 258 | examId: "", //当前操作试卷 |
232 | 259 | examTitlt: "", //当前操作试卷名称 |
233 | 260 | examScore: 0, //当前操作试卷卷面总分 |
261 | + showAllSetScore: false, //当前操作试卷可录总分分状态 | |
262 | + showSetScore: false, //当前操作试卷可录小题分状态 | |
234 | 263 | query: { |
235 | 264 | //搜索条件 |
236 | 265 | classId: [], |
... | ... | @@ -283,7 +312,6 @@ export default { |
283 | 312 | queryData |
284 | 313 | ? (this.query = { ...this.query, ...JSON.parse(queryData) }) |
285 | 314 | : ""; |
286 | - console.log(this.query); | |
287 | 315 | this.$store.commit("setClasses", this.query.classId.join(",")); |
288 | 316 | this.isMultipleClass = false; |
289 | 317 | this.role = |
... | ... | @@ -314,7 +342,7 @@ export default { |
314 | 342 | score: obj.examPaperScore || 0, |
315 | 343 | type: 1, //试卷类型 |
316 | 344 | subjectName: obj.subjectName, |
317 | - classIds: [obj.classId], | |
345 | + classIds: obj.classId, | |
318 | 346 | params: this.$route.query.params, |
319 | 347 | examType: obj.examPaperId == 0 ? 1 : 2, |
320 | 348 | }, |
... | ... | @@ -344,7 +372,6 @@ export default { |
344 | 372 | }); |
345 | 373 | subjectArr = [...new Set(subjectArr)]; |
346 | 374 | classIds = [...new Set(classIds)]; |
347 | - console.log(subjectArr); | |
348 | 375 | if (this.multipleSelection.length == 1) { |
349 | 376 | this.$router.push({ |
350 | 377 | path: "/testAnalysis", |
... | ... | @@ -354,7 +381,7 @@ export default { |
354 | 381 | score: multipleData[0].examPaperScore || 0, |
355 | 382 | type: 1, |
356 | 383 | subjectName: subjectArr.join(), |
357 | - classIds: classIds, | |
384 | + classIds: classIds.join(), | |
358 | 385 | params: this.$route.query.params, |
359 | 386 | }, |
360 | 387 | }); |
... | ... | @@ -364,7 +391,7 @@ export default { |
364 | 391 | path: "/testAnalysis", |
365 | 392 | query: { |
366 | 393 | ids: this.multipleSelection.join(), |
367 | - classIds: classIds, | |
394 | + classIds: classIds.join(), | |
368 | 395 | type: subjectArr.length == 1 ? 2 : 3, |
369 | 396 | subjectName: subjectArr.join(), |
370 | 397 | params: this.$route.query.params, |
... | ... | @@ -374,7 +401,6 @@ export default { |
374 | 401 | }, |
375 | 402 | // 多班对比 |
376 | 403 | linkContrast(obj) { |
377 | - console.log(obj); | |
378 | 404 | this.$router.push({ |
379 | 405 | path: "/testAnalysis", |
380 | 406 | query: { |
... | ... | @@ -412,9 +438,24 @@ export default { |
412 | 438 | handleSelectionChange(val) { |
413 | 439 | this.multipleSelection = val; |
414 | 440 | }, |
441 | + //已录分状态 | |
442 | + async queryStatus(obj) { | |
443 | + const { data, status, info } = await this.$request.getScoreType({ | |
444 | + examId: obj.id, | |
445 | + }); | |
446 | + if (status === 0) { | |
447 | + // if (data == 1) { | |
448 | + // this.openScoreSet(obj, 2); | |
449 | + // } | |
450 | + obj.showSelect = data; | |
451 | + } else { | |
452 | + this.$message.error(info); | |
453 | + } | |
454 | + }, | |
415 | 455 | //打开答卷录分 |
416 | - openScoreSet(obj) { | |
417 | - console.log(obj); | |
456 | + openScoreSet(obj, type) { | |
457 | + this.showAllSetScore = type == 1 ? true : false; | |
458 | + this.showSetScore = type == 2 ? true : false; | |
418 | 459 | this.examId = String(obj.id); |
419 | 460 | this.examTitlt = obj.title; |
420 | 461 | this.examScore = obj.examPaperScore; |
... | ... | @@ -505,7 +546,11 @@ export default { |
505 | 546 | if (status === 0) { |
506 | 547 | if (this.role == "ROLE_BANZHUREN") { |
507 | 548 | this.isMultipleClass = false; |
508 | - this.tableData = (data?.list && [...data?.list]) || []; | |
549 | + this.tableData = | |
550 | + data?.list?.map((item) => { | |
551 | + item.showSelect = false; | |
552 | + return item; | |
553 | + }) || []; | |
509 | 554 | this.total = data?.count || 0; |
510 | 555 | } else { |
511 | 556 | if (this.query.classId.length > 1) { |
... | ... | @@ -554,7 +599,11 @@ export default { |
554 | 599 | }); |
555 | 600 | } else { |
556 | 601 | this.isMultipleClass = false; |
557 | - this.tableData = (data?.list && [...data?.list]) || []; | |
602 | + this.tableData = | |
603 | + data?.list?.map((item) => { | |
604 | + item.showSelect = false; | |
605 | + return item; | |
606 | + }) || []; | |
558 | 607 | this.total = data?.count || 0; |
559 | 608 | } |
560 | 609 | } | ... | ... |
src/views/basic/userInfo/index.vue
... | ... | @@ -214,7 +214,7 @@ export default { |
214 | 214 | this.loading = true; |
215 | 215 | const { data, status, info } = await this.$request.getInfo(); |
216 | 216 | this.loading = false; |
217 | - console.log(status); | |
217 | + | |
218 | 218 | if (status === 0) { |
219 | 219 | this.Info = { ...data }; |
220 | 220 | for (let key in this.formSchool) { | ... | ... |
src/views/examinationPaper/add.vue
... | ... | @@ -1721,7 +1721,6 @@ export default { |
1721 | 1721 | } |
1722 | 1722 | } |
1723 | 1723 | } |
1724 | - console.log(this.form.questionList[0].subQuestions); | |
1725 | 1724 | }, |
1726 | 1725 | openQuestion() { |
1727 | 1726 | this.questionForm = { ...questionForm }; |
... | ... | @@ -2044,7 +2043,6 @@ export default { |
2044 | 2043 | const { data, status, info } = await fetchClassList(); |
2045 | 2044 | if (status == 0) { |
2046 | 2045 | this.gradeClassList = data.list?.map((item) => { |
2047 | - console.log(!this.gradeList.includes(item.gradeName)); | |
2048 | 2046 | if (!this.gradeList.includes(item.gradeName)) { |
2049 | 2047 | this.gradeList.push(item.gradeName); |
2050 | 2048 | } | ... | ... |
src/views/examinationPaper/addQs.vue
... | ... | @@ -794,7 +794,6 @@ export default { |
794 | 794 | this.form.sharingType = params?.sharingType || 0; |
795 | 795 | this.formatData(params); |
796 | 796 | } |
797 | - console.log(this.form); | |
798 | 797 | if (this.role != "ROLE_PERSONAL") { |
799 | 798 | this.formRules.gradeName = [ |
800 | 799 | { required: true, message: "请选择年级", trigger: "blur" }, |
... | ... | @@ -1383,7 +1382,6 @@ export default { |
1383 | 1382 | const { data, status, info } = await fetchClassList(); |
1384 | 1383 | if (status == 0) { |
1385 | 1384 | this.gradeClassList = data.list?.map((item) => { |
1386 | - console.log(!this.gradeList.includes(item.gradeName)); | |
1387 | 1385 | if (!this.gradeList.includes(item.gradeName)) { |
1388 | 1386 | this.gradeList.push(item.gradeName); |
1389 | 1387 | } | ... | ... |
src/views/examinationPaper/edit.vue
... | ... | @@ -563,8 +563,6 @@ export default { |
563 | 563 | sectionName = item.sectionName; |
564 | 564 | } |
565 | 565 | }); |
566 | - console.log(this.gradeClassList); | |
567 | - console.log(sectionName); | |
568 | 566 | if ( |
569 | 567 | sectionName && |
570 | 568 | Object.keys(this.knowledgeList).includes(sectionName) |
... | ... | @@ -1162,7 +1160,6 @@ export default { |
1162 | 1160 | } |
1163 | 1161 | return sub; |
1164 | 1162 | }); |
1165 | - console.log(types); | |
1166 | 1163 | for (let i = 0; i < types.length; i++) { |
1167 | 1164 | if (types[i].qusType == 3) { |
1168 | 1165 | types[i].answerList = types[i].answerList.slice(0, -1); |
... | ... | @@ -1176,7 +1173,6 @@ export default { |
1176 | 1173 | } |
1177 | 1174 | } |
1178 | 1175 | } |
1179 | - console.log(this.questionList); | |
1180 | 1176 | }, |
1181 | 1177 | }, |
1182 | 1178 | }; | ... | ... |
src/views/personal/dataSync/index.vue
... | ... | @@ -78,7 +78,6 @@ export default { |
78 | 78 | this.downLoading = true; |
79 | 79 | const data = await this.$request.pExportData(); |
80 | 80 | this.downLoading = false; |
81 | - console.log(data); | |
82 | 81 | if (data) { |
83 | 82 | let blob = new Blob([data], { type: "application/octet-stream" }); |
84 | 83 | const url = URL.createObjectURL(blob); | ... | ... |
src/views/personal/setUp/student.vue
... | ... | @@ -395,7 +395,6 @@ export default { |
395 | 395 | let hasName = this.studentList.find((item) => { |
396 | 396 | return item.studentName == this.formStu.studentName; |
397 | 397 | }); |
398 | - console.log(hasName); | |
399 | 398 | if (hasName) { |
400 | 399 | this.$message.warning("学生姓名已存在"); |
401 | 400 | return; |
... | ... | @@ -405,7 +404,7 @@ export default { |
405 | 404 | ...query, |
406 | 405 | }); |
407 | 406 | this.loading = false; |
408 | - console.log(status); | |
407 | + | |
409 | 408 | if (status === 0) { |
410 | 409 | this.$message.success(info); |
411 | 410 | this.diaStu = false; |
... | ... | @@ -425,7 +424,7 @@ export default { |
425 | 424 | ...this.query, |
426 | 425 | }); |
427 | 426 | this.loading = false; |
428 | - console.log(status); | |
427 | + | |
429 | 428 | if (status === 0) { |
430 | 429 | this.studentList = data.list || []; |
431 | 430 | } else { | ... | ... |
src/views/personal/test/analysis.vue
... | ... | @@ -487,7 +487,6 @@ export default { |
487 | 487 | this._QueryData(); |
488 | 488 | }, |
489 | 489 | setType(type) { |
490 | - console.log(this.$refs.main.offsetHeight - 50); | |
491 | 490 | this.tableMaxHeight = this.$refs.main.offsetHeight; |
492 | 491 | this.type = type; |
493 | 492 | }, |
... | ... | @@ -604,7 +603,6 @@ export default { |
604 | 603 | ...params, |
605 | 604 | }; |
606 | 605 | }); |
607 | - console.log(); | |
608 | 606 | this.questionList = optionsList.sort((a, b) => { |
609 | 607 | return a.id - b.id; |
610 | 608 | }); | ... | ... |
src/views/personal/test/archiving.vue
src/views/personal/test/index.vue
src/views/personal/userInfo/index.vue
... | ... | @@ -214,7 +214,7 @@ export default { |
214 | 214 | this.loading = true; |
215 | 215 | const { data, status, info } = await this.$request.getInfo(); |
216 | 216 | this.loading = false; |
217 | - console.log(status); | |
217 | + | |
218 | 218 | if (status === 0) { |
219 | 219 | this.Info = { ...data }; |
220 | 220 | for (let key in this.formSchool) { | ... | ... |