Commit 45b98e8edfa5ca87da01cd3128a9a3ac4b932a5c
1 parent
574f1a90
fix:修复年级组长打印,班主任最高分逻辑变更
Showing
8 changed files
with
30 additions
and
22 deletions
.gitignore
src/config/index.js
src/utils/index.js
... | ... | @@ -860,21 +860,24 @@ export function tablePrint(options) { |
860 | 860 | var diffNumber = options.diffNumber ?? 0; |
861 | 861 | var diffStNumber = options.diffStNumber ?? 0; |
862 | 862 | let divs = document.getElementById(id); |
863 | - let awin = window.open("", "_blank"); | |
863 | + let awin = window.open("中天易教", "_blank"); | |
864 | 864 | awin.document.getElementsByTagName( |
865 | 865 | "head" |
866 | 866 | )[0].innerHTML = `<style> |
867 | 867 | @media print { |
868 | 868 | @page { |
869 | 869 | size: A4 portrait; |
870 | - margin: 4mm | |
870 | + margin-top: 4mm; | |
871 | + margin-left:2mm; | |
872 | + margin-right:2mm; | |
871 | 873 | } |
872 | 874 | |
873 | 875 | |
874 | - body { | |
875 | - margin: 2mm; | |
876 | - font-size: 8px; | |
877 | - } | |
876 | + body { | |
877 | + margin: 2mm; | |
878 | + font-size: 8px; | |
879 | + } | |
880 | + | |
878 | 881 | } |
879 | 882 | |
880 | 883 | * :not(.tit) { |
... | ... | @@ -1262,8 +1265,13 @@ export function tablePrint(options) { |
1262 | 1265 | awin.document.body.append(pTit) |
1263 | 1266 | } |
1264 | 1267 | |
1265 | - awin.document.body.append(aDom); | |
1266 | - | |
1268 | + let pagedoc = awin.document.createElement('div') | |
1269 | + pagedoc.className = "page-number" | |
1270 | + awin.document.body.append(pagedoc) | |
1271 | + awin.document.body.append(aDom); | |
1272 | + | |
1273 | + let pagedom = awin.document.querySelectorAll('.page-number'); | |
1274 | + | |
1267 | 1275 | awin.print(); |
1268 | 1276 | |
1269 | 1277 | awin.close() | ... | ... |
src/views/basic/askTestQuestion/components/testBzrMulti.vue
src/views/basic/askTestQuestion/detail.vue
... | ... | @@ -751,12 +751,10 @@ export default { |
751 | 751 | this.types = this.types.filter(fl => { return fl.dataType == this.dataType }); |
752 | 752 | |
753 | 753 | this.currentType = this.types[0]?.name ?? "" |
754 | - | |
755 | - await this._changeType(); | |
756 | - | |
757 | - await this._queryDefaultLevels(); | |
758 | - | |
754 | + await this._queryDefaultLevels(); | |
759 | 755 | await this._examDetail(); |
756 | + await this._changeType(); | |
757 | + | |
760 | 758 | }, |
761 | 759 | data() { |
762 | 760 | return { |
... | ... | @@ -1011,9 +1009,9 @@ export default { |
1011 | 1009 | if (status != 0) { |
1012 | 1010 | this.$message.error(info); |
1013 | 1011 | return; |
1014 | - } | |
1015 | - | |
1012 | + } | |
1016 | 1013 | this.examReport = { ...data }; |
1014 | + this.examPaperScore = this.examReport.examPaperScore; | |
1017 | 1015 | } |
1018 | 1016 | }, |
1019 | 1017 | async _reScore() { | ... | ... |
src/views/basic/askTestQuestion/gradeAnalysisDetail.vue
... | ... | @@ -202,7 +202,7 @@ |
202 | 202 | <div style="height: 1px;overflow: hidden;"> |
203 | 203 | <div id="test-print"> |
204 | 204 | <div v-for="(testTranscript, index) in testTranscriptDatas"> |
205 | - <div style="margin-top:20px"> | |
205 | + <div style="margin-top:20px;page-break-after: always;"> | |
206 | 206 | <el-row class="row-subfix" :key="index" v-for="(item, index) in testTranscript.titleInfo || []"> |
207 | 207 | <div class="row-line"> |
208 | 208 | <span class="line-subfix">班级:</span> |
... | ... | @@ -695,7 +695,7 @@ export default { |
695 | 695 | } |
696 | 696 | |
697 | 697 | this.examReport = { ...data }; |
698 | - | |
698 | + this.examPaperScore = this.examReport.examPaperScore; | |
699 | 699 | }, |
700 | 700 | async _anys() { |
701 | 701 | this.queryLoading = true; | ... | ... |
src/views/basic/setUp/PersonalStudent.vue