修复成绩里面关于等级显示的问题,因为之前修改了字段名称,这个页面忘了对应了
This commit is contained in:
parent
491caea6c9
commit
c6044754c4
@ -10,13 +10,13 @@
|
|||||||
|
|
||||||
<text class="total-score">共{{ksccKmList.length}}科(满分{{ totalKmFs }}分)</text>
|
<text class="total-score">共{{ksccKmList.length}}科(满分{{ totalKmFs }}分)</text>
|
||||||
|
|
||||||
<text class="grade">{{ curKsdj.dfbs }}</text>
|
<text class="grade">{{ curKsdj.dj }}</text>
|
||||||
|
|
||||||
<view class="grade-info">
|
<view class="grade-info">
|
||||||
<text class="grade-explanation" @click="showGradeInfo">等级说明</text>
|
<text class="grade-explanation" @click="showGradeInfo">等级说明</text>
|
||||||
<view class="grade-box">
|
<view class="grade-box">
|
||||||
<text class="grade-label">区域等级</text>
|
<text class="grade-label">区域等级</text>
|
||||||
<text class="grade-value">{{ curKsdj.dsms }}</text>
|
<text class="grade-value" :style="{ color: curKsdj.djclr }">{{ curKsdj.djBx }}</text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
@ -61,11 +61,11 @@
|
|||||||
>
|
>
|
||||||
<view class="subject-header">
|
<view class="subject-header">
|
||||||
<text class="subject-name">{{ kscj.km.kmmc }}</text>
|
<text class="subject-name">{{ kscj.km.kmmc }}</text>
|
||||||
<text v-if="showFsFlag && kscj.ksdj.id">(分数{{ kscj.ksfs }})</text>
|
<text v-if="showFsFlag && kscj.dj">(分数{{ kscj.ksfs }})</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="subject-body">
|
<view class="subject-body">
|
||||||
<text class="subject-grade">{{ kscj.ksdj.dfbs }}</text>
|
<text class="subject-grade">{{ kscj.dj }}</text>
|
||||||
<text class="detail-btn" :style="{ color: kscj.ksdj.djclr }" v-if="kscj.ksdj.id">{{ kscj.ksdj.dsms }}</text>
|
<text class="detail-btn" :style="{ color: kscj.djclr }" v-if="kscj.dj">{{ kscj.djBx }}</text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
@ -395,18 +395,25 @@ const floatToInt = (floatNum: number, scale: number) => {
|
|||||||
return Math.round(floatNum * scale);
|
return Math.round(floatNum * scale);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let singleFlag = false;
|
||||||
|
|
||||||
// 初始化考试等级列表
|
// 初始化考试等级列表
|
||||||
const initKsdj = () => {
|
const initKsdj = () => {
|
||||||
|
let maxDj = 0.0;
|
||||||
|
let maxKmDj = 0.0;
|
||||||
djList.value.forEach((ksdj: any) => {
|
djList.value.forEach((ksdj: any) => {
|
||||||
ksdj.djfsd = floatToInt(ksdj.djfsd, fsScale); // 等级最低分
|
ksdj.zdf = floatToInt(ksdj.zdf, fsScale); // 等级最低分
|
||||||
ksdj.djfsg = floatToInt(ksdj.djfsg, fsScale); // 等级最高分
|
ksdj.zgf = floatToInt(ksdj.zgf, fsScale); // 等级最高分
|
||||||
ksdj.djclr = colorMap[ksdj.dfbs] || ''; // 等级颜色
|
ksdj.djclr = colorMap[ksdj.dj] || ''; // 等级颜色
|
||||||
|
maxDj = Math.max(maxDj, ksdj.zgf);
|
||||||
});
|
});
|
||||||
kmDjList.value.forEach((kmdj: any) => {
|
kmDjList.value.forEach((kmdj: any) => {
|
||||||
kmdj.djfsd = floatToInt(kmdj.djfsd, fsScale); // 等级最低分
|
kmdj.zdf = floatToInt(kmdj.zdf, fsScale); // 等级最低分
|
||||||
kmdj.djfsg = floatToInt(kmdj.djfsg, fsScale); // 等级最高分
|
kmdj.zgf = floatToInt(kmdj.zgf, fsScale); // 等级最高分
|
||||||
kmdj.djclr = colorMap[kmdj.dfbs] || ''; // 等级颜色
|
kmdj.djclr = colorMap[kmdj.dj] || ''; // 等级颜色
|
||||||
|
maxKmDj = Math.max(maxKmDj, kmdj.zgf);
|
||||||
});
|
});
|
||||||
|
singleFlag = maxDj < maxKmDj + 100;
|
||||||
};
|
};
|
||||||
|
|
||||||
// 构建当前学期所有科目成绩(对象是按照{ 科目id:{ 日期:成绩 } }的结构拼接)
|
// 构建当前学期所有科目成绩(对象是按照{ 科目id:{ 日期:成绩 } }的结构拼接)
|
||||||
@ -448,8 +455,8 @@ const rebuildData = () => {
|
|||||||
ksfsList.push(cj.ksfs);
|
ksfsList.push(cj.ksfs);
|
||||||
totalFs += cj.ksfs;
|
totalFs += cj.ksfs;
|
||||||
let fs = floatToInt(cj.ksfs, fsScale);
|
let fs = floatToInt(cj.ksfs, fsScale);
|
||||||
|
cj.djclr = colorMap[cj.dj] || '';
|
||||||
// 查询考试等级
|
// 查询考试等级
|
||||||
cj.ksdj = kmDjList.value.find((item: any) => item.kmId == cj.kmId && item.djfsd <= fs && item.djfsg >= fs) || {};
|
|
||||||
cj.km = ksccKmList.value.find((item: any) => item.kmId === cj.kmId) || {};
|
cj.km = ksccKmList.value.find((item: any) => item.kmId === cj.kmId) || {};
|
||||||
return cj;
|
return cj;
|
||||||
});
|
});
|
||||||
@ -461,7 +468,10 @@ const rebuildData = () => {
|
|||||||
radarData.series = [{ name: "分数", data: ksfsList }];
|
radarData.series = [{ name: "分数", data: ksfsList }];
|
||||||
// 当前成绩列表
|
// 当前成绩列表
|
||||||
totalFs = floatToInt(totalFs, fsScale);
|
totalFs = floatToInt(totalFs, fsScale);
|
||||||
curKsdj.value = djList.value.find((item: any) => item.djfsd <= totalFs && item.djfsg >= totalFs) || {};
|
if (singleFlag) {
|
||||||
|
totalFs = totalFs / ksccKmList.value.length;
|
||||||
|
}
|
||||||
|
curKsdj.value = djList.value.find((item: any) => item.zdf <= totalFs && item.zgf >= totalFs) || {};
|
||||||
// 构建趋势图所需的成绩列表信息
|
// 构建趋势图所需的成绩列表信息
|
||||||
buildXqKmKscjList();
|
buildXqKmKscjList();
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user