Commit 68875fbab6886c12528483a9328c1d0540eed098
1 parent
c3c2b127
即时测多班汇总（删除）
Showing
2 changed files
with
20 additions
and
36 deletions
src/views/basic/test/components/multipleClass.vue deleted
src/views/basic/test/list.vue
| @@ -251,7 +251,6 @@ export default { | @@ -251,7 +251,6 @@ export default { | ||
| 251 | endDay: "", | 251 | endDay: "", |
| 252 | }, | 252 | }, |
| 253 | multipleSelection: [], | 253 | multipleSelection: [], |
| 254 | - multipleSelectionClassId: [], | ||
| 255 | tableData: [], | 254 | tableData: [], |
| 256 | page: 1, | 255 | page: 1, |
| 257 | size: 20, | 256 | size: 20, |
| @@ -336,45 +335,31 @@ export default { | @@ -336,45 +335,31 @@ export default { | ||
| 336 | }); | 335 | }); |
| 337 | subjectArr = [...new Set(subjectArr)]; | 336 | subjectArr = [...new Set(subjectArr)]; |
| 338 | console.log(subjectArr); | 337 | console.log(subjectArr); |
| 339 | - if (this.multipleSelectionClassId.length > 1) { | 338 | + if (ids.length == 1) { |
| 339 | + this.$router.push({ | ||
| 340 | + path: "/testAnalysis", | ||
| 341 | + query: { | ||
| 342 | + id: ids[0], | ||
| 343 | + title: this.multipleSelection[0].title, | ||
| 344 | + score: this.multipleSelection[0].examPaperScore || 0, | ||
| 345 | + type: 1, | ||
| 346 | + subjectName: subjectArr.join(), | ||
| 347 | + classId: this.query.classId[0], | ||
| 348 | + params: this.$route.query.params, | ||
| 349 | + }, | ||
| 350 | + }); | ||
| 351 | + } else { | ||
| 340 | //去详情 | 352 | //去详情 |
| 341 | this.$router.push({ | 353 | this.$router.push({ |
| 342 | path: "/testAnalysis", | 354 | path: "/testAnalysis", |
| 343 | query: { | 355 | query: { |
| 344 | ids: ids.join(), | 356 | ids: ids.join(), |
| 345 | - classId: this.multipleSelectionClassId.join(), | ||
| 346 | - type: 5, | 357 | + classId: this.query.classId[0], |
| 358 | + type: subjectArr.length == 1 ? 2 : 3, | ||
| 347 | subjectName: subjectArr.join(), | 359 | subjectName: subjectArr.join(), |
| 348 | params: this.$route.query.params, | 360 | params: this.$route.query.params, |
| 349 | }, | 361 | }, |
| 350 | }); | 362 | }); |
| 351 | - } else { | ||
| 352 | - if (ids.length == 1) { | ||
| 353 | - this.$router.push({ | ||
| 354 | - path: "/testAnalysis", | ||
| 355 | - query: { | ||
| 356 | - id: ids[0], | ||
| 357 | - title: this.multipleSelection[0].title, | ||
| 358 | - score: this.multipleSelection[0].examPaperScore || 0, | ||
| 359 | - type: 1, | ||
| 360 | - subjectName: subjectArr.join(), | ||
| 361 | - classId: this.query.classId[0], | ||
| 362 | - params: this.$route.query.params, | ||
| 363 | - }, | ||
| 364 | - }); | ||
| 365 | - } else { | ||
| 366 | - //去详情 | ||
| 367 | - this.$router.push({ | ||
| 368 | - path: "/testAnalysis", | ||
| 369 | - query: { | ||
| 370 | - ids: ids.join(), | ||
| 371 | - classId: this.query.classId[0], | ||
| 372 | - type: subjectArr.length == 1 ? 2 : 3, | ||
| 373 | - subjectName: subjectArr.join(), | ||
| 374 | - params: this.$route.query.params, | ||
| 375 | - }, | ||
| 376 | - }); | ||
| 377 | - } | ||
| 378 | } | 363 | } |
| 379 | }, | 364 | }, |
| 380 | // 多班对比 | 365 | // 多班对比 |
| @@ -497,14 +482,13 @@ export default { | @@ -497,14 +482,13 @@ export default { | ||
| 497 | this.total = data?.count || 0; | 482 | this.total = data?.count || 0; |
| 498 | } else { | 483 | } else { |
| 499 | this.isMultipleClass = true; | 484 | this.isMultipleClass = true; |
| 500 | - this.multipleSelectionClassId = []; | 485 | + let classArr = []; |
| 501 | data?.list?.map((item) => { | 486 | data?.list?.map((item) => { |
| 502 | - if (!this.multipleSelectionClassId.includes(item.classId)) { | ||
| 503 | - this.multipleSelectionClassId.push(item.classId); | 487 | + if (!classArr.includes(item.classId)) { |
| 488 | + classArr.push(item.classId); | ||
| 504 | } | 489 | } |
| 505 | }); | 490 | }); |
| 506 | - | ||
| 507 | - if (this.multipleSelectionClassId.length > 1) { | 491 | + if (classArr.length > 1) { |
| 508 | //多班级 | 492 | //多班级 |
| 509 | let tableObj = {}; | 493 | let tableObj = {}; |
| 510 | data?.list?.map((item) => { | 494 | data?.list?.map((item) => { |