Commit 45b98e8edfa5ca87da01cd3128a9a3ac4b932a5c

Authored by LH_PC
1 parent 574f1a90

fix:修复年级组长打印,班主任最高分逻辑变更

.gitignore
@@ -26,3 +26,4 @@ pnpm-debug.log* @@ -26,3 +26,4 @@ pnpm-debug.log*
26 *.sln 26 *.sln
27 *.sw? 27 *.sw?
28 src/views/portrait/test.vue 28 src/views/portrait/test.vue
  29 +/src/.vs
src/config/index.js
1 const modeUrl = { 1 const modeUrl = {
2 // 开发环境 2 // 开发环境
3 development: { 3 development: {
4 - baseURL: "/api/", 4 + baseURL: "/",
5 authBaseURL: "", 5 authBaseURL: "",
6 $cdn:"" 6 $cdn:""
7 }, 7 },
8 // 生产环境 8 // 生产环境
9 production: { 9 production: {
10 - baseURL: "/api/", 10 + baseURL: "/",
11 authBaseURL: "", 11 authBaseURL: "",
12 $cdn:"" 12 $cdn:""
13 }, 13 },
src/utils/index.js
@@ -860,21 +860,24 @@ export function tablePrint(options) { @@ -860,21 +860,24 @@ export function tablePrint(options) {
860 var diffNumber = options.diffNumber ?? 0; 860 var diffNumber = options.diffNumber ?? 0;
861 var diffStNumber = options.diffStNumber ?? 0; 861 var diffStNumber = options.diffStNumber ?? 0;
862 let divs = document.getElementById(id); 862 let divs = document.getElementById(id);
863 - let awin = window.open("", "_blank"); 863 + let awin = window.open("中天易教", "_blank");
864 awin.document.getElementsByTagName( 864 awin.document.getElementsByTagName(
865 "head" 865 "head"
866 )[0].innerHTML = `<style> 866 )[0].innerHTML = `<style>
867 @media print { 867 @media print {
868 @page { 868 @page {
869 size: A4 portrait; 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 * :not(.tit) { 883 * :not(.tit) {
@@ -1262,8 +1265,13 @@ export function tablePrint(options) { @@ -1262,8 +1265,13 @@ export function tablePrint(options) {
1262 awin.document.body.append(pTit) 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 awin.print(); 1275 awin.print();
1268 1276
1269 awin.close() 1277 awin.close()
src/views/basic/askTestQuestion/components/testBzrMulti.vue
@@ -291,8 +291,7 @@ export default { @@ -291,8 +291,7 @@ export default {
291 max = score > max ? score : max; 291 max = score > max ? score : max;
292 return item.subjectName; 292 return item.subjectName;
293 }); 293 });
294 - max += 10;  
295 - max = max > 150 ? 150 : max; 294 + max += 10;
296 this.radarChart = { 295 this.radarChart = {
297 indicator: [ 296 indicator: [
298 { 297 {
src/views/basic/askTestQuestion/detail.vue
@@ -751,12 +751,10 @@ export default { @@ -751,12 +751,10 @@ export default {
751 this.types = this.types.filter(fl => { return fl.dataType == this.dataType }); 751 this.types = this.types.filter(fl => { return fl.dataType == this.dataType });
752 752
753 this.currentType = this.types[0]?.name ?? "" 753 this.currentType = this.types[0]?.name ?? ""
754 -  
755 - await this._changeType();  
756 -  
757 - await this._queryDefaultLevels();  
758 - 754 + await this._queryDefaultLevels();
759 await this._examDetail(); 755 await this._examDetail();
  756 + await this._changeType();
  757 +
760 }, 758 },
761 data() { 759 data() {
762 return { 760 return {
@@ -1011,9 +1009,9 @@ export default { @@ -1011,9 +1009,9 @@ export default {
1011 if (status != 0) { 1009 if (status != 0) {
1012 this.$message.error(info); 1010 this.$message.error(info);
1013 return; 1011 return;
1014 - }  
1015 - 1012 + }
1016 this.examReport = { ...data }; 1013 this.examReport = { ...data };
  1014 + this.examPaperScore = this.examReport.examPaperScore;
1017 } 1015 }
1018 }, 1016 },
1019 async _reScore() { 1017 async _reScore() {
src/views/basic/askTestQuestion/gradeAnalysisDetail.vue
@@ -202,7 +202,7 @@ @@ -202,7 +202,7 @@
202 <div style="height: 1px;overflow: hidden;"> 202 <div style="height: 1px;overflow: hidden;">
203 <div id="test-print"> 203 <div id="test-print">
204 <div v-for="(testTranscript, index) in testTranscriptDatas"> 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 <el-row class="row-subfix" :key="index" v-for="(item, index) in testTranscript.titleInfo || []"> 206 <el-row class="row-subfix" :key="index" v-for="(item, index) in testTranscript.titleInfo || []">
207 <div class="row-line"> 207 <div class="row-line">
208 <span class="line-subfix">班级:</span> 208 <span class="line-subfix">班级:</span>
@@ -695,7 +695,7 @@ export default { @@ -695,7 +695,7 @@ export default {
695 } 695 }
696 696
697 this.examReport = { ...data }; 697 this.examReport = { ...data };
698 - 698 + this.examPaperScore = this.examReport.examPaperScore;
699 }, 699 },
700 async _anys() { 700 async _anys() {
701 this.queryLoading = true; 701 this.queryLoading = true;
src/views/basic/setUp/PersonalStudent.vue
@@ -585,7 +585,8 @@ export default { @@ -585,7 +585,8 @@ export default {
585 } 585 }
586 .p1 { 586 .p1 {
587 color: #7f7f7f; 587 color: #7f7f7f;
588 - line-height: 20px; 588 + line-height: 20px;
  589 + overflow-wrap: anywhere;
589 padding-bottom: 5px; 590 padding-bottom: 5px;
590 } 591 }
591 } 592 }
src/views/basic/setUp/student.vue
@@ -1000,6 +1000,7 @@ export default { @@ -1000,6 +1000,7 @@ export default {
1000 color: #7f7f7f; 1000 color: #7f7f7f;
1001 line-height: 20px; 1001 line-height: 20px;
1002 padding-bottom: 5px; 1002 padding-bottom: 5px;
  1003 + overflow-wrap:anywhere;
1003 } 1004 }
1004 1005
1005 .p2 { 1006 .p2 {