|
|
@@ -55,7 +55,7 @@
|
|
|
<span class="title">年排</span>
|
|
|
<span class="value">{{ subjectData?.data?.schoolRank ?? '-' }}</span>
|
|
|
</div>
|
|
|
- <div class="score_item" v-if="subjectData?.data?.examRankStatus === 0">
|
|
|
+ <div class="score_item" v-if="subjectData?.data?.examRankStatus === 0 && schoolType == 2">
|
|
|
<span class="title">联排</span>
|
|
|
<span class="value">{{ subjectData?.data?.examRank ?? '-' }}</span>
|
|
|
</div>
|
|
|
@@ -340,6 +340,7 @@ export default {
|
|
|
},//监听筛选数据变化
|
|
|
},
|
|
|
computed: {
|
|
|
+ ...mapGetters(["userInfo"]),
|
|
|
reportParam() {
|
|
|
return {
|
|
|
examLevel: this.$store.state.report.filterObject.examLevel, //1-联考 2-单校
|
|
|
@@ -367,8 +368,10 @@ export default {
|
|
|
if (examName) {
|
|
|
return examName.split("_")[0];
|
|
|
}
|
|
|
- },
|
|
|
- ...mapGetters(["userInfo"]),
|
|
|
+ },//考试名称
|
|
|
+ schoolType(){
|
|
|
+ sessionStorage.getItem('schoolType');//1:单校 2:联校
|
|
|
+ }
|
|
|
},
|
|
|
created() { },
|
|
|
mounted() {
|
|
|
@@ -438,6 +441,18 @@ export default {
|
|
|
}).then((res) => {
|
|
|
if (res.code == 200 && res.data) {
|
|
|
this.answerCard.paperImageList=res.data.pageVOS || [];
|
|
|
+ //先添加总分数据
|
|
|
+ let totalScore = {
|
|
|
+ questionName: '总分',
|
|
|
+ fullScore: res?.data?.fullScore || 150,
|
|
|
+ score: res?.data?.totalScore,
|
|
|
+ questionAnswer: '',
|
|
|
+ answer: '',
|
|
|
+ samplingPosition:"{\"x\":195,\"y\":247,\"page\":1}",
|
|
|
+ };
|
|
|
+ if (this.answerCard.paperImageList.length > 0 && this.answerCard.paperImageList[0].questionVOS) {
|
|
|
+ this.answerCard.paperImageList[0].questionVOS.unshift(totalScore);
|
|
|
+ }
|
|
|
}else{
|
|
|
this.answerCard.paperImageList=[];
|
|
|
}
|
|
|
@@ -466,7 +481,6 @@ export default {
|
|
|
const titleData = res.data.titleData || [];
|
|
|
const studentOpenness = res.data?.studentOpenness ?? '';
|
|
|
this.TableChartData(tableData, titleData, studentOpenness, 'smallQuestionData');
|
|
|
- this.QueryOneSubjectGroupQuestionData();//学生端查询单科-大题分析,知识点分析,能力要素分析
|
|
|
} else {
|
|
|
this.groupData.smallQuestionData.tableData = [];
|
|
|
this.groupData.smallQuestionData.titleData = [];
|
|
|
@@ -475,6 +489,7 @@ export default {
|
|
|
this.groupData.smallQuestionData.datay = [];
|
|
|
this.groupData.smallQuestionData.studentOpenness = '';
|
|
|
}
|
|
|
+ this.QueryOneSubjectGroupQuestionData();//学生端查询单科-大题分析,知识点分析,能力要素分析
|
|
|
})
|
|
|
.finally(() => {
|
|
|
this.groupData.smallQuestionData.loading = false;
|
|
|
@@ -510,9 +525,7 @@ export default {
|
|
|
this.groupData.bigQuestionData.loading = true;
|
|
|
this.groupData.knowledgePointQuestionData.loading = true;
|
|
|
this.groupData.abilityQuestionData.loading = true;
|
|
|
- this.$api.reportStudent
|
|
|
- .queryOneSubjectGroupQuestionData(this.reportParam)
|
|
|
- .then((res) => {
|
|
|
+ this.$api.reportStudent.queryOneSubjectGroupQuestionData(this.reportParam).then((res) => {
|
|
|
if (res.code == 200 && res.data) {
|
|
|
const { bigQuestion, knowledgePointQuestion, abilityQuestion } = res.data;
|
|
|
if (bigQuestion && bigQuestion?.tableData?.length > 0) {
|
|
|
@@ -545,7 +558,6 @@ export default {
|
|
|
const studentOpenness = abilityQuestion?.studentOpenness ?? '';
|
|
|
this.TableChartData(tableData, titleData, studentOpenness, 'abilityQuestionData');
|
|
|
}
|
|
|
- this.QueryOneSubjectCustomGroupQuestion();//学生端查询单科-自定义分组
|
|
|
} else {
|
|
|
this.groupData.bigQuestionData.tableData = [];
|
|
|
this.groupData.bigQuestionData.titleData = [];
|
|
|
@@ -566,6 +578,7 @@ export default {
|
|
|
this.groupData.abilityQuestionData.datay = [];
|
|
|
this.groupData.abilityQuestionData.studentOpenness = '';
|
|
|
}
|
|
|
+ this.QueryOneSubjectCustomGroupQuestion();//学生端查询单科-自定义分组
|
|
|
}).finally(() => {
|
|
|
this.groupData.bigQuestionData.loading = false;
|
|
|
this.groupData.knowledgePointQuestionData.loading = false;
|
|
|
@@ -574,9 +587,7 @@ export default {
|
|
|
},
|
|
|
//学生端查询单科-自定义分组
|
|
|
QueryOneSubjectCustomGroupQuestion() {
|
|
|
- this.$api.reportStudent
|
|
|
- .queryOneSubjectCustomGroupQuestion(this.reportParam)
|
|
|
- .then((res) => {
|
|
|
+ this.$api.reportStudent.queryOneSubjectCustomGroupQuestion(this.reportParam).then((res) => {
|
|
|
if (res.code == 200 && res.data) {
|
|
|
const customQuestionData = res?.data?.customQuestionData ?? [];
|
|
|
if (customQuestionData && customQuestionData.length > 0) {
|
|
|
@@ -612,9 +623,7 @@ export default {
|
|
|
//学生端查询单科-历次查询
|
|
|
QueryOneSubjectHistoryExamData() {
|
|
|
this.historyExamLoading = true;
|
|
|
- this.$api.reportStudent
|
|
|
- .queryOneSubjectHistoryExamData(this.reportParam)
|
|
|
- .then((res) => {
|
|
|
+ this.$api.reportStudent.queryOneSubjectHistoryExamData(this.reportParam).then((res) => {
|
|
|
if (res.code == 200 && res.data) {
|
|
|
const detailData = res.data?.detailData || [];
|
|
|
this.historyExamData.chartData = detailData;
|
|
|
@@ -640,8 +649,7 @@ export default {
|
|
|
this.historyExamData.tooltipData = [];
|
|
|
this.historyExamData.selectVal = '';
|
|
|
}
|
|
|
- })
|
|
|
- .finally(() => {
|
|
|
+ }).finally(() => {
|
|
|
this.historyExamLoading = false;
|
|
|
});
|
|
|
},
|
|
|
@@ -660,9 +668,7 @@ export default {
|
|
|
},
|
|
|
//学生端查询单科-总结建议
|
|
|
QueryOneSubjectSuggestionData() {
|
|
|
- this.$api.reportStudent
|
|
|
- .queryOneSubjectSuggestionData(this.reportParam)
|
|
|
- .then((res) => {
|
|
|
+ this.$api.reportStudent.queryOneSubjectSuggestionData(this.reportParam).then((res) => {
|
|
|
if (res.code == 200 && res.data) {
|
|
|
const data = res.data;
|
|
|
const upSubjectData = data.upSubjectData.map(item => {
|