Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

评估-领域-新图表数据化-优化

Browse Source
This commit is contained in:
zhanglipeng 2020-11-15 15:14:43 +08:00
parent 59c7fe6a6c
commit d7f8394f71
8 changed files with 246 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-ui/src/views/benyi/assessment/history.vue
View File

@ -31,7 +31,7 @@
<radar-chart_ys :psMsg="item.dictValue" />
</div>
<div class="block">
<h2 class="block-item-title flex align-center">评估建议</h2>
<h2 class="block-item-title flex align-center">教育建议</h2>
<!-- <ul class="block-content">
<li>
<p class="block-content-title">
@ -108,8 +108,6 @@ export default {
assessmentscope: "",
// tabs列表
tabsList: [],
// 遮罩层
loading: true,
activeName: "",
};
},

2
ruoyi-ui/src/views/benyi/assessment/student.vue
View File

@ -45,7 +45,7 @@
:label="itemLy.name"
:name="itemLy.name"
>
<div
<div v-loading="loading"
class="block"
v-for="itemFzly in assessmentcontentList.filter(
(p) => p.parentId == itemLy.id

43
ruoyi-ui/src/views/dashboard/RadarChart.vue
View File

@ -1,5 +1,9 @@
<template>
<div :class="className" :style="{ height: height, width: width }" />
<div
v-loading="loading"
:class="className"
:style="{ height: height, width: width }"
/>
</template>
<script>
@ -35,6 +39,8 @@ export default {
return {
chart: null,
childId: "",
// 遮罩层
loading: true,
};
},
mounted() {
@ -75,11 +81,22 @@ export default {
);
},
async initChart() {
this.loading = true;
await this.getData();
this.loading = false;
this.chart = echarts.init(this.$el, "macarons");
if (this.psMsg == "3") {
this.chart.setOption({
title: {
text: "幼儿学习与发展评估结果综合统计",
textStyle: {
fontSize: 14,
lineHeight: 20,
},
top: "top",
left: "center",
},
tooltip: {
trigger: "axis",
axisPointer: {
@ -89,7 +106,7 @@ export default {
},
radar: {
radius: "66%",
center: ["50%", "42%"],
center: ["50%", "52%"],
splitNumber: 8,
splitArea: {
areaStyle: {
@ -143,6 +160,15 @@ export default {
});
} else if (this.psMsg == "2") {
this.chart.setOption({
title: {
text: "幼儿学习与发展评估结果综合统计",
textStyle: {
fontSize: 14,
lineHeight: 20,
},
top: "top",
left: "center",
},
tooltip: {
trigger: "axis",
axisPointer: {
@ -152,7 +178,7 @@ export default {
},
radar: {
radius: "66%",
center: ["50%", "42%"],
center: ["50%", "52%"],
splitNumber: 8,
splitArea: {
areaStyle: {
@ -206,6 +232,15 @@ export default {
});
} else if (this.psMsg == "1") {
this.chart.setOption({
title: {
text: "幼儿学习与发展评估结果综合统计",
textStyle: {
fontSize: 14,
lineHeight: 20,
},
top: "top",
left: "center",
},
tooltip: {
trigger: "axis",
axisPointer: {
@ -215,7 +250,7 @@ export default {
},
radar: {
radius: "66%",
center: ["50%", "42%"],
center: ["50%", "52%"],
splitNumber: 8,
splitArea: {
areaStyle: {

47
ruoyi-ui/src/views/dashboard/RadarChart_jk.vue
View File

@ -1,5 +1,9 @@
<template>
<div :class="className" :style="{ height: height, width: width }" />
<div
v-loading="loading"
:class="className"
:style="{ height: height, width: width }"
/>
</template>
<script>
@ -40,6 +44,8 @@ export default {
return {
chart: null,
childId: "",
// 遮罩层
loading: true,
};
},
mounted() {
@ -82,7 +88,7 @@ export default {
await getAssessmentStatisticsmb(this.childId, this.psMsg, 0).then(
(response) => {
let value = [];
let mbvalues=[];
let mbvalues = [];
let len = response.mb;
for (var j = 0; j < len.length; j++) {
// console.log(len[j]);
@ -96,7 +102,7 @@ export default {
mbvalues.push(len[j].max);
value.push(len[j]);
}
this.mbvalues=mbvalues;
this.mbvalues = mbvalues;
this.names = value;
//console.log(this.names);
//console.log(this.values);
@ -104,12 +110,23 @@ export default {
);
},
async initChart() {
this.loading = true;
await this.getData();
await this.getNameData();
this.loading = false;
this.chart = echarts.init(this.$el, "macarons");
if (this.psMsg == "3") {
this.chart.setOption({
title: {
text: "幼儿评估结果-健康",
textStyle: {
fontSize: 14,
lineHeight: 20,
},
top: "top",
left: "center",
},
tooltip: {
trigger: "axis",
axisPointer: {
@ -119,7 +136,7 @@ export default {
},
radar: {
radius: "66%",
center: ["50%", "42%"],
center: ["50%", "50%"],
splitNumber: 8,
splitArea: {
areaStyle: {
@ -167,6 +184,15 @@ export default {
});
} else if (this.psMsg == "2") {
this.chart.setOption({
title: {
text: "幼儿评估结果-健康",
textStyle: {
fontSize: 14,
lineHeight: 20,
},
top: "top",
left: "center",
},
tooltip: {
trigger: "axis",
axisPointer: {
@ -176,7 +202,7 @@ export default {
},
radar: {
radius: "66%",
center: ["50%", "42%"],
center: ["50%", "50%"],
splitNumber: 8,
splitArea: {
areaStyle: {
@ -224,6 +250,15 @@ export default {
});
} else if (this.psMsg == "1") {
this.chart.setOption({
title: {
text: "幼儿评估结果-健康",
textStyle: {
fontSize: 14,
lineHeight: 20,
},
top: "top",
left: "center",
},
tooltip: {
trigger: "axis",
axisPointer: {
@ -233,7 +268,7 @@ export default {
},
radar: {
radius: "66%",
center: ["50%", "42%"],
center: ["50%", "50%"],
splitNumber: 8,
splitArea: {
areaStyle: {

47
ruoyi-ui/src/views/dashboard/RadarChart_kx.vue
View File

@ -1,5 +1,9 @@
<template>
<div :class="className" :style="{ height: height, width: width }" />
<div
v-loading="loading"
:class="className"
:style="{ height: height, width: width }"
/>
</template>
<script>
@ -40,6 +44,8 @@ export default {
return {
chart: null,
childId: "",
// 遮罩层
loading: true,
};
},
mounted() {
@ -82,7 +88,7 @@ export default {
await getAssessmentStatisticsmb(this.childId, this.psMsg, 3).then(
(response) => {
let value = [];
let mbvalues=[];
let mbvalues = [];
let len = response.mb;
for (var j = 0; j < len.length; j++) {
// console.log(len[j]);
@ -96,7 +102,7 @@ export default {
mbvalues.push(len[j].max);
value.push(len[j]);
}
this.mbvalues=mbvalues;
this.mbvalues = mbvalues;
this.names = value;
//console.log(this.names);
//console.log(this.values);
@ -104,12 +110,23 @@ export default {
);
},
async initChart() {
this.loading = true;
await this.getData();
await this.getNameData();
this.loading = false;
this.chart = echarts.init(this.$el, "macarons");
if (this.psMsg == "3") {
this.chart.setOption({
title: {
text: "幼儿评估结果-科学",
textStyle: {
fontSize: 14,
lineHeight: 20,
},
top: "top",
left: "center",
},
tooltip: {
trigger: "axis",
axisPointer: {
@ -119,7 +136,7 @@ export default {
},
radar: {
radius: "66%",
center: ["50%", "42%"],
center: ["50%", "50%"],
splitNumber: 8,
splitArea: {
areaStyle: {
@ -167,6 +184,15 @@ export default {
});
} else if (this.psMsg == "2") {
this.chart.setOption({
title: {
text: "幼儿评估结果-科学",
textStyle: {
fontSize: 14,
lineHeight: 20,
},
top: "top",
left: "center",
},
tooltip: {
trigger: "axis",
axisPointer: {
@ -176,7 +202,7 @@ export default {
},
radar: {
radius: "66%",
center: ["50%", "42%"],
center: ["50%", "50%"],
splitNumber: 8,
splitArea: {
areaStyle: {
@ -224,6 +250,15 @@ export default {
});
} else if (this.psMsg == "1") {
this.chart.setOption({
title: {
text: "幼儿评估结果-科学",
textStyle: {
fontSize: 14,
lineHeight: 20,
},
top: "top",
left: "center",
},
tooltip: {
trigger: "axis",
axisPointer: {
@ -233,7 +268,7 @@ export default {
},
radar: {
radius: "66%",
center: ["50%", "42%"],
center: ["50%", "50%"],
splitNumber: 8,
splitArea: {
areaStyle: {

47
ruoyi-ui/src/views/dashboard/RadarChart_sh.vue
View File

@ -1,5 +1,9 @@
<template>
<div :class="className" :style="{ height: height, width: width }" />
<div
v-loading="loading"
:class="className"
:style="{ height: height, width: width }"
/>
</template>
<script>
@ -40,6 +44,8 @@ export default {
return {
chart: null,
childId: "",
// 遮罩层
loading: true,
};
},
mounted() {
@ -82,7 +88,7 @@ export default {
await getAssessmentStatisticsmb(this.childId, this.psMsg, 2).then(
(response) => {
let value = [];
let mbvalues=[];
let mbvalues = [];
let len = response.mb;
for (var j = 0; j < len.length; j++) {
// console.log(len[j]);
@ -96,7 +102,7 @@ export default {
mbvalues.push(len[j].max);
value.push(len[j]);
}
this.mbvalues=mbvalues;
this.mbvalues = mbvalues;
this.names = value;
//console.log(this.names);
//console.log(this.values);
@ -104,12 +110,23 @@ export default {
);
},
async initChart() {
this.loading = true;
await this.getData();
await this.getNameData();
this.loading = false;
this.chart = echarts.init(this.$el, "macarons");
if (this.psMsg == "3") {
this.chart.setOption({
title: {
text: "幼儿评估结果-社会",
textStyle: {
fontSize: 14,
lineHeight: 20,
},
top: "top",
left: "center",
},
tooltip: {
trigger: "axis",
axisPointer: {
@ -119,7 +136,7 @@ export default {
},
radar: {
radius: "66%",
center: ["50%", "42%"],
center: ["50%", "50%"],
splitNumber: 8,
splitArea: {
areaStyle: {
@ -167,6 +184,15 @@ export default {
});
} else if (this.psMsg == "2") {
this.chart.setOption({
title: {
text: "幼儿评估结果-社会",
textStyle: {
fontSize: 14,
lineHeight: 20,
},
top: "top",
left: "center",
},
tooltip: {
trigger: "axis",
axisPointer: {
@ -176,7 +202,7 @@ export default {
},
radar: {
radius: "66%",
center: ["50%", "42%"],
center: ["50%", "50%"],
splitNumber: 8,
splitArea: {
areaStyle: {
@ -224,6 +250,15 @@ export default {
});
} else if (this.psMsg == "1") {
this.chart.setOption({
title: {
text: "幼儿评估结果-社会",
textStyle: {
fontSize: 14,
lineHeight: 20,
},
top: "top",
left: "center",
},
tooltip: {
trigger: "axis",
axisPointer: {
@ -233,7 +268,7 @@ export default {
},
radar: {
radius: "66%",
center: ["50%", "42%"],
center: ["50%", "50%"],
splitNumber: 8,
splitArea: {
areaStyle: {

47
ruoyi-ui/src/views/dashboard/RadarChart_ys.vue
View File

@ -1,5 +1,9 @@
<template>
<div :class="className" :style="{ height: height, width: width }" />
<div
v-loading="loading"
:class="className"
:style="{ height: height, width: width }"
/>
</template>
<script>
@ -40,6 +44,8 @@ export default {
return {
chart: null,
childId: "",
// 遮罩层
loading: true,
};
},
mounted() {
@ -82,7 +88,7 @@ export default {
await getAssessmentStatisticsmb(this.childId, this.psMsg, 4).then(
(response) => {
let value = [];
let mbvalues=[];
let mbvalues = [];
let len = response.mb;
for (var j = 0; j < len.length; j++) {
// console.log(len[j]);
@ -96,7 +102,7 @@ export default {
mbvalues.push(len[j].max);
value.push(len[j]);
}
this.mbvalues=mbvalues;
this.mbvalues = mbvalues;
this.names = value;
//console.log(this.names);
//console.log(this.values);
@ -104,12 +110,23 @@ export default {
);
},
async initChart() {
this.loading = true;
await this.getData();
await this.getNameData();
this.loading = false;
this.chart = echarts.init(this.$el, "macarons");
if (this.psMsg == "3") {
this.chart.setOption({
title: {
text: "幼儿评估结果-艺术",
textStyle: {
fontSize: 14,
lineHeight: 20,
},
top: "top",
left: "center",
},
tooltip: {
trigger: "axis",
axisPointer: {
@ -119,7 +136,7 @@ export default {
},
radar: {
radius: "66%",
center: ["50%", "42%"],
center: ["50%", "50%"],
splitNumber: 8,
splitArea: {
areaStyle: {
@ -167,6 +184,15 @@ export default {
});
} else if (this.psMsg == "2") {
this.chart.setOption({
title: {
text: "幼儿评估结果-艺术",
textStyle: {
fontSize: 14,
lineHeight: 20,
},
top: "top",
left: "center",
},
tooltip: {
trigger: "axis",
axisPointer: {
@ -176,7 +202,7 @@ export default {
},
radar: {
radius: "66%",
center: ["50%", "42%"],
center: ["50%", "50%"],
splitNumber: 8,
splitArea: {
areaStyle: {
@ -224,6 +250,15 @@ export default {
});
} else if (this.psMsg == "1") {
this.chart.setOption({
title: {
text: "幼儿评估结果-艺术",
textStyle: {
fontSize: 14,
lineHeight: 20,
},
top: "top",
left: "center",
},
tooltip: {
trigger: "axis",
axisPointer: {
@ -233,7 +268,7 @@ export default {
},
radar: {
radius: "66%",
center: ["50%", "42%"],
center: ["50%", "50%"],
splitNumber: 8,
splitArea: {
areaStyle: {

47
ruoyi-ui/src/views/dashboard/RadarChart_yy.vue
View File

@ -1,5 +1,9 @@
<template>
<div :class="className" :style="{ height: height, width: width }" />
<div
v-loading="loading"
:class="className"
:style="{ height: height, width: width }"
/>
</template>
<script>
@ -40,6 +44,8 @@ export default {
return {
chart: null,
childId: "",
// 遮罩层
loading: true,
};
},
mounted() {
@ -82,7 +88,7 @@ export default {
await getAssessmentStatisticsmb(this.childId, this.psMsg, 1).then(
(response) => {
let value = [];
let mbvalues=[];
let mbvalues = [];
let len = response.mb;
for (var j = 0; j < len.length; j++) {
// console.log(len[j]);
@ -96,7 +102,7 @@ export default {
mbvalues.push(len[j].max);
value.push(len[j]);
}
this.mbvalues=mbvalues;
this.mbvalues = mbvalues;
this.names = value;
//console.log(this.names);
//console.log(this.values);
@ -104,12 +110,23 @@ export default {
);
},
async initChart() {
this.loading = true;
await this.getData();
await this.getNameData();
this.loading = false;
this.chart = echarts.init(this.$el, "macarons");
if (this.psMsg == "3") {
this.chart.setOption({
title: {
text: "幼儿评估结果-语言",
textStyle: {
fontSize: 14,
lineHeight: 20,
},
top: "top",
left: "center",
},
tooltip: {
trigger: "axis",
axisPointer: {
@ -119,7 +136,7 @@ export default {
},
radar: {
radius: "66%",
center: ["50%", "42%"],
center: ["50%", "50%"],
splitNumber: 8,
splitArea: {
areaStyle: {
@ -167,6 +184,15 @@ export default {
});
} else if (this.psMsg == "2") {
this.chart.setOption({
title: {
text: "幼儿评估结果-语言",
textStyle: {
fontSize: 14,
lineHeight: 20,
},
top: "top",
left: "center",
},
tooltip: {
trigger: "axis",
axisPointer: {
@ -176,7 +202,7 @@ export default {
},
radar: {
radius: "66%",
center: ["50%", "42%"],
center: ["50%", "50%"],
splitNumber: 8,
splitArea: {
areaStyle: {
@ -224,6 +250,15 @@ export default {
});
} else if (this.psMsg == "1") {
this.chart.setOption({
title: {
text: "幼儿评估结果-语言",
textStyle: {
fontSize: 14,
lineHeight: 20,
},
top: "top",
left: "center",
},
tooltip: {
trigger: "axis",
axisPointer: {
@ -233,7 +268,7 @@ export default {
},
radar: {
radius: "66%",
center: ["50%", "42%"],
center: ["50%", "50%"],
splitNumber: 8,
splitArea: {
areaStyle: {