From 9f78f3f014a3423ea3fcab8f9f1056c57cd47fc8 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 26 八月 2022 17:16:26 +0800
Subject: [PATCH] 2022.8.26
---
pages/gradereport/gradereport.js | 70 +++++++++++++++++++++++++----------
1 files changed, 50 insertions(+), 20 deletions(-)
diff --git a/pages/gradereport/gradereport.js b/pages/gradereport/gradereport.js
index 03e8e16..03df02c 100644
--- a/pages/gradereport/gradereport.js
+++ b/pages/gradereport/gradereport.js
@@ -95,11 +95,11 @@
*/
data: {
ec: {
- lazyLoad: false
+ lazyLoad: true
},
creditText: '----------------------',
gradeDetails: [{
- name: '鑰冩牳寰楀垎',
+ name: '鑷瘎寰楀垎',
detail: '--'
}, {
name: '椋庨櫓鎺掑悕',
@@ -108,20 +108,27 @@
name: '椋庨櫓绛夌骇',
detail: '--'
}, {
- name: '鑰冩牳鍛ㄦ湡',
+ name: '鑷瘎鍛ㄦ湡',
detail: '--'
}, {
name: '鑷瘎鏃堕棿',
detail: '--'
}],
+
+ //澶卞垎鐨勭被鍨�
+ losePointsItem: [],
losePoints: [{
- ruleName: '----',
- score: '--',
- remark: '------------'
- }, {
- ruleName: '----',
- score: '--',
- remark: '------------'
+ baseRule: '',
+ name: '',
+ itemlist: [{
+ ruleName: '----',
+ score: '--',
+ remark: '------------'
+ },{
+ ruleName: '----',
+ score: '--',
+ remark: '------------'
+ }]
}]
},
@@ -207,7 +214,7 @@
let year = data.period.split('/')[0]
let month = data.period.split('/')[1].split('-')[0]
let gradeDetails = [{
- name: '鑰冩牳寰楀垎',
+ name: '鑷瘎寰楀垎',
detail: data.score
}, {
name: '椋庨櫓鎺掑悕',
@@ -216,20 +223,42 @@
name: '椋庨櫓绛夌骇',
detail: data.level
}, {
- name: '鑰冩牳鍛ㄦ湡',
+ name: '鑷瘎鍛ㄦ湡',
detail: `${year}骞�${month}鏈坄
}, {
name: '鑷瘎鏃堕棿',
detail: moment(data.time).format("YYYY-MM-DD HH:mm")
}]
+ let losePointsItem = []
let losePoints = []
- data.loseScore.forEach(l => {
- losePoints.push({
- ruleName: l.first,
- score: l.second,
- remark: l.third
- })
- });
+ for (const key in data.loseScore) {
+ const s = data.loseScore[key];
+ if (Object.keys(s).length > 0) {
+ losePointsItem.push(key)
+ for (const key1 in s) {
+ const rule = s[key1];
+ let p = {
+ baseRule: key,
+ name: key1,
+ itemlist: []
+ }
+ rule.forEach(r => {
+ // fixme : 姝ゅ鏆傛椂灏嗐�愰楗�戠被鍨嬬殑浼佷笟璇勪及寤鸿鐨勭涓�鍙ヨ瘽鍒犻櫎
+ if (app.globalData.userInfo.extension2 === '1') {
+ const i = r.third.indexOf('锛�')
+ r.third = r.third.slice(i+1)
+ r.third = r.third.replace('浣�', '鎮�')
+ }
+ p.itemlist.push({
+ ruleName: r.first,
+ score: r.second,
+ remark: r.third
+ })
+ });
+ losePoints.push(p)
+ }
+ }
+ }
let classPoints = {
score: data.score,
level: data.level,
@@ -247,7 +276,8 @@
that.setData({
creditText: creditText,
gradeDetails: gradeDetails,
- losePoints: losePoints
+ losePoints: losePoints,
+ losePointsItem: losePointsItem
})
setOption(that.chart, classPoints)
}
--
Gitblit v1.9.3