Commit c065091a858c0e7a87ae7b8b689dec02082feb0c
1 parent
10cf4c8c
即时测跳转画像参数调整
Showing
3 changed files
with
23 additions
and
7 deletions
src/views/personal/test/index.vue
| @@ -499,7 +499,11 @@ export default { | @@ -499,7 +499,11 @@ export default { | ||
| 499 | }, | 499 | }, |
| 500 | toPortrait(obj) { | 500 | toPortrait(obj) { |
| 501 | let subjectNames = []; | 501 | let subjectNames = []; |
| 502 | - subjectNames = [...this.query["subjectNames"]]; | 502 | + subjectNames = |
| 503 | + this.role == "ROLE_BANZHUREN" | ||
| 504 | + ? [...this.query["subjectNames"]] | ||
| 505 | + : [this.query["subjectNames"]]; | ||
| 506 | + | ||
| 503 | if ( | 507 | if ( |
| 504 | this.query["subjectNames"] && | 508 | this.query["subjectNames"] && |
| 505 | this.query["subjectNames"]?.length == 1 && | 509 | this.query["subjectNames"]?.length == 1 && |
| @@ -519,6 +523,9 @@ export default { | @@ -519,6 +523,9 @@ export default { | ||
| 519 | subjectNames: subjectNames.join(","), | 523 | subjectNames: subjectNames.join(","), |
| 520 | studentName: obj.studentName, | 524 | studentName: obj.studentName, |
| 521 | studentCode: obj.studentCode, | 525 | studentCode: obj.studentCode, |
| 526 | + startDay: this.query.startDay, | ||
| 527 | + endDay: this.query.endDay, | ||
| 528 | + date: this.date, | ||
| 522 | }, | 529 | }, |
| 523 | }); | 530 | }); |
| 524 | }, | 531 | }, |
| @@ -622,7 +629,7 @@ export default { | @@ -622,7 +629,7 @@ export default { | ||
| 622 | showClose: true, | 629 | showClose: true, |
| 623 | message: `成功（${res.data.success}）`, | 630 | message: `成功（${res.data.success}）`, |
| 624 | type: "success", | 631 | type: "success", |
| 625 | - duration:5000 | 632 | + duration: 5000, |
| 626 | }); | 633 | }); |
| 627 | this.diaUp = false; | 634 | this.diaUp = false; |
| 628 | this._QueryData(); | 635 | this._QueryData(); |
| @@ -857,7 +864,7 @@ div::-webkit-scrollbar-thumb { | @@ -857,7 +864,7 @@ div::-webkit-scrollbar-thumb { | ||
| 857 | } | 864 | } |
| 858 | .click-b { | 865 | .click-b { |
| 859 | cursor: pointer; | 866 | cursor: pointer; |
| 860 | - color: #409EFF; | 867 | + color: #409eff; |
| 861 | text-decoration: underline; | 868 | text-decoration: underline; |
| 862 | } | 869 | } |
| 863 | .down { | 870 | .down { |
src/views/portrait/detail.vue
| @@ -193,6 +193,9 @@ export default { | @@ -193,6 +193,9 @@ export default { | ||
| 193 | this.classId = this.$route.query.classId; | 193 | this.classId = this.$route.query.classId; |
| 194 | this.studentCode = this.$route.query.studentCode; | 194 | this.studentCode = this.$route.query.studentCode; |
| 195 | this.studentName = this.$route.query.studentName; | 195 | this.studentName = this.$route.query.studentName; |
| 196 | + this.query.startDay = this.$route.query.startDay || ""; | ||
| 197 | + this.query.endDay = this.$route.query.endDay || ""; | ||
| 198 | + this.date = this.$route.query.date || 1; | ||
| 196 | if (this.role != "ROLE_JIAOSHI") { | 199 | if (this.role != "ROLE_JIAOSHI") { |
| 197 | this.subjectNames = | 200 | this.subjectNames = |
| 198 | (this.$route.query.subjectNames && | 201 | (this.$route.query.subjectNames && |
| @@ -202,11 +205,14 @@ export default { | @@ -202,11 +205,14 @@ export default { | ||
| 202 | this.subjectNames = this.$route.query.subjectNames; | 205 | this.subjectNames = this.$route.query.subjectNames; |
| 203 | } | 206 | } |
| 204 | await this._QuerySubjectList(); | 207 | await this._QuerySubjectList(); |
| 205 | - await this.setDate(1); | 208 | + |
| 206 | let startDay = this.query?.startDay; | 209 | let startDay = this.query?.startDay; |
| 207 | if (!startDay) { | 210 | if (!startDay) { |
| 211 | + await this.setDate(1); | ||
| 208 | this.query.startDay = new Date(); | 212 | this.query.startDay = new Date(); |
| 209 | this.query.endDay = new Date(); | 213 | this.query.endDay = new Date(); |
| 214 | + }else{ | ||
| 215 | + this._QueryData() | ||
| 210 | } | 216 | } |
| 211 | }, | 217 | }, |
| 212 | methods: { | 218 | methods: { |
src/views/standard/test/index.vue
| @@ -576,7 +576,7 @@ export default { | @@ -576,7 +576,7 @@ export default { | ||
| 576 | return; | 576 | return; |
| 577 | } | 577 | } |
| 578 | let subjectNames = []; | 578 | let subjectNames = []; |
| 579 | - subjectNames = [...this.query["subjectNames"]]; | 579 | + subjectNames = this.role == 'ROLE_BANZHUREN'?[...this.query["subjectNames"]]:[this.query["subjectNames"]]; |
| 580 | if ( | 580 | if ( |
| 581 | this.query["subjectNames"] && | 581 | this.query["subjectNames"] && |
| 582 | this.query["subjectNames"]?.length == 1 && | 582 | this.query["subjectNames"]?.length == 1 && |
| @@ -596,6 +596,9 @@ export default { | @@ -596,6 +596,9 @@ export default { | ||
| 596 | subjectNames: subjectNames.join(","), | 596 | subjectNames: subjectNames.join(","), |
| 597 | studentName: obj.studentName, | 597 | studentName: obj.studentName, |
| 598 | studentCode: obj.studentCode, | 598 | studentCode: obj.studentCode, |
| 599 | + startDay: this.query.startDay, | ||
| 600 | + endDay: this.query.endDay, | ||
| 601 | + date:this.date | ||
| 599 | }, | 602 | }, |
| 600 | }); | 603 | }); |
| 601 | }, | 604 | }, |
| @@ -700,7 +703,7 @@ export default { | @@ -700,7 +703,7 @@ export default { | ||
| 700 | showClose: true, | 703 | showClose: true, |
| 701 | message: `成功（${res.data.success}）`, | 704 | message: `成功（${res.data.success}）`, |
| 702 | type: "success", | 705 | type: "success", |
| 703 | - duration:5000 | 706 | + duration: 5000, |
| 704 | }); | 707 | }); |
| 705 | this.diaUp = false; | 708 | this.diaUp = false; |
| 706 | this._QueryData(); | 709 | this._QueryData(); |
| @@ -1001,7 +1004,7 @@ div::-webkit-scrollbar-thumb { | @@ -1001,7 +1004,7 @@ div::-webkit-scrollbar-thumb { | ||
| 1001 | } | 1004 | } |
| 1002 | .click-b { | 1005 | .click-b { |
| 1003 | cursor: pointer; | 1006 | cursor: pointer; |
| 1004 | - color: #409EFF; | 1007 | + color: #409eff; |
| 1005 | text-decoration: underline; | 1008 | text-decoration: underline; |
| 1006 | } | 1009 | } |
| 1007 | </style> | 1010 | </style> |
| 1008 | \ No newline at end of file | 1011 | \ No newline at end of file |