Jelajahi Sumber

个人画像-历次成绩添加分数一列

吴朋磊 1 bulan lalu
induk
melakukan
23df4bc2a2

+ 4 - 4
src/views/analysisReport/personalProfile/KnowledgeTrack.vue

@@ -5,12 +5,12 @@
     <div class="map_content" v-if="examRange || knowledgeStats.length > 0">
       <!-- 考试范围说明 -->
       <div class="knowledge_stats">
-        <p class="range_text" >
+        <p class="range_text" v-if="examRange">
           <span class="dot"></span>历次考试:<span v-html="examRange" style="color:#333333;font-weight:600;"></span>
         </p>
-        <p class="stats_text" v-for="(item, index) in knowledgeStats" :key="index">
-          <span class="dot"></span> <span v-html="item"></span>
-        </p>
+          <p class="stats_text" v-for="(item, index) in knowledgeStats" :key="index">
+            <span class="dot"></span> <span v-html="item"></span>
+          </p>
       </div>
     </div>
 

+ 109 - 6
src/views/analysisReport/personalProfile/MyGradeHistory.vue

@@ -8,7 +8,7 @@
       </el-button> -->
     </div>
 
-    <div class="content" v-if="gradeHistoryData.length > 0">
+    <div class="content" v-if="gradeHistoryData && (Array.isArray(gradeHistoryData) ? gradeHistoryData.length > 0 : (gradeHistoryData.records && gradeHistoryData.records.length > 0))">
       <el-table ref="gradeTable" :data="tableData" style="width: 100%" border :header-cell-style="headerCellStyle"
         :cell-style="cellStyle" stripe @selection-change="handleSelectionChange" width="55" align="center">
         <el-table-column type="selection" width="55" align="center"></el-table-column>
@@ -19,7 +19,21 @@
         </el-table-column>
         <el-table-column prop="examName" label="考试名称" align="center"></el-table-column>
         <!-- <el-table-column prop="fullScore" label="满分" width="90" align="center"></el-table-column> -->
-        <el-table-column prop="rawScore" label="原始分" width="90" align="center"></el-table-column>
+        <!-- <el-table-column prop="rawScore" label="原始分" width="90" align="center"></el-table-column> -->
+        <el-table-column prop="displayName" :label="displayTypeLabel" width="90" align="center">
+          <template slot-scope="scope">
+            <template v-if="scope.row.displayType === 0 || scope.row.displayType === 2">
+              {{ scope.row.displayName }}
+            </template>
+            <template v-else-if="scope.row.displayType === 1">
+              <span v-if="scope.row.correctType === 0">错</span>
+              <span v-else-if="scope.row.correctType === 1">半对</span>
+              <span v-else-if="scope.row.correctType === 2">全对</span>
+              <span v-else>-</span>
+            </template>
+            <template v-else>-</template>
+          </template>
+        </el-table-column>
         <!-- <el-table-column prop="classRank" label="班级排名" width="90" align="center"></el-table-column>
         <el-table-column prop="gradeRank" label="年级排名" width="90" align="center"></el-table-column> -->
         <!-- <el-table-column prop="standardScore" label="标准分" width="90" align="center"></el-table-column> -->
@@ -35,6 +49,18 @@
         </el-table-column>
       </el-table>
 
+      <!-- 分页器 -->
+      <div class="pagination">
+        <el-pagination
+          background
+          layout="prev, pager, next, total"
+          :total="total"
+          :page-size="pageSize"
+          :current-page="currentPage"
+          @current-change="handleCurrentChange"
+        />
+      </div>
+
     </div>
 
     <!-- 暂无数据 -->
@@ -73,8 +99,8 @@ export default {
     },
     // 接收历次成绩数据
     gradeHistoryData: {
-      type: Array,
-      default: () => []
+      type: [Array, Object],
+      default: () => {}
     },
     // 接收个人画像数据
     portraitData: {
@@ -96,13 +122,28 @@ export default {
       benchTaskTitle: '历次考试对比',
       // 是否正在初始化全选
       isInitializing: false,
+      // 分页相关数据
+      currentPage: 1,
+      pageSize: 10,
+      total: 0,
     };
   },
   watch: {
     // 监听gradeHistoryData变化,数据加载完成后默认全选
     gradeHistoryData: {
       handler(newVal) {
-        if (newVal && newVal.length > 0) {
+        // 检查数据是否有效
+        const hasData = newVal && (Array.isArray(newVal) ? newVal.length > 0 : (newVal.records && newVal.records.length > 0));
+        
+        if (hasData) {
+          // 如果gradeHistoryData是一个对象,可能包含total属性
+          if (typeof newVal === 'object' && newVal.total !== undefined) {
+            this.total = Number(newVal.total);
+          } else if (Array.isArray(newVal) && this.$parent && this.$parent.gradeHistoryData && this.$parent.gradeHistoryData.total !== undefined) {
+            // 尝试从父组件获取total值
+            this.total = Number(this.$parent.gradeHistoryData.total);
+          }
+          
           this.$nextTick(() => {
             if (this.$refs.gradeTable) {
               // 设置初始化标志,避免触发selection-change事件
@@ -139,7 +180,8 @@ export default {
     }, //分析报告公共参数变量
     // 处理数据,映射接口字段到表格字段
     tableData() {
-      return this.gradeHistoryData.map(item => ({
+      const records = Array.isArray(this.gradeHistoryData) ? this.gradeHistoryData : (this.gradeHistoryData.records || []);
+      return records.map(item => ({
         id: item.id || Math.random(),
         examName: item.examName || '',
         fullScore: item.fullScore,
@@ -150,6 +192,9 @@ export default {
         scoreRate: item.scoreRate,
         examId: item.examId, //考试id
         subjectId: item.subjectId, //科目id
+        displayType: item.displayType, //使用字段显示类型 0-分数 1-对错 2-等级
+        displayName: item.displayName || '', //使用字段显示值
+        correctType: item.correctType, //使用字段显示对错的时候 0-错 1-半对 2-全对
       }));
     },
     // 表头样式
@@ -173,6 +218,23 @@ export default {
         lineHeight: '50px'
       };
     },
+    // 根据displayType获取表头标签
+    displayTypeLabel() {
+      // 获取第一个数据行的displayType
+      const firstRow = this.tableData[0];
+      if (!firstRow) return '';
+      
+      switch (firstRow.displayType) {
+        case 0:
+          return '分数';
+        case 1:
+          return '对错';
+        case 2:
+          return '等级';
+        default:
+          return '';
+      }
+    },
   },
   methods: {
     // 处理选择变化
@@ -204,6 +266,12 @@ export default {
       this.showStudentPaperDialog = true
       // 实际项目中可以跳转到详情页面或展开详情
     },
+    // 处理分页变化
+    handleCurrentChange(val) {
+      this.currentPage = val;
+      // 触发父组件的分页事件,以便重新获取数据
+      this.$emit('page-change', { currentPage: val, pageSize: this.pageSize });
+    },
   }
 }
 </script>
@@ -326,6 +394,41 @@ export default {
       display: flex;
       justify-content: flex-end;
       align-items: center;
+      
+      /* 分页器样式 */
+      :deep(.el-pagination) {
+        
+        /* 分页按钮通用样式 */
+        .el-pager li {
+          height: 32px;
+          line-height: 32px;
+          border-radius: 4px;
+          margin: 0 5px;
+          
+          /* 未选中状态 */
+          background-color: #f3f3f3;
+          color: #606266;
+          
+          /* 选中状态 */
+          &.active {
+            background-color: #2e64fa;
+            color: #ffffff;
+          }
+        }
+        
+        /* 上一页/下一页按钮 */
+        .btn-prev, .btn-next {
+          height: 32px;
+          line-height: 32px;
+          border-radius: 4px;
+          background-color: #f3f3f3;
+          color: #606266;
+          
+          &:hover {
+            background-color: #e6e8eb;
+          }
+        }
+      }
     }
   }
 

+ 92 - 97
src/views/analysisReport/personalProfile/index.vue

@@ -1,58 +1,32 @@
 <template>
     <div class="personalProfile">
         <!-- 我的历次成绩子组件 -->
-        <MyGradeHistory :grade-history-data="gradeHistoryData" v-loading="historyloading" @selection-change="handleSelectionChange" />
+        <MyGradeHistory :grade-history-data="gradeHistoryData" v-loading="historyloading"
+            @selection-change="handleSelectionChange" @page-change="handlePageChange" />
 
         <!-- 历次考试知识点追踪 -->
-        <KnowledgeTrack 
-            :exam-range="knowledgeMapData.examRange" 
-            :knowledge-stats="knowledgeStats" 
-            v-loading="knowledgeloading"
-        />
+        <KnowledgeTrack :exam-range="knowledgeMapData.examRange" :knowledge-stats="knowledgeStats"
+            v-loading="knowledgeloading" />
 
         <!-- 零分知识点、高频错题知识点 -->
-        <zeroScoreKnowledge 
-            ref="knowledgeGraphRef" 
-            @knowledge-item-click="handleKnowledgeItemClick"
-            :active-view="activeView" 
-            @view-change="activeView = $event" 
-            :subject-name="portraitData.subjectName"
-            :subject-score-rate="subjectScoreRate" 
-            :table-data="treeData" 
-            :fatal-vulnerability="fatalVulnerability"
-            :high-vulnerability="highVulnerability" 
-            :all-knowledge-list="allKnowledgeList"
-            @activeTabChange="handleActiveTabChange" 
-            @legend-change="handleLegendChange"
-            v-loading="zeroloading"
-        />
+        <zeroScoreKnowledge ref="knowledgeGraphRef" @knowledge-item-click="handleKnowledgeItemClick"
+            :active-view="activeView" @view-change="activeView = $event" :subject-name="portraitData.subjectName"
+            :subject-score-rate="subjectScoreRate" :table-data="treeData" :fatal-vulnerability="fatalVulnerability"
+            :high-vulnerability="highVulnerability" :all-knowledge-list="allKnowledgeList"
+            @activeTabChange="handleActiveTabChange" @legend-change="handleLegendChange" v-loading="zeroloading" />
 
         <!-- 历次变化 -->
-        <HistoricalChangeChart 
-            ref="historicalChangeChartRef"
-            :personalList="historicalChangeData.personalList"
-            :classList="historicalChangeData.classList" 
-            :gradeList="historicalChangeData.gradeList"
-            :examName="historicalChangeData.examName" 
-            :knowledgeName="knowledgeName" 
-            v-loading="historicalChangeLoading"
-        />
+        <HistoricalChangeChart ref="historicalChangeChartRef" :personalList="historicalChangeData.personalList"
+            :classList="historicalChangeData.classList" :gradeList="historicalChangeData.gradeList"
+            :examName="historicalChangeData.examName" :knowledgeName="knowledgeName"
+            v-loading="historicalChangeLoading" />
         <!-- 薄弱知识点精准提升 -->
-         <knowledgePaps
-            :knowledgeName="knowledgeName"
-            v-loading="knowledgePapsLoading"
-            :knowledgData="knowledgData"
-            @export-knowledge-paps="exportKnowledgePaps"
-        />
+        <knowledgePaps :knowledgeName="knowledgeName" v-loading="knowledgePapsLoading" :knowledgData="knowledgData"
+            @export-knowledge-paps="exportKnowledgePaps" />
         <!-- 下载试题 -->
-        <Download 
-            ref="downloadRef" 
-            :visible.sync="visible"
-            :examId="portraitData.examId" 
-            :subjectCode="portraitData.subjectCode" 
-            :knowledgeId="knowledgeId" 
-        />
-        
+        <Download ref="downloadRef" :visible.sync="visible" :examId="portraitData.examId"
+            :subjectCode="portraitData.subjectCode" :knowledgeId="knowledgeId" />
+
     </div>
 </template>
 <script>
@@ -81,7 +55,7 @@ export default {
         knowledgeStats() {
             const stats = [];
             const prefix = ''; // 定义prefix变量
-            
+
             // 当有知识点数据时,生成统计文本
             if (this.knowledgeMapData.konwLenght > 0 || this.knowledgeMapData.knowledgeList) {
                 // 获取得分率变化的文本部分
@@ -90,17 +64,16 @@ export default {
                 const hasDrop = this.knowledgeMapData.dropKnowledgeList;   // 下降部分
                 const hasKnowledgeList = this.knowledgeMapData.knowledgeList; // 知识点列表
                 const knowledgeNum = this.knowledgeMapData.konwLenght; // 知识点数量
-                
                 // 基础文本:包含的知识点数量
                 if (knowledgeNum > 0) {
                     changeText += `共包含<span style='color:#2E64FA'>${knowledgeNum}</span>个知识点`;
                 }
-                
+
                 // 添加知识点列表(可选)
-                if (hasKnowledgeList) {
-                    changeText += `,包括<span style="color:#333333;font-weight:600;">${this.knowledgeMapData.knowledgeList}</span>`;
+                if (hasKnowledgeList && hasKnowledgeList.length > 0) {
+                    changeText += `,共有<span style="color:#2E64FA">${this.knowledgeMapData.repeatKnowledgeNum}</span>个知识点重复出现`;
                 }
-                
+
                 // 当repeatKnowledgeNum大于0时,添加得分率变化信息
                 if (this.knowledgeMapData.repeatKnowledgeNum > 0) {
                     // 只有当raiseKnowledgeList不为空时,添加得分率提升的部分
@@ -123,11 +96,13 @@ export default {
                         // 如果只有提升,添加句号
                         changeText += `。`;
                     }
-                } else {
+                } else if(this.knowledgeMapData.repeatKnowledgeNum === 0){
                     // 如果repeatKnowledgeNum为0,添加完整句号
+                    changeText += ``;
+                }else{
                     changeText += `。`;
                 }
-                
+
                 // 确保始终返回数组
                 if (changeText) {
                     stats.push(changeText);
@@ -136,7 +111,7 @@ export default {
                 // 如果只有考试范围数据,添加说明文本
                 stats.push(`本次考试涵盖<span style="color:#333333;font-weight:600;">${this.knowledgeMapData.knowledgeList}</span>,暂无详细知识点追踪数据。`);
             }
-            
+
             return stats;
         },
 
@@ -207,28 +182,34 @@ export default {
     },
     methods: {
         // 我的历次成绩---年级画像
-        MyGradeHistoryData() {
+        MyGradeHistoryData(currentPage = 1, pageSize = 10) {
             // 加载状态-清空数据
             this.historyloading = true;
             // 历次考试知识点追踪-加载状态
-            this.knowledgeloading = true;
+             this.knowledgeloading = true;
             // 零分知识点、高频错题知识点-加载状态
-            this.zeroloading = true;
+             this.zeroloading = true;
              // 薄弱知识点精准提升-加载状态
              this.knowledgePapsLoading = true;
             // 历次变化图表-加载状态
             this.historicalChangeLoading = true;
-            this.gradeHistoryData = [];
+            this.gradeHistoryData = { records: [], total: 0 };
             let examParams = {
                 examId: this.portraitData.examId,
                 subjectCode: this.portraitData.subjectCode,
+                page: currentPage,
+                size: pageSize,
             };
             this.$api.personalProfile.examScoreList(examParams).then(res => {
                 if (res.code === 200) {
-                    let data = res.data || [];
+                    let data = res.data || {};
                     if (data) {
-                        this.gradeHistoryData = res.data.records || [];
-                        let examIds = this.gradeHistoryData.map(item => item.examId || '');
+                        // 确保total是数字类型
+                        if (data.total !== undefined) {
+                            data.total = Number(data.total);
+                        }
+                        this.gradeHistoryData = data;
+                        let examIds = (data.records || []).map(item => item.examId || '');
                         this.portraitData.examIds = examIds;
                         // 加载状态
                         this.historyloading = false;
@@ -237,7 +218,7 @@ export default {
                         this.vulerabData();
                         // 历次考试知识点追踪
                         this.previousExamsData();
-                    }else{
+                    } else {
                         // 加载状态
                         // 历次考试知识点追踪-加载状态
                         this.knowledgeloading = false;
@@ -246,14 +227,22 @@ export default {
                         // 薄弱知识点精准提升-加载状态
                         this.knowledgePapsLoading = false;
                         // 历次变化图表-加载状态
-                        this.historicalChangeLoading = false;    
+                        this.historicalChangeLoading = false;
                         this.historyloading = false;
-                        this.gradeHistoryData = [];
+                        this.gradeHistoryData = { records: [], total: 0 };
                     }
-                }else{
+                } else {
                     // 加载状态
                     this.historyloading = false;
-                    this.gradeHistoryData = [];
+                    // 历次考试知识点追踪-加载状态
+                    this.knowledgeloading = false;
+                    // 零分知识点、高频错题知识点-加载状态
+                    this.zeroloading = false;
+                    // 薄弱知识点精准提升-加载状态
+                    this.knowledgePapsLoading = false;
+                    // 历次变化图表-加载状态
+                    this.historicalChangeLoading = false;
+                    this.gradeHistoryData = { records: [], total: 0 };
                 }
             })
         },
@@ -265,6 +254,12 @@ export default {
             // 零分知识点、高频错题知识点(会自动调用 KnowledgeTrackData 和 pushQuestionData)
             this.vulerabData();
         },
+        // 处理分页变化
+        handlePageChange(pageInfo) {
+            const { currentPage, pageSize } = pageInfo;
+            // 重新调用接口获取对应页码的数据
+            this.MyGradeHistoryData(currentPage, pageSize);
+        },
         //历次考试知识点追踪
         previousExamsData() {
             // 加载状态-清空数据
@@ -305,7 +300,7 @@ export default {
                         if (data.dropKnowledgeList) {
                             this.knowledgeMapData.dropKnowledgeList = data.dropKnowledgeList.join('、') || '';
                         }
-                    }else{
+                    } else {
                         // 加载状态
                         this.knowledgeloading = false;
                         this.knowledgeMapData = {
@@ -317,7 +312,7 @@ export default {
                             dropKnowledgeList: [],//下降知识点 
                         };
                     }
-                }else{
+                } else {
                     // 加载状态
                     this.knowledgeloading = false;
                     this.knowledgeMapData = {
@@ -365,7 +360,7 @@ export default {
 
                         // 新增:调用studentKnowledgeDataTree API获取treeData
                         this.getStudentKnowledgeDataTree();
-                        
+
                         // 获取知识点第一条数据id 全部>高频错题>零分知识点
                         if (this.allKnowledgeList.length > 0) {
                             this.knowledgeName = this.allKnowledgeList[0].knowledgeName || '';
@@ -374,7 +369,7 @@ export default {
                             if (this.highVulnerability.length > 0) {
                                 this.knowledgeName = this.highVulnerability[0].knowledgeName || '';
                                 this.knowledgeId = this.highVulnerability[0].knowledgeId || 0;
-                            }else if (this.fatalVulnerability.length > 0) {
+                            } else if (this.fatalVulnerability.length > 0) {
                                 this.knowledgeName = this.fatalVulnerability[0].knowledgeName || '';
                                 this.knowledgeId = this.fatalVulnerability[0].knowledgeId || 0;
                             } else {
@@ -382,12 +377,12 @@ export default {
                                 this.knowledgeId = '';
                             }
                         }
-                        
+
                         // 首次加载默认获取知识点
                         this.KnowledgeTrackData();
                         // 加载推送试题
                         this.pushQuestionData();
-                    }else{
+                    } else {
                         this.treeData = [];
                         this.subjectScoreRate = 0; //科目得分率
                         this.fatalVulnerability = []; // 零分知识点数据
@@ -411,7 +406,7 @@ export default {
                             }
                         });
                     }
-                }else{
+                } else {
                     this.treeData = [];
                     this.subjectScoreRate = 0; //科目得分率
                     this.fatalVulnerability = []; // 零分知识点数据
@@ -428,7 +423,7 @@ export default {
                 }
             })
         },
-        
+
         // 新增:获取知识点树状图数据
         getStudentKnowledgeDataTree(knowledgeType = 0, scoreRateTypes = null) {
             this.treeData = [];
@@ -440,14 +435,14 @@ export default {
                 scoreRateTypes: scoreRateTypes, // 得分率类型 1薄弱 2良好 3优秀(精准提升),为空是全部
                 knowledgeType: knowledgeType // 知识点类型 0全部 1高频错题知识点 2零分知识点(精准提升)
             };
-            
+
             this.$api.personalProfile.studentKnowledgeDataTree(params).then(res => {
                 if (res.code === 200) {
                     let data = res.data;
                     if (data) {
                         // 从新API获取treeData
                         this.treeData = data || [];
-                        
+
                         // 接口调用成功后,刷新图表
                         this.$nextTick(() => {
                             if (this.$refs.knowledgeGraphRef) {
@@ -474,7 +469,7 @@ export default {
                 }
             });
         },
-        
+
         // 处理图例变化事件
         handleLegendChange(data) {
             // 调用getStudentKnowledgeDataTree方法,传递knowledgeType和scoreRateTypes
@@ -534,7 +529,7 @@ export default {
                         gradeList: gradeList,
                         examName: examNames,
                     };
-                    
+
                     this.$nextTick(() => {
                         if (this.$refs.historicalChangeChartRef) {
                             this.$refs.historicalChangeChartRef.initChart();
@@ -565,7 +560,7 @@ export default {
         },
 
         // 推题列表
-        pushQuestionData(){
+        pushQuestionData() {
             this.knowledgData = [];
             let params = {
                 examId: this.portraitData.examId, //当前考试id
@@ -574,23 +569,23 @@ export default {
             };
             this.$api.personalProfile.pushQuestionList(params).then(res => {
                 if (res.code === 200) {
-                    let data = res.data ;
+                    let data = res.data;
                     if (data) {
                         // 加载状态-清空数据
                         this.knowledgePapsLoading = false;
-                         // 更新推题列表数据
+                        // 更新推题列表数据
                         this.knowledgData = data || [];
-                    }else{
+                    } else {
                         // 加载状态-清空数据
                         this.knowledgePapsLoading = false;
-                         // 更新推题列表数据
-                        this.knowledgData =  [];
+                        // 更新推题列表数据
+                        this.knowledgData = [];
                     }
                 } else {
-                   // 加载状态-清空数据
+                    // 加载状态-清空数据
                     this.knowledgePapsLoading = false;
                     // 更新推题列表数据
-                    this.knowledgData =  [];
+                    this.knowledgData = [];
                 }
             });
         },
@@ -598,8 +593,8 @@ export default {
         // 知识点列表点击事件
         handleKnowledgeItemClick(data) {
             // 点击知识点后,更新图表数据
-            this.knowledgeId = data.item.knowledgeId ;
-            this.knowledgeName = data.item.knowledgeName ;
+            this.knowledgeId = data.item.knowledgeId;
+            this.knowledgeName = data.item.knowledgeName;
             // 点击知识点后,更新历次变化
             this.KnowledgeTrackData();
             // 点击知识点后,更新推题列表
@@ -612,12 +607,12 @@ export default {
             // zero 零分
             // all 所有知识点
             let knowledgeType = 0;
-            
+
             if (tab === 'highFreq') {
                 // 高频知识点
                 knowledgeType = 1;
-                if(this.highVulnerability.length > 0) {
-                    this.knowledgeId = this.highVulnerability[0].knowledgeId ;
+                if (this.highVulnerability.length > 0) {
+                    this.knowledgeId = this.highVulnerability[0].knowledgeId;
                     this.knowledgeName = this.highVulnerability[0].knowledgeName;
                 } else {
                     this.knowledgeId = '';
@@ -626,7 +621,7 @@ export default {
             } else if (tab === 'zero') {
                 // 零分知识点
                 knowledgeType = 2;
-                if(this.fatalVulnerability.length > 0) {
+                if (this.fatalVulnerability.length > 0) {
                     this.knowledgeId = this.fatalVulnerability[0].knowledgeId || 0;
                     this.knowledgeName = this.fatalVulnerability[0].knowledgeName || '';
                 } else {
@@ -636,7 +631,7 @@ export default {
             } else if (tab === 'all') {
                 // 所有知识点
                 knowledgeType = 0;
-                if(this.allKnowledgeList.length > 0) {
+                if (this.allKnowledgeList.length > 0) {
                     this.knowledgeId = this.allKnowledgeList[0].knowledgeId || 0;
                     this.knowledgeName = this.allKnowledgeList[0].knowledgeName || '';
                 } else {
@@ -644,7 +639,7 @@ export default {
                     this.knowledgeName = '';
                 }
             }
-            
+
             // 重置图例状态:让三个图例恢复成原先的模样
             if (this.$refs.knowledgeGraphRef) {
                 this.$refs.knowledgeGraphRef.selectedLegend = {
@@ -659,11 +654,11 @@ export default {
                     }
                 });
             }
-            
+
             // 根据tab切换调用新API,传递对应的knowledgeType和重置后的scoreRateTypes=null
             this.getStudentKnowledgeDataTree(knowledgeType, null);
-            
-            if(!this.knowledgeId){
+
+            if (!this.knowledgeId) {
                 this.historicalChangeData = {
                     personalList: [],
                     classList: [],
@@ -685,7 +680,7 @@ export default {
 
         // 导出精准提升试题
         exportKnowledgePaps() {
-            if(this.knowledgData.length === 0){
+            if (this.knowledgData.length === 0) {
                 this.$message.warning('暂无知识点推题');
                 return
             }

+ 1 - 1
src/views/analysisReport/studentPage/mainPage.vue

@@ -39,7 +39,7 @@
 
                                 <button v-if="isShowKnowledgeButtons" class="mm_btn mb_10"
                                     :class="{ active: activeBtn === pathTwo }" @click="toPage(pathTwo)">举一反三</button>
-                                <button v-if="!isTotalScore && schoolId == '612303421822734400'" class="mm_btn mb_10"
+                                <button v-if="!isTotalScore || schoolId == '612303421822734400' || isShowKnowledgeButtons" class="mm_btn mb_10"
                                     :class="{ active: activeBtn === pathThree }"
                                     @click="toPage(pathThree)">个人画像</button>
                                 <button class="mm_btn"  v-if="showOneStudOneCase" :class="{ active: activeBtn === pathFourth }"