From 45b98e8edfa5ca87da01cd3128a9a3ac4b932a5c Mon Sep 17 00:00:00 2001
From: LH_PC <2604481917@qq.com>
Date: Mon, 4 Nov 2024 15:18:34 +0800
Subject: [PATCH] fix:修复年级组长打印，班主任最高分逻辑变更

---
 .gitignore                                                  |  1 +
 src/config/index.js                                         |  4 ++--
 src/utils/index.js                                          | 24 ++++++++++++++++--------
 src/views/basic/askTestQuestion/components/testBzrMulti.vue |  3 +--
 src/views/basic/askTestQuestion/detail.vue                  | 12 +++++-------
 src/views/basic/askTestQuestion/gradeAnalysisDetail.vue     |  4 ++--
 src/views/basic/setUp/PersonalStudent.vue                   |  3 ++-
 src/views/basic/setUp/student.vue                           |  1 +
 8 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/.gitignore b/.gitignore
index db80b7f..b2b4689 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@ pnpm-debug.log*
 *.sln
 *.sw?
 src/views/portrait/test.vue
+/src/.vs
diff --git a/src/config/index.js b/src/config/index.js
index a29c918..f0cc3f5 100644
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -1,13 +1,13 @@
 const modeUrl = {
   // 开发环境
   development: {
-    baseURL: "/api/",
+    baseURL: "/",
     authBaseURL: "",
     $cdn:""
   },
   // 生产环境
   production: {
-    baseURL: "/api/",
+    baseURL: "/",
     authBaseURL: "",
     $cdn:""
   },
diff --git a/src/utils/index.js b/src/utils/index.js
index 285e70a..36d24c3 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -860,21 +860,24 @@ export function tablePrint(options) {
   var diffNumber = options.diffNumber ?? 0;
   var diffStNumber = options.diffStNumber ?? 0;
   let divs = document.getElementById(id);
-  let awin = window.open("", "_blank");
+  let awin = window.open("中天易教", "_blank");
   awin.document.getElementsByTagName(
     "head"
   )[0].innerHTML = `<style>    
      @media print {
         @page {
             size: A4 portrait;
-            margin: 4mm
+            margin-top: 4mm;
+            margin-left:2mm;
+            margin-right:2mm;
         }
  
      
-     body {
-            margin: 2mm;
-            font-size: 8px;  
-      } 
+     body { 
+          margin: 2mm;
+          font-size: 8px;  
+      }
+             
     }
   
     * :not(.tit) {
@@ -1262,8 +1265,13 @@ export function tablePrint(options) {
     awin.document.body.append(pTit)
   }
 
-  awin.document.body.append(aDom);
-
+  let pagedoc = awin.document.createElement('div')
+  pagedoc.className = "page-number" 
+  awin.document.body.append(pagedoc) 
+  awin.document.body.append(aDom); 
+  
+  let pagedom =  awin.document.querySelectorAll('.page-number');
+ 
   awin.print();
 
   awin.close()
diff --git a/src/views/basic/askTestQuestion/components/testBzrMulti.vue b/src/views/basic/askTestQuestion/components/testBzrMulti.vue
index 4d587dc..9774dc7 100644
--- a/src/views/basic/askTestQuestion/components/testBzrMulti.vue
+++ b/src/views/basic/askTestQuestion/components/testBzrMulti.vue
@@ -291,8 +291,7 @@ export default {
                 max = score > max ? score : max;
                 return item.subjectName;
             });
-            max += 10;
-            max = max > 150 ? 150 : max;
+            max += 10; 
             this.radarChart = {
                 indicator: [
                     {
diff --git a/src/views/basic/askTestQuestion/detail.vue b/src/views/basic/askTestQuestion/detail.vue
index 2689270..5238339 100644
--- a/src/views/basic/askTestQuestion/detail.vue
+++ b/src/views/basic/askTestQuestion/detail.vue
@@ -751,12 +751,10 @@ export default {
         this.types = this.types.filter(fl => { return fl.dataType == this.dataType });
 
         this.currentType = this.types[0]?.name ?? ""
-
-        await this._changeType();
-
-        await this._queryDefaultLevels();
-
+        await this._queryDefaultLevels(); 
         await this._examDetail();
+        await this._changeType(); 
+        
     },
     data() {
         return {
@@ -1011,9 +1009,9 @@ export default {
                 if (status != 0) {
                     this.$message.error(info);
                     return;
-                }
-
+                } 
                 this.examReport = { ...data };
+                this.examPaperScore = this.examReport.examPaperScore;
             }
         },
         async _reScore() {
diff --git a/src/views/basic/askTestQuestion/gradeAnalysisDetail.vue b/src/views/basic/askTestQuestion/gradeAnalysisDetail.vue
index a133923..baa0aa1 100644
--- a/src/views/basic/askTestQuestion/gradeAnalysisDetail.vue
+++ b/src/views/basic/askTestQuestion/gradeAnalysisDetail.vue
@@ -202,7 +202,7 @@
             <div style="height: 1px;overflow: hidden;">
               <div id="test-print">
                 <div v-for="(testTranscript, index) in testTranscriptDatas">
-                  <div style="margin-top:20px">
+                  <div style="margin-top:20px;page-break-after: always;">
                     <el-row class="row-subfix" :key="index" v-for="(item, index) in testTranscript.titleInfo || []">
                       <div class="row-line">
                         <span class="line-subfix">班级：</span>
@@ -695,7 +695,7 @@ export default {
       }
 
       this.examReport = { ...data };
-
+      this.examPaperScore = this.examReport.examPaperScore;
     },
     async _anys() {
       this.queryLoading = true;
diff --git a/src/views/basic/setUp/PersonalStudent.vue b/src/views/basic/setUp/PersonalStudent.vue
index 4f3e7a6..0404329 100644
--- a/src/views/basic/setUp/PersonalStudent.vue
+++ b/src/views/basic/setUp/PersonalStudent.vue
@@ -585,7 +585,8 @@ export default {
         }
         .p1 {
           color: #7f7f7f;
-          line-height: 20px;
+          line-height: 20px; 
+          overflow-wrap: anywhere;
           padding-bottom: 5px;
         }
       }
diff --git a/src/views/basic/setUp/student.vue b/src/views/basic/setUp/student.vue
index 6d10425..631b44c 100644
--- a/src/views/basic/setUp/student.vue
+++ b/src/views/basic/setUp/student.vue
@@ -1000,6 +1000,7 @@ export default {
           color: #7f7f7f;
           line-height: 20px;
           padding-bottom: 5px;
+          overflow-wrap:anywhere;
         }
 
         .p2 {
--
libgit2 0.21.4