问题修改

src/views/analysisReport/components/dCharts/GaugeChart.vue

@@ -162,13 +162,21 @@ export default {
             offsetCenter: [0, '-25%'],
             valueAnimation: true,
             formatter: function () {
-              return _that.gradeName ?? '-';
+              const val = _that.gradeName ?? '-'
+              return '{value|' + val + '}';
+            },
+            rich: {
+              value: {
+                padding:[70, 0, 0, 0],
+                fontWeight: 'bolder',
+                fontSize: 24,
+              }
             },
             color: 'inherit'
           },
           data: [{
             value: Number(this.data),
-            name: `${this.subjectName}(总分${this.fullScore})`
+            // name: `${this.subjectName}(总分${this.fullScore})`
           }],
           endAngle: this.endAngle || 360,
           startAngle: this.startAngle || 0,

src/views/analysisReport/components/dCharts/lineChart.vue

@@ -332,8 +332,8 @@ export default {
                     // icon:'emptyCircle',//标记类型 'circle', 'rect', 'roundRect', 'triangle', 'diamond', 'pin', 'arrow', 'none'
                 },
                 grid: {
-                    left: 20,
-                    right: this.gridRight,
+                    left: 40,
+                    right: 20,
                     top: gridTop,
                     bottom:0,
                     containLabel: true, //用于控制网格区域是否包含坐标轴的标签  true 可以确保所有标签都能完整显示，不会被裁剪。

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

@@ -26,7 +26,7 @@
               {{ GxamTypeList(item.examData.examType) }}
             </div>
             <div class="exam_title">{{ item.examData.examName }}</div>
-            <div class="title_score" v-if="item.rateScoreAnalysisStatus == 1">赋分</div>
+            <div class="title_score" v-if="item.examData.rateScoreAnalysisStatus == 1">赋分</div>
             <div class="title_Level" v-if="item.examData.examLevel == 1">
               联
             </div>

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

@@ -68,7 +68,7 @@
               <span class="value">{{ subjectData?.data?.standardScore ?? '-' }}</span>
             </div>
             <div class="score_item">
-              <span class="title">等级</span>
+              <span class="title">学业等级</span>
               <span class="value">{{ subjectData?.data?.gradeName ?? '-' }}</span>
             </div>
             <div class="score_item" v-if="subjectData?.data?.scoreRateStatus === 0">
@@ -80,6 +80,14 @@
         <div class="page_jg_20"></div>
       </div>
     </div>
+    <div class="report_module" v-if="suggestionData">
+      <div class="module_title">
+        <div class="title_left">总结建议</div>
+      </div>
+      <div class="module_describe suggestion">
+        <ExpandableText :isExpanded="false" :shouldShowButton="false" v-html="suggestionData"></ExpandableText>
+      </div>
+    </div>
     <!-- 答题卡 -->
     <div class="report_module">
       <div class="module_title">
@@ -190,8 +198,8 @@
         <LineChart :extraText="false" :showCheckBox="false" :showMarkPoint="false" :showBackground="false"
           :markNumber="historyExamData.markNumber" :datax="historyExamData.datax" :datay="historyExamData.datay"
           :title="historyExamData.title" :legendList="historyExamData.title"
-          :yInverse="historyExamData.selectVal == 'examRank' ? true : false" :tooltipData="historyExamData.tooltipData"
-          :gridRight="20"></LineChart>
+          :yInverse="historyExamData.selectVal == 'examRank' || historyExamData.selectVal == 'schoolRank' ? true : false" :tooltipData="historyExamData.tooltipData"
+          ></LineChart>
       </div>
       <div class="module_chart no_content_data" v-loading="historyExamLoading" :element-loading-text="loadingText"
         element-loading-spinner="el-icon-loading" element-loading-background="#ffffff" v-else>
@@ -199,14 +207,6 @@
       </div>
       <div class="page_jg_20"></div>
     </div>
-    <div class="report_module" v-if="suggestionData">
-      <div class="module_title">
-        <div class="title_left">总结建议</div>
-      </div>
-      <div class="module_describe suggestion">
-        <ExpandableText :isExpanded="false" :shouldShowButton="false" v-html="suggestionData"></ExpandableText>
-      </div>
-    </div>
     <GotoTop></GotoTop>
     <!-- 学生答题卡预览组件 -->
     <StudentPaper v-model="showStudentPaperDialog" :paperInfo="{examId:reportParam.examId,subjectCode:reportParam.subjectCode}" :currentPageIndex="currentPageIndex" :pageTitle="paperTitle"></StudentPaper>
@@ -622,7 +622,7 @@ export default {
       this.historyExamLoading = true;
       this.$api.reportStudent.queryOneSubjectHistoryExamData(this.reportParam).then((res) => {
           if (res.code == 200 && res.data) {
-            const detailData = res.data?.detailData || [];
+            const detailData = (res.data?.detailData || []).reverse();
             this.historyExamData.chartData = detailData;
             this.historyExamData.selectNames = res.data.selectNames || [];
             this.historyExamData.selectVal = this.historyExamData?.selectNames?.[0]?.prop ?? '';
@@ -666,32 +666,32 @@ export default {
     //学生端查询单科-总结建议
     QueryOneSubjectSuggestionData() {
       this.$api.reportStudent.queryOneSubjectSuggestionData(this.reportParam).then((res) => {
-        console.log(res.code == 200 && res.data,77777)
           if (res.code == 200 && res.data) {
             const data = res.data;
+            //* 1-得分显示分数，小题分显示分数,2-得分显示分数，小题分显示对错
+            //* 3-得分显示对错，小题分显示分数,4-得分显示对错，小题分显示对错
+            //* 5-得分显示等级，小题分显示分数,6-得分显示等级，小题分显示对错
             const upSubjectData = data.upSubjectData.map(item => {
               if (data.studentOpenness == 1 || data.studentOpenness == 2) {
-                return `${item.subjectName}得分<span style="color: #2E64FA;">${item.score}</span>分`
+                return `${item.subjectName}得分<span style="color: #3BA272;">${item.score}</span>分`
               } else {
-                return `${item.subjectName}为<span style="color: #2E64FA;">${item.score}</span>`
+                return `${item.subjectName}标准分为<span style="color: #3BA272;">${item.score}</span>`
               }
             }).join('、')
             const downSubjectData = data.downSubjectData.map(item => {
               if (data.studentOpenness == 1 || data.studentOpenness == 2) {
-                return `${item.subjectName}得分<span style="color: #2E64FA;">${item.score}</span>分`
+                return `${item.subjectName}得分<span style="color: #EE6666;">${item.score}</span>分`
               } else {
-                return `${item.subjectName}为<span style="color: #2E64FA;">${item.score}</span>`
+                return `${item.subjectName}标准分为<span style="color: #EE6666;">${item.score}</span>`
               }
             }).join('、')
-            // if (data.studentOpenness == 1 || data.studentOpenness == 2) {
-              this.suggestionData = `${data.studentName}同学，本次考试`;
-              if (upSubjectData) {
-                this.suggestionData += `${upSubjectData}，是你的优势学科，建议通过提分练习进行强化，继续保持这类学科的优势性！`
-              }
-              if (downSubjectData) {
-                this.suggestionData += `${downSubjectData}，是你的劣势学科，建议先加强学习，熟练掌握薄弱知识点的基础，然后通过提分练习进行巩固和强化，争取下次考试获得更优异的成绩！`
-              }
-            // }
+            this.suggestionData = `${data.studentName}同学，本次考试`;
+            if (upSubjectData) {
+              this.suggestionData += `${upSubjectData}，是你的优势学科，建议通过提分练习进行强化，继续保持这类学科的优势性！`
+            }
+            if (downSubjectData) {
+              this.suggestionData += `${downSubjectData}，是你的劣势学科，建议先加强学习，熟练掌握薄弱知识点的基础，然后通过提分练习进行巩固和强化，争取下次考试获得更优异的成绩！`
+            }
 
         } else {
           this.suggestionData = null

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

@@ -31,6 +31,26 @@
         <div class="page_jg_20"></div>
       </div>
     </div>
+    <div class="report_module" v-if="suggestionData">
+      <div class="module_title">
+        <div class="title_left">总结建议</div>
+      </div>
+      <div class="module_describe suggestion">
+        <ExpandableText :isExpanded="false" :shouldShowButton="false">
+          {{ suggestionData?.studentName }}同学，本次考试{{ suggestionData?.studentOpenness == 1 ||
+            suggestionData?.studentOpenness == 2 ?'总分':'总分标准分为' }}<span style="color: #2E64FA;">{{ suggestionData?.fullScore
+            }}</span>{{ suggestionData?.studentOpenness == 1 || suggestionData?.studentOpenness == 2 ? '分' : '' }}，整体处于{{
+              suggestionData?.summarySuggestionLevel }}，<template v-if="suggestionData?.upSubjectData"><span
+              style="color: #3BA272;">{{
+                suggestionData?.upSubjectData }}</span>是你的优势学科，建议通过提分练习进行强化，继续保持这类学科的优势性{{ suggestionData?.downSubjectData
+                ? '；' :
+                '。'
+            }}</template><template v-if="suggestionData?.downSubjectData"><span style="color: #F56C6C;">{{
+              suggestionData?.downSubjectData
+              }}</span>是你的劣势学科，建议先加强学习，熟练掌握薄弱知识点的基础，然后通过提分练习进行巩固和强化，争取下次考试获得更优异的成绩！</template>
+        </ExpandableText>
+      </div>
+    </div>
     <!-- 科目标准分分析 -->
     <div class="report_module">
       <div class="module_title" style="position: relative">
@@ -70,7 +90,7 @@
         <LineChart :extraText="false" :showCheckBox="false" :showMarkPoint="false" :showBackground="false"
           :markNumber="historyExamData.markNumber" :datax="historyExamData.datax" :datay="historyExamData.datay"
           :title="historyExamData.title" :legendList="historyExamData.title"
-          :yInverse="historyExamData.selectVal == 'examRank' ? true : false" :tooltipData="historyExamData.tooltipData"
+          :yInverse="historyExamData.selectVal == 'examRank' || historyExamData.selectVal == 'schoolRank'? true : false" :tooltipData="historyExamData.tooltipData"
           :gridRight="40"></LineChart>
       </div>
       <div class="module_chart no_content_data" v-loading="historyExamLoading" :element-loading-text="loadingText"
@@ -79,26 +99,6 @@
       </div>
       <div class="page_jg_20"></div>
     </div>
-    <div class="report_module" v-if="suggestionData">
-      <div class="module_title">
-        <div class="title_left">总结建议</div>
-      </div>
-      <div class="module_describe suggestion">
-        <ExpandableText :isExpanded="false" :shouldShowButton="false">
-          {{ suggestionData?.studentName }}同学，本次考试总分{{ suggestionData?.studentOpenness == 1 ||
-            suggestionData?.studentOpenness == 2 ?'':'为' }}<span style="color: #2E64FA;">{{ suggestionData?.fullScore
-            }}</span>{{ suggestionData?.studentOpenness == 1 || suggestionData?.studentOpenness == 2 ? '分' : '' }}，整体处于{{
-              suggestionData?.summarySuggestionLevel }}，<template v-if="suggestionData?.upSubjectData"><span
-              style="color: #3BA272;">{{
-                suggestionData?.upSubjectData }}</span>是你的优势学科，建议通过提分练习进行强化，继续保持这类学科的优势性{{ suggestionData?.downSubjectData
-                ? '；' :
-                '。'
-            }}</template><template v-if="suggestionData?.downSubjectData"><span style="color: #F56C6C;">{{
-              suggestionData?.downSubjectData
-              }}</span>是你的劣势学科，建议先加强学习，熟练掌握薄弱知识点的基础，然后通过提分练习进行巩固和强化，争取下次考试获得更优异的成绩！</template>
-        </ExpandableText>
-      </div>
-    </div>
     <GotoTop></GotoTop>
     <!-- 学生答题卡预览组件 -->
     <StudentPaper v-model="showStudentPaperDialog" :paperInfo="paperInfo" :currentPageIndex="currentPageIndex" :pageTitle="paperTitle"></StudentPaper>