修改
This commit is contained in:
辉
parent
0bb93757ed
commit
828fdd5a50
@ -1,50 +1,36 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-form
|
||||
ref="queryForm"
|
||||
size="small"
|
||||
:inline="true"
|
||||
v-show="showSearch"
|
||||
label-width="90px"
|
||||
>
|
||||
<student
|
||||
style="width: 500px; display: inline"
|
||||
@itemlist="itemlists"
|
||||
></student>
|
||||
<el-form ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
|
||||
<student style="width: 500px; display: inline" @itemlist="itemlists"></student>
|
||||
<el-form-item>
|
||||
<el-button
|
||||
type="primary"
|
||||
icon="el-icon-search"
|
||||
size="mini"
|
||||
@click="handleQuery"
|
||||
>查看</el-button
|
||||
>
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查看</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<right-toolbar
|
||||
:showSearch.sync="showSearch"
|
||||
@queryTable="getList"
|
||||
></right-toolbar>
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<el-row v-show="itemshow">
|
||||
<el-col :span="24" class="card-box" style="">
|
||||
<el-col :span="24" class="card-box" style>
|
||||
<el-card>
|
||||
<div style="margin-left: 50px">
|
||||
<span>学校排名:</span
|
||||
<!-- <span>学校排名:</span
|
||||
><span style="margin-left: 20px; margin-right: 20px">{{
|
||||
analysislist.schoolRank
|
||||
}}</span
|
||||
>名 <span style="margin-left: 50px">区域排名:</span
|
||||
><span style="margin-left: 20px; margin-right: 20px">{{
|
||||
>名-->
|
||||
<span style="margin-left: 50px">区域排名:</span>
|
||||
<span style="margin-left: 20px; margin-right: 20px">
|
||||
{{
|
||||
analysislist.areaRank
|
||||
}}</span
|
||||
>名 <span style="margin-left: 50px">区域成绩占比:</span
|
||||
><span style="margin-left: 20px; margin-right: 20px">{{
|
||||
}}
|
||||
</span>名
|
||||
<span style="margin-left: 50px">区域成绩占比:</span>
|
||||
<span style="margin-left: 20px; margin-right: 20px">
|
||||
{{
|
||||
analysislist.areaProportion
|
||||
}}</span
|
||||
>
|
||||
}}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<div slot="header" style="text-align: center; font-size: 25px">
|
||||
@ -61,10 +47,7 @@
|
||||
margin-top: 20px;
|
||||
"
|
||||
>
|
||||
<div
|
||||
class="bar"
|
||||
style="width: 400px; height: 300px; margin: 0 auto"
|
||||
></div>
|
||||
<div class="bar" style="width: 400px; height: 300px; margin: 0 auto"></div>
|
||||
</div>
|
||||
</div>
|
||||
</el-card>
|
||||
@ -75,9 +58,12 @@
|
||||
<el-col :span="24" :offset="0">
|
||||
<el-card>
|
||||
<div slot="header" style="text-align: center">
|
||||
<img style="width: 40px" src="@/icons/笑脸.png" alt="" />
|
||||
<img style="width: 40px" src="@/icons/笑脸.png" alt />
|
||||
|
||||
<div><!-- card title -->该学生此批次暂没数据</div>
|
||||
<div>
|
||||
<!-- card title -->
|
||||
该学生此批次暂没数据
|
||||
</div>
|
||||
</div>
|
||||
<!-- card body -->
|
||||
</el-card>
|
||||
@ -93,7 +79,7 @@ import { constitution } from "@/api/system/constitution";
|
||||
export default {
|
||||
name: "constitution",
|
||||
components: {
|
||||
student,
|
||||
student
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
@ -106,8 +92,8 @@ export default {
|
||||
//查询传值
|
||||
analysisqueryParams: {
|
||||
studentId: "",
|
||||
batchCode: "",
|
||||
},
|
||||
batchCode: ""
|
||||
}
|
||||
};
|
||||
},
|
||||
mounted() {},
|
||||
@ -128,7 +114,7 @@ export default {
|
||||
var ydata = [
|
||||
this.analysislist.itemScoreList[i].itemScore,
|
||||
this.analysislist.itemScoreList[i].schoolAvgScore,
|
||||
this.analysislist.itemScoreList[i].cityAvgScore,
|
||||
this.analysislist.itemScoreList[i].cityAvgScore
|
||||
];
|
||||
var textname = this.analysislist.itemScoreList[i].itemName;
|
||||
var myChart = echarts.init(myEchart[i]);
|
||||
@ -136,31 +122,31 @@ export default {
|
||||
title: {
|
||||
text: textname,
|
||||
subtext: "",
|
||||
left: "50%",
|
||||
left: "50%"
|
||||
},
|
||||
tooltip: {
|
||||
trigger: "axis",
|
||||
axisPointer: {
|
||||
type: "shadow",
|
||||
type: "shadow"
|
||||
},
|
||||
formatter: function (params) {
|
||||
formatter: function(params) {
|
||||
var tar = params[1];
|
||||
return tar.name + "<br/>" + tar.seriesName + " : " + tar.value;
|
||||
},
|
||||
}
|
||||
},
|
||||
grid: {
|
||||
left: "3%",
|
||||
right: "4%",
|
||||
bottom: "3%",
|
||||
containLabel: true,
|
||||
containLabel: true
|
||||
},
|
||||
xAxis: {
|
||||
type: "category",
|
||||
splitLine: { show: false },
|
||||
data: this.analysislist.itemStudentList,
|
||||
data: this.analysislist.itemStudentList
|
||||
},
|
||||
yAxis: {
|
||||
type: "value",
|
||||
type: "value"
|
||||
},
|
||||
series: [
|
||||
{
|
||||
@ -169,15 +155,15 @@ export default {
|
||||
stack: "Total",
|
||||
itemStyle: {
|
||||
borderColor: "blue",
|
||||
color: "blue",
|
||||
color: "blue"
|
||||
},
|
||||
emphasis: {
|
||||
itemStyle: {
|
||||
borderColor: "transparent",
|
||||
color: "transparent",
|
||||
},
|
||||
color: "transparent"
|
||||
}
|
||||
},
|
||||
data: [0, 0, 0],
|
||||
data: [0, 0, 0]
|
||||
},
|
||||
{
|
||||
name: "分数",
|
||||
@ -187,31 +173,31 @@ export default {
|
||||
barWidth: 35,
|
||||
label: {
|
||||
show: true,
|
||||
position: "inside",
|
||||
position: "inside"
|
||||
},
|
||||
itemStyle: {
|
||||
normal: {
|
||||
color: function (colors) {
|
||||
color: function(colors) {
|
||||
var colorList = [
|
||||
"#91cd77",
|
||||
"#5470c6",
|
||||
"#fc8251",
|
||||
"#ef6567",
|
||||
"#f9c956",
|
||||
"#75bedc",
|
||||
"#75bedc"
|
||||
];
|
||||
return colorList[i];
|
||||
},
|
||||
},
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
// itemStyle: {
|
||||
// borderColor: "#94D8F6",
|
||||
// color: "#94D8F6",
|
||||
// },
|
||||
data: ydata,
|
||||
},
|
||||
],
|
||||
data: ydata
|
||||
}
|
||||
]
|
||||
};
|
||||
|
||||
myChart.setOption(option);
|
||||
@ -221,7 +207,7 @@ export default {
|
||||
},
|
||||
//综合体质分析
|
||||
analysislists() {
|
||||
constitution(this.analysisqueryParams).then((res) => {
|
||||
constitution(this.analysisqueryParams).then(res => {
|
||||
if (!res.data || res.data == "") {
|
||||
this.itemshow2 = true;
|
||||
this.itemshow = false;
|
||||
@ -237,7 +223,7 @@ export default {
|
||||
},
|
||||
getList() {
|
||||
//用户权限
|
||||
getRoleInfo().then((res) => {
|
||||
getRoleInfo().then(res => {
|
||||
this.classqueryParams.kindergartenId = res.data.kindergartenId;
|
||||
var user = res.data.roleKeys;
|
||||
if (user.includes("enchou")) {
|
||||
@ -253,8 +239,8 @@ export default {
|
||||
reset() {
|
||||
this.form = {};
|
||||
this.resetForm("form");
|
||||
},
|
||||
},
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
<style scoped='scss'>
|
||||
|
||||
@ -139,7 +139,13 @@
|
||||
/>
|
||||
|
||||
<!-- 修改幼儿园检测报告对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="1350px" append-to-body>
|
||||
<el-dialog
|
||||
:title="title"
|
||||
:visible.sync="open"
|
||||
width="1350px"
|
||||
append-to-body
|
||||
:before-close="cancel"
|
||||
>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
|
||||
<el-form-item label="审核状态" prop="checkStatus">
|
||||
<el-radio-group v-model="form.checkStatus">
|
||||
@ -148,7 +154,12 @@
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<div style="height: 550px; overflow: auto">
|
||||
<kindergartenEcharts v-if="open" :itemlists="itemlist" class="personal"></kindergartenEcharts>
|
||||
<kindergartenEcharts
|
||||
v-if="open"
|
||||
:itemlists="itemlist"
|
||||
class="personal"
|
||||
@handtrue="handtrue"
|
||||
></kindergartenEcharts>
|
||||
</div>
|
||||
<!-- <el-form-item label="幼儿园名称" prop="kindergartenName">
|
||||
<el-input v-model="form.kindergartenName" />
|
||||
@ -164,11 +175,13 @@
|
||||
</el-form-item>-->
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||
<el-button type="primary" @click.native.prevent="submitForm" :loading="handtrueloading">
|
||||
<span v-if="!handtrueloading">确 定</span>
|
||||
<span v-else>加 载 中...</span>
|
||||
</el-button>
|
||||
<el-button @click="cancel">取 消</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog :visible.sync="openiframe" width="1350px" append-to-body>
|
||||
<div style="height: 680px; overflow: auto">
|
||||
<kindergartenEcharts :itemlists="itemlist" class="personal" v-if="openiframe"></kindergartenEcharts>
|
||||
@ -318,6 +331,7 @@ export default {
|
||||
data() {
|
||||
return {
|
||||
//itemlist
|
||||
handtrueloading: true,
|
||||
itemlist: {
|
||||
kindergartenId: "",
|
||||
batchCode: "",
|
||||
@ -413,6 +427,11 @@ export default {
|
||||
this.info();
|
||||
},
|
||||
methods: {
|
||||
handtrue(e) {
|
||||
setTimeout(() => {
|
||||
this.handtrueloading = e;
|
||||
}, 1000);
|
||||
},
|
||||
/** 查询幼儿园检测报告列表 */
|
||||
info() {
|
||||
this.loading = true;
|
||||
@ -489,6 +508,7 @@ export default {
|
||||
},
|
||||
/** 审核按钮操作 */
|
||||
handleUpdate(item) {
|
||||
this.handtrueloading = true;
|
||||
this.itemlist.kindergartenId = item.kindergartenId;
|
||||
this.itemlist.batchCode = item.batchCode;
|
||||
this.itemlist.number++;
|
||||
|
||||
@ -731,13 +731,6 @@ export default {
|
||||
},
|
||||
mounted() {
|
||||
this.classinfo();
|
||||
this.getList();
|
||||
this.classtype();
|
||||
this.KindergartenPhysicalTestinfo();
|
||||
this.StudentListinfo();
|
||||
this.heightAndWeightinfo();
|
||||
this.physiqueinfoFEMALE();
|
||||
this.physiqueinfoMALE();
|
||||
},
|
||||
// watch: {
|
||||
// itemlists: {
|
||||
@ -1011,6 +1004,7 @@ export default {
|
||||
setTimeout(() => {
|
||||
this.echartslist.studentSex = "FEMALE";
|
||||
physiqueanalysis(this.echartslist).then(res => {
|
||||
this.$emit("handtrue", false);
|
||||
if (res.data == [] || !res.data) {
|
||||
this.FEMALE = false;
|
||||
} else {
|
||||
@ -1135,6 +1129,7 @@ export default {
|
||||
setTimeout(() => {
|
||||
this.echartslist.studentSex = "MALE";
|
||||
physiqueanalysis(this.echartslist).then(res => {
|
||||
this.physiqueinfoMALE();
|
||||
if (res.data == [] || !res.data) {
|
||||
this.MALE = false;
|
||||
} else {
|
||||
@ -1256,6 +1251,7 @@ export default {
|
||||
heightAndWeightinfo() {
|
||||
setTimeout(() => {
|
||||
heightAndWeightanalysis(this.echartslist).then(res => {
|
||||
this.physiqueinfoFEMALE();
|
||||
if (!res.data) {
|
||||
this.heightAndWeightshow = false;
|
||||
} else {
|
||||
@ -1508,6 +1504,7 @@ export default {
|
||||
StudentListinfo() {
|
||||
setTimeout(() => {
|
||||
StudentList(this.echartslist).then(res => {
|
||||
this.heightAndWeightinfo();
|
||||
if (res.data.testAllStudentScoreVOList != null) {
|
||||
this.studentlist = res.data.testAllStudentScoreVOList;
|
||||
}
|
||||
@ -1828,6 +1825,7 @@ export default {
|
||||
KindergartenPhysicalTestinfo() {
|
||||
this.KindergartenPhysicalTestlist = {};
|
||||
KindergartenPhysicalTestanalysis(this.echartslist).then(res => {
|
||||
this.StudentListinfo();
|
||||
if (res.data == [] || !res.data) {
|
||||
this.KindergartenPhysicalTestshow = false;
|
||||
} else {
|
||||
@ -2078,6 +2076,7 @@ export default {
|
||||
tKindergartenInfo(this.kindergartenType).then(res => {
|
||||
this.type = res.data[0];
|
||||
this.type2 = res.data[1];
|
||||
this.classtype();
|
||||
});
|
||||
},
|
||||
//班级类型
|
||||
@ -2092,6 +2091,7 @@ export default {
|
||||
this.classtypelist.push(obj);
|
||||
});
|
||||
this.developmentinfo();
|
||||
this.KindergartenPhysicalTestinfo();
|
||||
});
|
||||
},
|
||||
//班级list
|
||||
@ -2099,6 +2099,7 @@ export default {
|
||||
listClassinfo(this.echartslist).then(response => {
|
||||
this.classList = response.rows;
|
||||
this.ClassListinfo();
|
||||
this.getList();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@ -421,10 +421,13 @@
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div style="height: 550px; overflow: auto">
|
||||
<personalecharts v-if="open" :itemlists="itemlist" class="personal"></personalecharts>
|
||||
<personalecharts v-if="open" :itemlists="itemlist" class="personal" @handtrue="handtrue"></personalecharts>
|
||||
</div>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||
<el-button type="primary" @click.native.prevent="submitForm" :loading="handtrueloading">
|
||||
<span v-if="!handtrueloading">确 定</span>
|
||||
<span v-else>加 载 中...</span>
|
||||
</el-button>
|
||||
<el-button @click="cancel">取 消</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
@ -460,6 +463,7 @@ export default {
|
||||
name: "PersonalCheckReport",
|
||||
data() {
|
||||
return {
|
||||
handtrueloading: true,
|
||||
total1: 0,
|
||||
total2: 0,
|
||||
total3: 0,
|
||||
@ -609,6 +613,11 @@ export default {
|
||||
this.listKindergartenInfoetList();
|
||||
},
|
||||
methods: {
|
||||
handtrue(e) {
|
||||
setTimeout(() => {
|
||||
this.handtrueloading = e;
|
||||
}, 1000);
|
||||
},
|
||||
//预览
|
||||
lookhand(item) {
|
||||
this.itemlist.studentId = item.studentId;
|
||||
@ -667,6 +676,7 @@ export default {
|
||||
},
|
||||
/** 审核按钮操作 */
|
||||
handleUpdate(row) {
|
||||
this.handtrueloading = true;
|
||||
this.itemlist.studentId = row.studentId;
|
||||
this.itemlist.batchCode = row.batchCode;
|
||||
this.itemlist.number++;
|
||||
|
||||
@ -996,12 +996,12 @@
|
||||
<el-col :span="24" class="card-box" style>
|
||||
<el-card>
|
||||
<div style="margin-left: 50px">
|
||||
<span>学校排名:</span>
|
||||
<!-- <span>学校排名:</span>
|
||||
<span style="margin-left: 20px; margin-right: 20px">
|
||||
{{
|
||||
constitutionlist.schoolRank
|
||||
}}
|
||||
</span>名
|
||||
</span>名-->
|
||||
<span style="margin-left: 50px">区域排名:</span>
|
||||
<span style="margin-left: 20px; margin-right: 20px">
|
||||
{{
|
||||
@ -1126,11 +1126,6 @@ export default {
|
||||
mounted() {
|
||||
this.constitutionlist = [];
|
||||
this.comprehensive();
|
||||
this.shape();
|
||||
this.quality();
|
||||
this.constitutioninfo();
|
||||
this.listActioninfo();
|
||||
this.select();
|
||||
},
|
||||
// watch: {
|
||||
// itemlists: {
|
||||
@ -1236,6 +1231,7 @@ export default {
|
||||
this.selectposition4 = index; // 标记位置 设置为当前位置
|
||||
}
|
||||
}
|
||||
this.$emit("handtrue", false);
|
||||
});
|
||||
},
|
||||
selectlistMethod({ row, column, rowIndex, columnIndex }) {
|
||||
@ -1275,6 +1271,7 @@ export default {
|
||||
//综合体质分析素质 comprehensive
|
||||
comprehensive() {
|
||||
synthesize(this.echartslist).then(res => {
|
||||
this.shape();
|
||||
if (res.data == [] || !res.data) {
|
||||
} else {
|
||||
this.sythesizestudent = res.data;
|
||||
@ -1368,6 +1365,7 @@ export default {
|
||||
shape() {
|
||||
setTimeout(() => {
|
||||
analysis(this.echartslist).then(res => {
|
||||
this.quality();
|
||||
if (!res.data || res.data == "") {
|
||||
this.shapeshow = false;
|
||||
} else if (
|
||||
@ -1457,6 +1455,7 @@ export default {
|
||||
quality() {
|
||||
setTimeout(() => {
|
||||
testBodyScoreInfo(this.echartslist).then(res => {
|
||||
this.constitutioninfo();
|
||||
if (!res.rows || res.rows == "" || res.rows == []) {
|
||||
this.qualityshow = false;
|
||||
} else {
|
||||
@ -1470,6 +1469,7 @@ export default {
|
||||
constitutioninfo() {
|
||||
setTimeout(() => {
|
||||
constitution(this.echartslist).then(res => {
|
||||
this.listActioninfo();
|
||||
this.constitutionlist = res.data;
|
||||
if (!res.data || res.data == "") {
|
||||
this.constitutionshow = false;
|
||||
@ -1700,6 +1700,7 @@ export default {
|
||||
listActioninfo() {
|
||||
setTimeout(() => {
|
||||
listAction(this.echartslist).then(res => {
|
||||
this.select();
|
||||
this.spanArr = [];
|
||||
this.position = 0;
|
||||
this.spanArr2 = [];
|
||||
|
||||
Loading…
Reference in New Issue
Block a user