Merge branch 'dev'

src/App.vue

@@ -18,7 +18,7 @@ export default {
     },
     methods: {
         SubmitLogin() {
-            const username = '500072347220704';
+            const username = '37605017089498';
             const password = '123456';
             // const type = '1';
             const schoolType = sessionStorage.getItem('schoolType');

src/components/StudentPaper.vue

@@ -295,6 +295,11 @@ export default {
           this.currentPaperUrl = this.paperImageList[this.currentIndex].picUrl;
           this.currentDrawData = this.paperImageList[this.currentIndex].questionVOS || [];
           this.currentDownLoadName = this.pageTitle+'答题卡第'+(this.currentIndex + 1) + '页'; // 重置下载名称
+          //兼容旧的数据
+          if(this.paperImageList[this.currentIndex].useType)
+          {
+            this.usedCardType=this.paperImageList[this.currentIndex].useType;//卡类型需要调整为从此页获取
+          }
         } else {
           // 处理边界情况
           this.currentPaperUrl = '';

src/views/analysisReport/studentPage/downloadPdf/studentReport.vue

@@ -298,7 +298,7 @@
                         <!-- 答题卡 -->
                         <template v-for="(paperItem,paperIndex) in (singleSubjectData?.[subKey]?.paperImageList || [])">
                             <div class="area_module area_module_img" v-if="singleSubjectData?.[subKey]?.paperImagePageNum?.[paperIndex] == page">
-                                <PaperImage v-if="paperItem.picUrl" :paperImgUrl="paperItem.picUrl" :usedCardType="singleSubjectData?.[subKey]?.usedCardType" :drawData="paperItem.questionVOS || []" :isDrag="false" :isWheel="false" :isShowContextMenu="false" rotateDeg="-90"></PaperImage>
+                                <PaperImage v-if="paperItem.picUrl" :paperImgUrl="paperItem.picUrl" :usedCardType="paperItem.useType" :drawData="paperItem.questionVOS || []" :isDrag="false" :isWheel="false" :isShowContextMenu="false" rotateDeg="-90"></PaperImage>
                             </div>
                         </template>
                     </template>
@@ -846,7 +846,7 @@ export default {
                     },{
                         name:'联校最高分',
                         prop:'examMaxScore',
-                        display:res?.data?.examMaxScoreStatus === 0 && this.schoolType == 2
+                        display:res?.data?.examMaxScoreStatus === 0 && this.reportParam.examLevel == 1 && this.schoolType == 2
                     },{
                         name:'班级均分',
                         prop:'classAvgScore',
@@ -858,7 +858,7 @@ export default {
                     },{
                         name:'联校均分',
                         prop:'examAvgScore',
-                        display:res?.data?.examAvgScoreStatus === 0 && this.schoolType == 2
+                        display:res?.data?.examAvgScoreStatus === 0 && this.reportParam.examLevel == 1 && this.schoolType == 2
                     }]
                     const groupClassRanks = res.data.groupClassRanks || [];
                     const groupClassMaxScoreList = res.data.groupClassMaxScoreList || [];
@@ -1083,7 +1083,7 @@ export default {
                         paperImageList[0].questionVOS.unshift(totalScore)
                     }
                     this.singleSubjectData[index].paperImageList = paperImageList;
-                    this.singleSubjectData[index].usedCardType = res?.data?.usedCardType ?? 1;
+                    // this.singleSubjectData[index].usedCardType = res?.data?.usedCardType ?? 1;
                     for(let i = 0;i<paperImageList.length;i++){
                         const pageNum = this.SingleChartPage(this.printPageHeight);
                         this.singleSubjectData[index].paperImagePageNum.push(pageNum);

src/views/analysisReport/studentPage/list/mainPage.vue

@@ -402,7 +402,7 @@ export default {
       let subjectList = [];
       examSubjectVoList.forEach((item) => {
         let subjectItem = {
-          label: item.subjectName,
+          label: item.subjectNotes || item.subjectName,
           value: item.subjectCode,
           examLevel: examItem?.examData?.examLevel ?? '',//1-联考 2-单校
           contrastExamIds: examItem?.historyExamIds ?? [],//多次考试任务对比ID，不包含当前任务ID	

src/views/analysisReport/studentPage/scrolReport/transcript_single.vue

@@ -105,7 +105,7 @@
               <span class="title">年级最高分</span>
               <span class="value">{{ subjectData?.data?.gradeMaxScore ?? '-' }}</span>
             </div>
-            <div class="score_item" v-if="subjectData?.data?.examMaxScoreStatus === 0 && schoolType == 2">
+            <div class="score_item" v-if="subjectData?.data?.examMaxScoreStatus === 0 && reportParam.examLevel == 1 && schoolType == 2">
               <span class="title">联校最高分</span>
               <span class="value">{{ subjectData?.data?.examMaxScore ?? '-' }}</span>
             </div>
@@ -117,7 +117,7 @@
               <span class="title">年级均分</span>
               <span class="value">{{ subjectData?.data?.gradeAvgScore ?? '-' }}</span>
             </div>
-            <div class="score_item" v-if="subjectData?.data?.examAvgScoreStatus === 0 && schoolType == 2">
+            <div class="score_item" v-if="subjectData?.data?.examAvgScoreStatus === 0 && reportParam.examLevel == 1 && schoolType == 2">
               <span class="title">联校均分</span>
               <span class="value">{{ subjectData?.data?.examAvgScore ?? '-' }}</span>
             </div>
@@ -164,7 +164,7 @@
       <div class="module_table">
         <div class="answer_sheet" v-if="answerCard.paperImageList.length">
           <div class="item" v-for="(item, index) in answerCard.paperImageList">
-            <PaperImage :imageIndex="index" v-if="item.picUrl" :scoreFontSize="20" :rtOrWrSize="10" :paperImgUrl="item.picUrl" :drawData="item.questionVOS || []"></PaperImage>
+            <PaperImage :imageIndex="index" v-if="item.picUrl" :scoreFontSize="20" :rtOrWrSize="10" :paperImgUrl="item.picUrl" :usedCardType="item.useType" :drawData="item.questionVOS || []"></PaperImage>
             <div class="item_hover">
               <div class="show_view" @click="OpenStudentPaper(index)">
                 <img src="@/assets/icon/pic_show_view.png" />

src/views/analysisReport/wrongQuestion/index.vue

@@ -178,7 +178,7 @@
                                     <template v-if="picUrl && questionVOS">
                                         <div style="height: 300px;">
                                             <PaperImage :imageIndex="index" :scoreFontSize="20" :rtOrWrSize="10"
-                                                :paperImgUrl="picUrl" :drawData="questionVOS" />
+                                                :paperImgUrl="picUrl" :usedCardType="usedCardType" :drawData="questionVOS" />
                                         </div>
                                     </template>
                                     <div v-else style="color: #999;">暂无数据</div>
@@ -290,6 +290,7 @@ export default {
             downloadDialogVisible: false,
             isVariation: 0,
             picUrl: null,
+            usedCardType: null,
             questionVOS: [],
 
         };
@@ -400,6 +401,7 @@ export default {
 
                             const data = res.data.pageVOS[0]
                             this.picUrl = data.picUrl;
+                            this.usedCardType = data.useType;
                             this.questionVOS = data.questionVOS.map(item => {
                                 return {
                                     ...item,
@@ -408,6 +410,7 @@ export default {
                             });
                         } else {
                             this.picUrl = null;
+                            this.usedCardType = null;
                             this.questionVOS = [];
                         }