|
@@ -67,7 +67,7 @@ export default {
|
|
props: ["data", "search"],
|
|
props: ["data", "search"],
|
|
components: {
|
|
components: {
|
|
"ve-funnel": veFunnel,
|
|
"ve-funnel": veFunnel,
|
|
- "ve-line": veLine,
|
|
|
|
|
|
+ "ve-line": veLine,
|
|
"count-to": countTo,
|
|
"count-to": countTo,
|
|
searchHeader,
|
|
searchHeader,
|
|
},
|
|
},
|
|
@@ -92,17 +92,17 @@ export default {
|
|
},
|
|
},
|
|
chartExtend() {
|
|
chartExtend() {
|
|
return {
|
|
return {
|
|
- yAxis: {
|
|
|
|
|
|
+ yAxis: {
|
|
//纵轴标尺固定
|
|
//纵轴标尺固定
|
|
- minInterval:1,
|
|
|
|
|
|
+ minInterval: 1,
|
|
type: "value",
|
|
type: "value",
|
|
scale: true,
|
|
scale: true,
|
|
min: 0,
|
|
min: 0,
|
|
- axisLabel:{
|
|
|
|
- formatter:'{value}人'
|
|
|
|
- }
|
|
|
|
|
|
+ axisLabel: {
|
|
|
|
+ formatter: "{value}人",
|
|
|
|
+ },
|
|
},
|
|
},
|
|
- series: {
|
|
|
|
|
|
+ series: {
|
|
smooth: false,
|
|
smooth: false,
|
|
},
|
|
},
|
|
tooltip: {
|
|
tooltip: {
|
|
@@ -112,6 +112,14 @@ export default {
|
|
color: "rgba(150,150,150,0.2)",
|
|
color: "rgba(150,150,150,0.2)",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
|
|
+ formatter: (item) => {
|
|
|
|
+ return [
|
|
|
|
+ item[0].axisValueLabel,
|
|
|
|
+ ...item.map(
|
|
|
|
+ (d) => `<br/>${d.marker}${d.seriesName}: ${d.value[1]}人`
|
|
|
|
+ ),
|
|
|
|
+ ].join("");
|
|
|
|
+ },
|
|
},
|
|
},
|
|
};
|
|
};
|
|
},
|
|
},
|
|
@@ -209,7 +217,8 @@ export default {
|
|
const res = await getIndex({
|
|
const res = await getIndex({
|
|
...rest,
|
|
...rest,
|
|
...getTimes(this.mdate, ["startDate", "endDate"]),
|
|
...getTimes(this.mdate, ["startDate", "endDate"]),
|
|
- dataTypes:'ADD_STUDENT_REGISTRATION_NUM,MUSIC_GROUP_STUDENT,NEWLY_STUDENT_NUM,QUIT_MUSIC_GROUP_STUDENT_NUM,VIP_PRACTICE_STUDENT_NUM,VIP_PRACTICE_ADD_STUDENT_NUM'
|
|
|
|
|
|
+ dataTypes:
|
|
|
|
+ "ADD_STUDENT_REGISTRATION_NUM,MUSIC_GROUP_STUDENT,NEWLY_STUDENT_NUM,QUIT_MUSIC_GROUP_STUDENT_NUM,VIP_PRACTICE_STUDENT_NUM,VIP_PRACTICE_ADD_STUDENT_NUM",
|
|
});
|
|
});
|
|
for (const item of res.data) {
|
|
for (const item of res.data) {
|
|
// 再循环一遍
|
|
// 再循环一遍
|