|
|
|
@ -718,11 +718,11 @@ export default { |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
color1: '#e71872', |
|
|
|
color1: '#e71872', |
|
|
|
color2: 'rgba(243, 147, 189, 0.4)' |
|
|
|
color2: 'rgba(40, 147, 189, 0.4)' |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
color1: '#f9d437', |
|
|
|
color1: '#f9d437', |
|
|
|
color2: 'rgba(255, 234, 144, 0.4)' |
|
|
|
color2: 'rgba(50, 234, 144, 0.4)' |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
color1: '#912892', |
|
|
|
color1: '#912892', |
|
|
|
@ -730,11 +730,11 @@ export default { |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
color1: '#f21259', |
|
|
|
color1: '#f21259', |
|
|
|
color2: 'rgba(213, 22, 11, 0.4)' |
|
|
|
color2: 'rgba(40, 176, 97, 0.4)' |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
color1: '#7343fe', |
|
|
|
color1: '#7343fe', |
|
|
|
color2: 'rgba(243, 123, 2, 0.4)' |
|
|
|
color2: 'rgba(50, 240, 140, 0.4)' |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
color1: '#ea7321', |
|
|
|
color1: '#ea7321', |
|
|
|
@ -746,8 +746,24 @@ export default { |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
color1: '#672313', |
|
|
|
color1: '#672313', |
|
|
|
color2: 'rgba(156, 163, 2, 0.4)' |
|
|
|
color2: 'rgba(156, 40, 100, 0.4)' |
|
|
|
} |
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
color1: '#0184d5', |
|
|
|
|
|
|
|
color2: 'rgba(60, 132, 60, 0.4)' |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
color1: '#00d887', |
|
|
|
|
|
|
|
color2: 'rgba(60, 42, 244, 0.4)' |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
color1: '#e71872', |
|
|
|
|
|
|
|
color2: 'rgba(90, 147, 180, 0.4)' |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
color1: '#f9d437', |
|
|
|
|
|
|
|
color2: 'rgba(150, 20, 144, 0.4)' |
|
|
|
|
|
|
|
}, |
|
|
|
] |
|
|
|
] |
|
|
|
// 登录前登录后调的课程接口不一样 |
|
|
|
// 登录前登录后调的课程接口不一样 |
|
|
|
const cousrseRes = await this.$post(this.api.listOfGoods, { |
|
|
|
const cousrseRes = await this.$post(this.api.listOfGoods, { |
|
|
|
@ -758,22 +774,20 @@ export default { |
|
|
|
hotTag: 1, |
|
|
|
hotTag: 1, |
|
|
|
}) |
|
|
|
}) |
|
|
|
if (cousrseRes) { |
|
|
|
if (cousrseRes) { |
|
|
|
const courseList = |
|
|
|
const courseList = cousrseRes.page.records |
|
|
|
cousrseRes.page.records |
|
|
|
|
|
|
|
const ids = courseList.map(e => e.mallId) |
|
|
|
const ids = courseList.map(e => e.mallId) |
|
|
|
times.map(e => { |
|
|
|
times.map(e => { |
|
|
|
e.mallId = ids |
|
|
|
e.mallId = ids |
|
|
|
}) |
|
|
|
}) |
|
|
|
const courseData = {} |
|
|
|
const courseData = {} |
|
|
|
courseList.map(e => { |
|
|
|
|
|
|
|
// e.productName = e.productName.substring(0, 10) |
|
|
|
|
|
|
|
courseData[e.productName] = [] |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
this.$post(this.api.studentAssessSchievement, times).then(({ data }) => { |
|
|
|
this.$post(this.api.studentAssessSchievement, times).then(({ data }) => { |
|
|
|
const times = [] |
|
|
|
const xData = data.map(e => e.time) |
|
|
|
|
|
|
|
const len = xData.length |
|
|
|
|
|
|
|
courseList.map(e => { |
|
|
|
|
|
|
|
courseData[e.productName] = new Array(len).fill(0, 0) |
|
|
|
|
|
|
|
}) |
|
|
|
const series = [] |
|
|
|
const series = [] |
|
|
|
data.map((e, i) => { |
|
|
|
data.map((e, i) => { |
|
|
|
times.push(e.time) |
|
|
|
|
|
|
|
e.assesScoreRespList.map(n => { |
|
|
|
e.assesScoreRespList.map(n => { |
|
|
|
const item = courseList.find(j => j.mallId == n.mallId) |
|
|
|
const item = courseList.find(j => j.mallId == n.mallId) |
|
|
|
if (item) { |
|
|
|
if (item) { |
|
|
|
@ -790,7 +804,7 @@ export default { |
|
|
|
series.push({ |
|
|
|
series.push({ |
|
|
|
name: i, |
|
|
|
name: i, |
|
|
|
type: 'line', |
|
|
|
type: 'line', |
|
|
|
smooth: true, |
|
|
|
// smooth: true, |
|
|
|
symbol: 'circle', |
|
|
|
symbol: 'circle', |
|
|
|
symbolSize: 5, |
|
|
|
symbolSize: 5, |
|
|
|
lineStyle: { |
|
|
|
lineStyle: { |
|
|
|
@ -799,23 +813,10 @@ export default { |
|
|
|
width: 2 |
|
|
|
width: 2 |
|
|
|
} |
|
|
|
} |
|
|
|
}, |
|
|
|
}, |
|
|
|
areaStyle: { |
|
|
|
|
|
|
|
normal: { |
|
|
|
|
|
|
|
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{ |
|
|
|
|
|
|
|
offset: 0, |
|
|
|
|
|
|
|
color: colors[index].color2 |
|
|
|
|
|
|
|
}, { |
|
|
|
|
|
|
|
offset: 0.8, |
|
|
|
|
|
|
|
color: colors[index].color2 |
|
|
|
|
|
|
|
}], false), |
|
|
|
|
|
|
|
shadowColor: 'rgba(0, 0, 0, 0.1)', |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
itemStyle: { |
|
|
|
itemStyle: { |
|
|
|
normal: { |
|
|
|
normal: { |
|
|
|
color: colors[index].color1, |
|
|
|
color: colors[index].color1, |
|
|
|
borderColor: 'rgba(221, 220, 107, .1)', |
|
|
|
borderWidth: 8 |
|
|
|
borderWidth: 12 |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
}, |
|
|
|
}, |
|
|
|
data: courseData[i] |
|
|
|
data: courseData[i] |
|
|
|
@ -871,7 +872,7 @@ export default { |
|
|
|
color: 'rgba(255,255,255,.2)' |
|
|
|
color: 'rgba(255,255,255,.2)' |
|
|
|
} |
|
|
|
} |
|
|
|
}, |
|
|
|
}, |
|
|
|
data: times |
|
|
|
data: xData |
|
|
|
}, |
|
|
|
}, |
|
|
|
yAxis: [{ |
|
|
|
yAxis: [{ |
|
|
|
type: 'value', |
|
|
|
type: 'value', |
|
|
|
|
