|
@@ -21,7 +21,8 @@
|
|
|
<template v-else>{{ scope.row?.[title.prop] || "-" }}</template>
|
|
<template v-else>{{ scope.row?.[title.prop] || "-" }}</template>
|
|
|
</template>
|
|
</template>
|
|
|
<template v-else-if="title.prop == 'imgUrlList'">
|
|
<template v-else-if="title.prop == 'imgUrlList'">
|
|
|
- <el-button v-if="scope.row.isTotal==0 || scope.row.subjectGroupType==0" type="text" :disabled="!scope?.row?.imgUrlList || scope?.row?.imgUrlList == '-'" @click="OpenStudentPaper(scope.row.subjectCode)">查看答题卡</el-button>
|
|
|
|
|
|
|
+ <!-- :disabled="!scope?.row?.imgUrlList || scope?.row?.imgUrlList == '-'" -->
|
|
|
|
|
+ <el-button v-if="scope.row.isTotal==0 || scope.row.subjectGroupType==0" type="text" @click="OpenStudentPaper(scope.row.subjectCode)">查看答题卡</el-button>
|
|
|
<template v-else>-</template>
|
|
<template v-else>-</template>
|
|
|
</template>
|
|
</template>
|
|
|
<template v-else>{{ scope.row?.[title.prop] || "-" }}</template>
|
|
<template v-else>{{ scope.row?.[title.prop] || "-" }}</template>
|
|
@@ -209,9 +210,14 @@ export default {
|
|
|
//单科
|
|
//单科
|
|
|
const singleSubject = this.subjectData.tableData.filter(item => item.isTotal == 0 && item.subjectGroupType == 0);
|
|
const singleSubject = this.subjectData.tableData.filter(item => item.isTotal == 0 && item.subjectGroupType == 0);
|
|
|
const chartData = [...totalScore,...subjectGroup,...singleSubject];
|
|
const chartData = [...totalScore,...subjectGroup,...singleSubject];
|
|
|
|
|
+ let datax = [],datay = [];
|
|
|
chartData.forEach(item=>{
|
|
chartData.forEach(item=>{
|
|
|
this.subjectData.datax.push(item.subjectName)
|
|
this.subjectData.datax.push(item.subjectName)
|
|
|
this.subjectData.datay.push(item.standardScore)
|
|
this.subjectData.datay.push(item.standardScore)
|
|
|
|
|
+ if(item.isTotal == 0 && item.subjectGroupType == 0){
|
|
|
|
|
+ datax.push(item.subjectName)
|
|
|
|
|
+ datay.push(item.standardScore)
|
|
|
|
|
+ }
|
|
|
this.subjectData.tooltipData.push({
|
|
this.subjectData.tooltipData.push({
|
|
|
list: [{
|
|
list: [{
|
|
|
name: '标准分',
|
|
name: '标准分',
|
|
@@ -221,12 +227,12 @@ export default {
|
|
|
})
|
|
})
|
|
|
})
|
|
})
|
|
|
let maxSubject = [], minSubject = [];
|
|
let maxSubject = [], minSubject = [];
|
|
|
- this.subjectData.datay.forEach((item, k) => {
|
|
|
|
|
|
|
+ datay.forEach((item, k) => {
|
|
|
if (Number(item) > 0) {
|
|
if (Number(item) > 0) {
|
|
|
- maxSubject.push(this.subjectData.datax[k])
|
|
|
|
|
|
|
+ maxSubject.push(datax[k])
|
|
|
}
|
|
}
|
|
|
if (Number(item) < 0) {
|
|
if (Number(item) < 0) {
|
|
|
- minSubject.push(this.subjectData.datax[k])
|
|
|
|
|
|
|
+ minSubject.push(datax[k])
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
this.subjectData.maxSubject = maxSubject.join('、');
|
|
this.subjectData.maxSubject = maxSubject.join('、');
|