xinyilu/KindergartenUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
辉 2023-07-20 11:32:59 +08:00
parent 1251cf0714
commit 24c84b8fe6
15 changed files with 746 additions and 1224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/api/baseurl.js
View File

@ -1,3 +0,0 @@
var baseurl = "http://192.168.16.76:8090";
export default baseurl

202
src/views/system/KindergartenPhysicalTest/index.vue
View File

@ -1,62 +1,46 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form <el-form ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
ref="queryForm" <kindergarten @kinbatlist="kinbatlist" style="width: 500px; display: inline"></kindergarten>
size="small"
:inline="true"
v-show="showSearch"
label-width="90px"
>
<kindergarten
@kinbatlist="kinbatlist"
style="width: 500px; display: inline"
></kindergarten>
<el-form-item> <el-form-item>
<el-button <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查看</el-button>
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>查看</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<right-toolbar <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row> </el-row>
<el-row v-show="itemshow"> <el-row v-show="itemshow">
<el-col :span="24" class="card-box" style=""> <el-col :span="24" class="card-box" style>
<el-card> <el-card>
<div slot="header" style="text-align: center; font-size: 20px"> <div slot="header" style="text-align: center; font-size: 20px">
<span>体测达标分析</span> <span>体测达标分析</span>
</div> </div>
<div style="margin-left: 50px; text-align: center; margin-top: 20px"> <div style="margin-left: 50px; text-align: center; margin-top: 20px">
<span>幼儿园名称:</span <span>幼儿园名称:</span>
><span style="margin-left: 20px; margin-right: 10px">{{ <span style="margin-left: 20px; margin-right: 10px">
{{
analysislist.kindergartenName analysislist.kindergartenName
}}</span> }}
</span>
<span style="margin-left: 50px">幼儿园性质:</span <span style="margin-left: 50px">幼儿园性质:</span>
><span style="margin-left: 20px; margin-right: 20px">{{ <span style="margin-left: 20px; margin-right: 20px">
{{
analysislist.kindergartenType == type.dictValue analysislist.kindergartenType == type.dictValue
? type.dictLabel ? type.dictLabel
: type2.dictLabel : type2.dictLabel
}}</span> }}
</span>
<span style="margin-left: 50px">参与体测人数:</span <span style="margin-left: 50px">参与体测人数:</span>
><span style="margin-left: 20px">{{ <span style="margin-left: 20px">
{{
analysislist.testItemStudentCount analysislist.testItemStudentCount
}}</span }}
>人 </span>
人
<div style="display: flex; margin-top: 40px"> <div style="display: flex; margin-top: 40px">
<div <div slot="header" style="width: 50%; text-align: center; font-size: 18px">
slot="header"
style="width: 50%; text-align: center; font-size: 18px"
>
<span class="title">本园参加体测各年龄阶段人数分部</span> <span class="title">本园参加体测各年龄阶段人数分部</span>
<div <div
id="main" id="main"
@ -78,17 +62,16 @@
position: relative; position: relative;
" "
> >
<span class="title">本园体测成绩达标率(%)</span> <span class="title">国民体质测定达标率(%)</span>
<span> <span>
<span <span
style=" style="
position: absolute; position: absolute;
top: 58%; top: 58%;
left: 47.5%; left: 46.5%;
font-size: 25px; font-size: 25px;
" "
>{{ analysislist.standardRate }}%</span >{{ analysislist.standardRate }}%</span>
>
<span <span
style=" style="
position: absolute; position: absolute;
@ -96,8 +79,7 @@
left: 46.5%; left: 46.5%;
font-size: 16px; font-size: 16px;
" "
>达标率</span >达标率</span>
>
</span> </span>
<div <div
id="main2" id="main2"
@ -119,9 +101,12 @@
<el-col :span="24" :offset="0"> <el-col :span="24" :offset="0">
<el-card> <el-card>
<div slot="header" style="text-align: center"> <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> </div>
<!-- card body --> <!-- card body -->
</el-card> </el-card>
@ -152,10 +137,10 @@ export default {
//查询传值 //查询传值
analysisqueryParams: { analysisqueryParams: {
kindergartenId: "", kindergartenId: "",
batchCode: "", batchCode: ""
// kindergartenId: "18", // kindergartenId: "18",
// batchCode: "PC202208030005", // batchCode: "PC202208030005",
}, }
}; };
}, },
mounted() {}, mounted() {},
@ -175,7 +160,7 @@ export default {
}, },
analysisinfo() { analysisinfo() {
KindergartenPhysicalTestanalysis(this.analysisqueryParams).then((res) => { KindergartenPhysicalTestanalysis(this.analysisqueryParams).then(res => {
if (res.data == [] || !res.data) { if (res.data == [] || !res.data) {
this.itemshow2 = true; this.itemshow2 = true;
this.itemshow = false; this.itemshow = false;
@ -200,37 +185,37 @@ export default {
"insideTopLeft", "insideTopLeft",
"insideTopRight", "insideTopRight",
"insideBottomLeft", "insideBottomLeft",
"insideBottomRight", "insideBottomRight"
]; ];
app.configParameters = { app.configParameters = {
rotate: { rotate: {
min: 0, min: 0,
max: 90, max: 90
}, },
align: { align: {
options: { options: {
left: "left", left: "left",
center: "center", center: "center",
right: "right", right: "right"
}, }
}, },
verticalAlign: { verticalAlign: {
options: { options: {
top: "top", top: "top",
middle: "middle", middle: "middle",
bottom: "bottom", bottom: "bottom"
}, }
}, },
position: { position: {
options: posList.reduce(function (map, pos) { options: posList.reduce(function(map, pos) {
map[pos] = pos; map[pos] = pos;
return map; return map;
}, {}), }, {})
}, },
distance: { distance: {
min: 0, min: 0,
max: 100, max: 100
}, }
}; };
app.config = { app.config = {
rotate: 0, rotate: 0,
@ -238,31 +223,31 @@ export default {
verticalAlign: "middle", verticalAlign: "middle",
position: "top", position: "top",
distance: 15, distance: 15,
onChange: function () { onChange: function() {
const labelOption = { const labelOption = {
rotate: app.config.rotate, rotate: app.config.rotate,
align: app.config.align, align: app.config.align,
verticalAlign: app.config.verticalAlign, verticalAlign: app.config.verticalAlign,
position: app.config.position, position: app.config.position,
distance: app.config.distance, distance: app.config.distance
}; };
myChart.setOption({ myChart.setOption({
series: [ series: [
{ {
label: labelOption, label: labelOption
}, },
{ {
label: labelOption, label: labelOption
}, },
{ {
label: labelOption, label: labelOption
}, },
{ {
label: labelOption, label: labelOption
}, }
], ]
}); });
}, }
}; };
const labelOption = { const labelOption = {
show: true, show: true,
@ -274,30 +259,30 @@ export default {
formatter: "{c}", formatter: "{c}",
fontSize: 16, fontSize: 16,
rich: { rich: {
name: {}, name: {}
}, }
}; };
option = { option = {
tooltip: { tooltip: {
trigger: "axis", trigger: "axis",
axisPointer: { axisPointer: {
type: "shadow", type: "shadow"
}, }
}, },
legend: { legend: {
data: ["男", "女"], data: ["男", "女"]
}, },
xAxis: [ xAxis: [
{ {
type: "category", type: "category",
axisTick: { show: false }, axisTick: { show: false },
data: ["3-4岁", "4-5岁", "5-6岁", "6岁以上"], data: ["3-4岁", "4-5岁", "5-6岁", "6岁以上"]
}, }
], ],
yAxis: [ yAxis: [
{ {
type: "value", type: "value"
}, }
], ],
series: [ series: [
{ {
@ -307,14 +292,14 @@ export default {
color: "#60C5F1", color: "#60C5F1",
label: labelOption, label: labelOption,
emphasis: { emphasis: {
focus: "series", focus: "series"
}, },
data: [ data: [
this.analysislist.threeAndFourMaleCount, this.analysislist.threeAndFourMaleCount,
this.analysislist.fourAndFiveMaleCount, this.analysislist.fourAndFiveMaleCount,
this.analysislist.fiveAndSixMaleCount, this.analysislist.fiveAndSixMaleCount,
this.analysislist.sixAndMoreMaleCount, this.analysislist.sixAndMoreMaleCount
], ]
}, },
{ {
name: "女", name: "女",
@ -322,16 +307,16 @@ export default {
color: "#98E0AD", color: "#98E0AD",
label: labelOption, label: labelOption,
emphasis: { emphasis: {
focus: "series", focus: "series"
}, },
data: [ data: [
this.analysislist.threeAndFourFeMaleCount, this.analysislist.threeAndFourFeMaleCount,
this.analysislist.fourAndFiveFeMaleCount, this.analysislist.fourAndFiveFeMaleCount,
this.analysislist.fiveAndSixFeMaleCount, this.analysislist.fiveAndSixFeMaleCount,
this.analysislist.sixAndMoreFeMaleCount, this.analysislist.sixAndMoreFeMaleCount
], ]
}, }
], ]
}; };
option && myChart.setOption(option); option && myChart.setOption(option);
@ -347,11 +332,11 @@ export default {
option2 = { option2 = {
tooltip: { tooltip: {
trigger: "item", trigger: "item"
}, },
legend: { legend: {
top: "5%", top: "5%",
left: "center", left: "center"
}, },
series: [ series: [
{ {
@ -361,21 +346,21 @@ export default {
label: { label: {
show: true, show: true,
formatter: "{d}%", //只要百分比 formatter: "{d}%", //只要百分比
position: "inside", position: "inside"
}, },
labelLine: { show: true }, labelLine: { show: true },
color: function (colors) { color: function(colors) {
var colorList = [ var colorList = [
"#5470c6", "#5470c6",
"#fc8251", "#fc8251",
"#91cd77", "#91cd77",
"#ef6567", "#ef6567",
"#f9c956", "#f9c956",
"#75bedc", "#75bedc"
]; ];
return colorList[colors.dataIndex]; return colorList[colors.dataIndex];
}, }
}, }
}, },
name: "", name: "",
type: "pie", type: "pie",
@ -383,36 +368,37 @@ export default {
avoidLabelOverlap: false, avoidLabelOverlap: false,
label: { label: {
show: false, show: false,
position: "center", position: "center"
}, },
emphasis: { emphasis: {
label: { label: {
show: false, show: false,
fontSize: "20", fontSize: "20",
fontWeight: "bold", fontWeight: "bold"
}, }
}, },
labelLine: { labelLine: {
show: false, show: false
}, },
data: [ data: [
{ value: this.analysislist.excellentRate, name: ">80优秀" }, { value: this.analysislist.excellentRate, name: ">31(优秀)" },
{ value: this.analysislist.qualifyRate, name: "60-80合格" }, { value: this.analysislist.qualifyRate, name: "28-31(良好)" },
{ value: this.analysislist.unQualifyRate, name: "<60不合格" }, { value: this.analysislist.unQualifyRate, name: "20-27(合格)" },
], { value: this.analysislist.unQualifyRate, name: "<20(不合格)" }
}, ]
], }
]
}; };
option2 && myChart.setOption(option2); option2 && myChart.setOption(option2);
}, },
getList() { getList() {
tKindergartenInfo(this.kindergartenType).then((res) => { tKindergartenInfo(this.kindergartenType).then(res => {
this.type = res.data[0]; this.type = res.data[0];
this.type2 = res.data[1]; this.type2 = res.data[1];
}); });
//用户权限 //用户权限
getRoleInfo().then((res) => { getRoleInfo().then(res => {
var user = res.data.roleKeys; var user = res.data.roleKeys;
if (user.includes("enchou")) { if (user.includes("enchou")) {
return; return;
@ -427,8 +413,8 @@ export default {
reset() { reset() {
this.form = {}; this.form = {};
this.resetForm("form"); this.resetForm("form");
}, }
}, }
}; };
</script> </script>
<style scoped='scss'> <style scoped='scss'>

109
src/views/system/action/index.vue
View File

@ -1,32 +1,14 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form <el-form ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
ref="queryForm" <student style="width: 500px; display: inline" @itemlist="itemlists"></student>
size="small"
:inline="true"
v-show="showSearch"
label-width="90px"
>
<student
style="width: 500px; display: inline"
@itemlist="itemlists"
></student>
<el-form-item> <el-form-item>
<el-button <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查看</el-button>
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>查看</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<right-toolbar <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row> </el-row>
<el-row :gutter="24"> <el-row :gutter="24">
<div v-if="itemshow" style="margin: 10px auto; width: 100%"> <div v-if="itemshow" style="margin: 10px auto; width: 100%">
@ -36,23 +18,11 @@
:span-method="arraySpanMethod" :span-method="arraySpanMethod"
style="width: 95%; margin: 0 auto" style="width: 95%; margin: 0 auto"
> >
<el-table-column prop="categoryName" label="测试分类" align="center"> <el-table-column prop="categoryName" label="测试分类" align="center"></el-table-column>
</el-table-column> <el-table-column prop="itemName" label="测试项目" align="center"></el-table-column>
<el-table-column prop="itemName" label="测试项目" align="center"> <el-table-column prop="itemFraction" label="动作技能总分" align="center"></el-table-column>
</el-table-column> <el-table-column prop="unifiedStandardScore" label="统一最高得分" align="center"></el-table-column>
<el-table-column <!-- <el-table-column
prop="itemFraction"
label="动作技能总分"
align="center"
>
</el-table-column>
<el-table-column
prop="unifiedStandardScore"
label="统一最高得分"
align="center"
>
</el-table-column>
<el-table-column
prop="smallStandardScore" prop="smallStandardScore"
label="小班最高得分" label="小班最高得分"
align="center" align="center"
@ -69,34 +39,12 @@
label="大班最高得分" label="大班最高得分"
align="center" align="center"
> >
</el-table-column> </el-table-column>-->
<el-table-column prop="itemScoreAll" label="综合得分" align="center"> <el-table-column prop="itemScoreAll" label="综合得分" align="center"></el-table-column>
</el-table-column> <el-table-column prop="rootCategoryScoreAll" label="国民体质测定总得分" align="center"></el-table-column>
<el-table-column <el-table-column prop="nationalPhysiqueRank" label="国民体质测定等级" align="center"></el-table-column>
prop="rootCategoryScoreAll" <el-table-column prop="remark" label="测试目的" align="center"></el-table-column>
label="国民体质测定总得分" <el-table-column prop="syntheticalAssess" label="备注" align="center"></el-table-column>
align="center"
>
</el-table-column>
<el-table-column
prop="nationalPhysiqueRank"
label="国民体质测定等级"
align="center"
>
</el-table-column>
<el-table-column
prop="syntheticalAssess"
label="综合评价"
align="center"
>
</el-table-column>
<el-table-column
prop="remark"
label="测试目的"
align="center"
show-overflow-tooltip
>
</el-table-column>
</el-table> </el-table>
</div> </div>
</el-row> </el-row>
@ -104,9 +52,12 @@
<el-col :span="24" :offset="0"> <el-col :span="24" :offset="0">
<el-card> <el-card>
<div slot="header" style="text-align: center"> <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> </div>
<!-- card body --> <!-- card body -->
</el-card> </el-card>
@ -144,8 +95,8 @@ export default {
// studentId: "10", // studentId: "10",
// batchCode: "PC202208030005", // batchCode: "PC202208030005",
studentId: "", studentId: "",
batchCode: "", batchCode: ""
}, }
}; };
}, },
created() {}, created() {},
@ -225,7 +176,7 @@ export default {
const _col = _row > 0 ? 1 : 0; const _col = _row > 0 ? 1 : 0;
return { return {
rowspan: _row, rowspan: _row,
colspan: _col, colspan: _col
}; };
} }
if (columnIndex == 7) { if (columnIndex == 7) {
@ -233,7 +184,7 @@ export default {
const _col = _row > 0 ? 1 : 0; const _col = _row > 0 ? 1 : 0;
return { return {
rowspan: _row, rowspan: _row,
colspan: _col, colspan: _col
}; };
} }
if (columnIndex == 8) { if (columnIndex == 8) {
@ -241,7 +192,7 @@ export default {
const _col = _row > 0 ? 1 : 0; const _col = _row > 0 ? 1 : 0;
return { return {
rowspan: _row, rowspan: _row,
colspan: _col, colspan: _col
}; };
} }
if (columnIndex == 9) { if (columnIndex == 9) {
@ -249,13 +200,13 @@ export default {
const _col = _row > 0 ? 1 : 0; const _col = _row > 0 ? 1 : 0;
return { return {
rowspan: _row, rowspan: _row,
colspan: _col, colspan: _col
}; };
} }
}, },
//动作发展检测 //动作发展检测
listActioninfo() { listActioninfo() {
listAction(this.queryParams).then((res) => { listAction(this.queryParams).then(res => {
this.spanArr = []; this.spanArr = [];
this.position = 0; this.position = 0;
this.spanArr2 = []; this.spanArr2 = [];
@ -301,7 +252,7 @@ export default {
getList() { getList() {
//用户权限 //用户权限
getRoleInfo().then((res) => { getRoleInfo().then(res => {
this.classqueryParams.kindergartenId = res.data.kindergartenId; this.classqueryParams.kindergartenId = res.data.kindergartenId;
var user = res.data.roleKeys; var user = res.data.roleKeys;
if (user.includes("enchou")) { if (user.includes("enchou")) {
@ -317,8 +268,8 @@ export default {
reset() { reset() {
this.form = {}; this.form = {};
this.resetForm("form"); this.resetForm("form");
}, }
}, }
}; };
</script> </script>
<style scoped='scss'> <style scoped='scss'>

219
src/views/system/classconstitution/index.vue
View File

@ -1,48 +1,27 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form <el-form ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
ref="queryForm" <kindergarten @kinbatlist="kinbatlist" style="width: 500px; display: inline"></kindergarten>
size="small"
:inline="true"
v-show="showSearch"
label-width="90px"
>
<kindergarten
@kinbatlist="kinbatlist"
style="width: 500px; display: inline"
></kindergarten>
<el-form-item label="所属班级" prop="categoryName" label-width="70px"> <el-form-item label="所属班级" prop="categoryName" label-width="70px">
<el-button <el-button
@click="classshowclick" @click="classshowclick"
style="width: 250px; text-align: left; height: 32px; color: #c0c4cc" style="width: 250px; text-align: left; height: 32px; color: #c0c4cc"
v-if="className == '请选择班级'" v-if="className == '请选择班级'"
>{{ className }}</el-button >{{ className }}</el-button>
>
<el-button <el-button
@click="classshowclick" @click="classshowclick"
style="width: 250px; text-align: left; height: 32px" style="width: 250px; text-align: left; height: 32px"
v-else v-else
>{{ className }}</el-button >{{ className }}</el-button>
>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查看</el-button>
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>查看</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<right-toolbar <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row> </el-row>
<!-- //班级 --> <!-- //班级 -->
<el-dialog <el-dialog
width="1000px" width="1000px"
@ -74,25 +53,9 @@
></el-button> ></el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column property="kindergartenName" label="幼儿园名称" width="190" align="center" />
property="kindergartenName" <el-table-column property="className" label="班级名称" width="180" align="center"></el-table-column>
label="幼儿园名称" <el-table-column property="classType" label="班级类型" width="160" align="center">
width="190"
align="center"
/>
<el-table-column
property="className"
label="班级名称"
width="180"
align="center"
>
</el-table-column>
<el-table-column
property="classType"
label="班级类型"
width="160"
align="center"
>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.classType == dictValue1 ? "大班" : "" }} {{ scope.row.classType == dictValue1 ? "大班" : "" }}
{{ scope.row.classType == dictValue2 ? "中班" : "" }} {{ scope.row.classType == dictValue2 ? "中班" : "" }}
@ -101,20 +64,8 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column property="classTeacher" label="班主任姓名" width="180" align="center"></el-table-column>
property="classTeacher" <el-table-column property="phone" label="联系电话" width="190" align="center"></el-table-column>
label="班主任姓名"
width="180"
align="center"
>
</el-table-column>
<el-table-column
property="phone"
label="联系电话"
width="190"
align="center"
>
</el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total2 > 0" v-show="total2 > 0"
@ -124,7 +75,6 @@
@pagination="classinfo" @pagination="classinfo"
/> />
</el-dialog> </el-dialog>
<el-row v-show="itemshow"> <el-row v-show="itemshow">
<el-col :span="24" :offset="0"> <el-col :span="24" :offset="0">
<div style="margin: 0 auto; width: 1000px"> <div style="margin: 0 auto; width: 1000px">
@ -146,11 +96,8 @@
border: 1px solid #f0f0f0; border: 1px solid #f0f0f0;
background: #f5f7fa; background: #f5f7fa;
" "
> >年龄</div>
年龄
</div>
</div> </div>
<div> <div>
<div <div
style=" style="
@ -158,11 +105,8 @@
border: 1px solid #f0f0f0; border: 1px solid #f0f0f0;
background: #f5f7fa; background: #f5f7fa;
" "
> >平均总分</div>
平均总分
</div>
</div> </div>
<div v-for="item in categoryTableNameList" :key="item.prentId"> <div v-for="item in categoryTableNameList" :key="item.prentId">
<div <div
style=" style="
@ -171,9 +115,7 @@
border: 1px solid #f0f0f0; border: 1px solid #f0f0f0;
background: #f5f7fa; background: #f5f7fa;
" "
> >{{ item.parentName }}</div>
{{ item.parentName }}
</div>
<div <div
style=" style="
display: flex; display: flex;
@ -187,9 +129,7 @@
v-for="uitem in item.childrenTableNameList" v-for="uitem in item.childrenTableNameList"
:key="uitem.categoryId" :key="uitem.categoryId"
style="width: 120px" style="width: 120px"
> >{{ uitem.categoryName }}</div>
{{ uitem.categoryName }}
</div>
</div> </div>
</div> </div>
</div> </div>
@ -205,14 +145,10 @@
:key="item.prentId" :key="item.prentId"
> >
<div style="border: 1px solid #f0f0f0"> <div style="border: 1px solid #f0f0f0">
<div style="width: 120px"> <div style="width: 120px">{{ item.className }}</div>
{{ item.className }}
</div>
</div> </div>
<div style="border: 1px solid #f0f0f0"> <div style="border: 1px solid #f0f0f0">
<div style="width: 120px"> <div style="width: 120px">{{ item.totalAvScore }}</div>
{{ item.totalAvScore }}
</div>
</div> </div>
<div> <div>
<div style="display: flex; line-height: 60px"> <div style="display: flex; line-height: 60px">
@ -220,9 +156,7 @@
v-for="uitem in item.list" v-for="uitem in item.list"
:key="uitem.categoryId" :key="uitem.categoryId"
style="width: 120px; border: 0.5px solid #f0f0f0" style="width: 120px; border: 0.5px solid #f0f0f0"
> >{{ uitem }}</div>
{{ uitem }}
</div>
</div> </div>
</div> </div>
</div> </div>
@ -235,12 +169,8 @@
<div style="text-align: center"> <div style="text-align: center">
<span></span> <span></span>
</div> </div>
<div class=""> <div class>
<div <div ref="chart" id="chart" style="width: 1300px; height: 600px; margin: 50px auto"></div>
ref="chart"
id="chart"
style="width: 1300px; height: 600px; margin: 50px auto"
></div>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
@ -249,9 +179,12 @@
<el-col :span="24" :offset="0"> <el-col :span="24" :offset="0">
<el-card> <el-card>
<div slot="header" style="text-align: center"> <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> </div>
<!-- card body --> <!-- card body -->
</el-card> </el-card>
@ -290,7 +223,7 @@ export default {
pageSize: 10, pageSize: 10,
kindergartenId: "", kindergartenId: "",
className: null, className: null,
classType: null, classType: null
}, },
//班级list //班级list
classinfoList: [], classinfoList: [],
@ -302,7 +235,7 @@ export default {
ClassListlist: { ClassListlist: {
batchCode: "", batchCode: "",
kindergartenId: "", kindergartenId: "",
classId: "", classId: ""
// batchCode: "PC202208030005", // batchCode: "PC202208030005",
// kindergartenId: "18", // kindergartenId: "18",
// classId: "2" // classId: "2"
@ -311,7 +244,7 @@ export default {
categoryAgeFractionList: [], categoryAgeFractionList: [],
categoryScoreList: [], categoryScoreList: [],
totalAvgFraction: "", totalAvgFraction: "",
listname: [], listname: []
}; };
}, },
@ -337,13 +270,12 @@ export default {
this.classId = ""; this.classId = "";
} }
} }
this.ClassListlist.kindergartenId = kindergartenId; this.ClassListlist.kindergartenId = kindergartenId;
this.ClassListlist.batchCode = batchCode; this.ClassListlist.batchCode = batchCode;
this.classqueryParams.kindergartenId = kindergartenId; this.classqueryParams.kindergartenId = kindergartenId;
}, },
ClassListinfo() { ClassListinfo() {
ClassList(this.ClassListlist).then((res) => { ClassList(this.ClassListlist).then(res => {
var yseries = []; var yseries = [];
var name = ""; var name = "";
var names = []; var names = [];
@ -364,19 +296,19 @@ export default {
var list = []; var list = [];
if (res.data.categoryTableNameList && res.data.categoryScoreList) { if (res.data.categoryTableNameList && res.data.categoryScoreList) {
this.categoryTableNameList = res.data.categoryTableNameList; this.categoryTableNameList = res.data.categoryTableNameList;
this.categoryTableNameList.forEach((e) => { this.categoryTableNameList.forEach(e => {
e.childrenTableNameList.forEach((el) => { e.childrenTableNameList.forEach(el => {
list.push(el.categoryId); list.push(el.categoryId);
}); });
}); });
this.categoryScoreList = res.data.categoryScoreList; this.categoryScoreList = res.data.categoryScoreList;
let yname = []; let yname = [];
this.categoryScoreList.forEach((el) => { this.categoryScoreList.forEach(el => {
yname.push(el.className); yname.push(el.className);
var listname = list.map((e) => { var listname = list.map(e => {
var num = 0; var num = 0;
var number = el.categoryScoreList.findIndex( var number = el.categoryScoreList.findIndex(
(o) => o.categoryId == e o => o.categoryId == e
); );
if (number != -1) { if (number != -1) {
num = el.categoryScoreList[number].categoryName; num = el.categoryScoreList[number].categoryName;
@ -384,10 +316,10 @@ export default {
return num; return num;
}); });
this.listname = listname; this.listname = listname;
var list1 = list.map((e) => { var list1 = list.map(e => {
var num = 0; var num = 0;
var number = el.categoryScoreList.findIndex( var number = el.categoryScoreList.findIndex(
(o) => o.categoryId == e o => o.categoryId == e
); );
if (number != -1) { if (number != -1) {
num = el.categoryScoreList[number].avgScore; num = el.categoryScoreList[number].avgScore;
@ -401,21 +333,21 @@ export default {
el.list = list1; el.list = list1;
}); });
for (var i = 0; i < this.listname.length; i++) { for (var i = 0; i < this.listname.length; i++) {
name = name = this.categoryScoreList[0].categoryScoreList[i]
this.categoryScoreList[0].categoryScoreList[i].categoryName; .categoryName;
ydata = [ ydata = [
this.categoryScoreList[0].list[i], this.categoryScoreList[0].list[i],
this.categoryScoreList[1].list[i], this.categoryScoreList[1].list[i],
this.categoryScoreList[2].list[i], this.categoryScoreList[2].list[i]
]; ];
var obj = { var obj = {
name: name, name: name,
type: "bar", type: "bar",
label: labelOption, label: labelOption,
emphasis: { emphasis: {
focus: "series", focus: "series"
}, },
data: ydata, data: ydata
}; };
yseries.push(obj); yseries.push(obj);
names.push(name); names.push(name);
@ -436,37 +368,37 @@ export default {
"insideTopLeft", "insideTopLeft",
"insideTopRight", "insideTopRight",
"insideBottomLeft", "insideBottomLeft",
"insideBottomRight", "insideBottomRight"
]; ];
app.configParameters = { app.configParameters = {
rotate: { rotate: {
min: 0, min: 0,
max: 90, max: 90
}, },
align: { align: {
options: { options: {
left: "left", left: "left",
center: "center", center: "center",
right: "right", right: "right"
}, }
}, },
verticalAlign: { verticalAlign: {
options: { options: {
top: "top", top: "top",
middle: "middle", middle: "middle",
bottom: "bottom", bottom: "bottom"
}, }
}, },
position: { position: {
options: posList.reduce(function (map, pos) { options: posList.reduce(function(map, pos) {
map[pos] = pos; map[pos] = pos;
return map; return map;
}, {}), }, {})
}, },
distance: { distance: {
min: 0, min: 0,
max: 100, max: 100
}, }
}; };
app.config = { app.config = {
rotate: 0, rotate: 0,
@ -474,31 +406,31 @@ export default {
verticalAlign: "middle", verticalAlign: "middle",
position: "top", position: "top",
distance: 15, distance: 15,
onChange: function () { onChange: function() {
const labelOption = { const labelOption = {
rotate: app.config.rotate, rotate: app.config.rotate,
align: app.config.align, align: app.config.align,
verticalAlign: app.config.verticalAlign, verticalAlign: app.config.verticalAlign,
position: app.config.position, position: app.config.position,
distance: app.config.distance, distance: app.config.distance
}; };
myChart.setOption({ myChart.setOption({
series: [ series: [
{ {
label: labelOption, label: labelOption
}, },
{ {
label: labelOption, label: labelOption
}, },
{ {
label: labelOption, label: labelOption
}, },
{ {
label: labelOption, label: labelOption
}, }
], ]
}); });
}, }
}; };
const labelOption = { const labelOption = {
show: true, show: true,
@ -510,33 +442,32 @@ export default {
formatter: "{c}", formatter: "{c}",
fontSize: 16, fontSize: 16,
rich: { rich: {
name: {}, name: {}
}, }
}; };
option = { option = {
tooltip: { tooltip: {
trigger: "axis", trigger: "axis",
axisPointer: { axisPointer: {
type: "", type: ""
}, }
}, },
legend: { legend: {
data: names, data: names
}, },
xAxis: [ xAxis: [
{ {
type: "category", type: "category",
axisTick: { show: false }, axisTick: { show: false },
data: yname, data: yname
}, }
], ],
yAxis: [ yAxis: [
{ {
type: "value", type: "value"
}, }
], ],
series: yseries, series: yseries
}; };
option && myChart.setOption(option, true); option && myChart.setOption(option, true);
@ -564,7 +495,7 @@ export default {
}, },
//班级类型 //班级类型
class() { class() {
tKindergartenInfo(this.ClassType).then((res) => { tKindergartenInfo(this.ClassType).then(res => {
this.dictValue1 = res.data[0].dictValue; this.dictValue1 = res.data[0].dictValue;
this.dictValue2 = res.data[1].dictValue; this.dictValue2 = res.data[1].dictValue;
this.dictValue3 = res.data[2].dictValue; this.dictValue3 = res.data[2].dictValue;
@ -573,7 +504,7 @@ export default {
}, },
//班级list //班级list
classinfo() { classinfo() {
listClassinfo(this.classqueryParams).then((response) => { listClassinfo(this.classqueryParams).then(response => {
this.classinfoList = response.rows; this.classinfoList = response.rows;
this.total2 = response.total; this.total2 = response.total;
}); });
@ -581,7 +512,7 @@ export default {
getList() { getList() {
//用户权限 //用户权限
getRoleInfo().then((res) => { getRoleInfo().then(res => {
var user = res.data.roleKeys; var user = res.data.roleKeys;
if (user.includes("enchou")) { if (user.includes("enchou")) {
return; return;
@ -596,8 +527,8 @@ export default {
reset() { reset() {
this.form = {}; this.form = {};
this.resetForm("form"); this.resetForm("form");
}, }
}, }
}; };
</script> </script>
<style scoped='scss'> <style scoped='scss'>

8
src/views/system/comprehensive/index.vue
View File

@ -37,7 +37,6 @@
<div class="cell" style="width: 20%">民族:{{ sythesizestudent.nationName }}</div> <div class="cell" style="width: 20%">民族:{{ sythesizestudent.nationName }}</div>
<div class="cell" style="width: 20%">ID:{{ sythesizestudent.studentNumber }}</div> <div class="cell" style="width: 20%">ID:{{ sythesizestudent.studentNumber }}</div>
</div> </div>
<div style="display: flex; margin-top: 20px"> <div style="display: flex; margin-top: 20px">
<div class="cell" style="width: 60%">所属幼儿园:{{ sythesizestudent.kindergartenName }}</div> <div class="cell" style="width: 60%">所属幼儿园:{{ sythesizestudent.kindergartenName }}</div>
<div class="cell">班级:{{ sythesizestudent.className }}</div> <div class="cell">班级:{{ sythesizestudent.className }}</div>
@ -66,25 +65,22 @@
style=" style="
position: relative; position: relative;
display: inline-block; display: inline-block;
width: 160px;
text-align: center; text-align: center;
" "
v-for="(item, index) in sythesizestudent.firstItemCategoryList" v-for="(item, index) in sythesizestudent.firstItemCategoryList"
:key="index" :key="index"
> >
<span :style="index == 0 ? '' : 'margin-right:20px'"> <span :style="index == 0 ? '' : 'margin:0 20px'">
{{ {{
index == 0 ? null : "+" index == 0 ? null : "+"
}} }}
</span> </span>
<span>{{ item.categoryName }}( {{ item.categoryScore }})</span> <span>{{ item.categoryName }}( {{ item.categoryScore }})</span>
</span> </span>
</div> </div>
<div style="display: inline-block; position: relative"> <div style="display: inline-block; position: relative">
<span style="margin: 0 20px">=</span> <span style="margin: 0 20px">=</span>
<span>综合得分({{ sythesizestudent.totalCategoryScore }})</span> <span>综合得分({{ sythesizestudent.totalCategoryScore }})</span>
<span <span
style=" style="
display: inline-block; display: inline-block;
@ -222,7 +218,7 @@ export default {
el.levelName = "暂无"; el.levelName = "暂无";
} }
yindicator.push({ yindicator.push({
name: el.categoryName + " " + "(" + el.levelName + "" + ")", name: el.categoryName,
max: el.maxScore max: el.maxScore
}); });
}); });

119
src/views/system/development/index.vue
View File

@ -1,110 +1,51 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form <el-form ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
ref="queryForm" <kindergarten @kinbatlist="kinbatlist" style="width: 500px; display: inline"></kindergarten>
size="small"
:inline="true"
v-show="showSearch"
label-width="90px"
>
<kindergarten
@kinbatlist="kinbatlist"
style="width: 500px; display: inline"
></kindergarten>
<el-form-item label="班级类型" prop="categoryName" label-width="70px"> <el-form-item label="班级类型" prop="categoryName" label-width="70px">
<el-select <el-select v-model="analysislist.classType" clearable placeholder="请选择">
v-model="analysislist.classType"
clearable
placeholder="请选择"
>
<el-option <el-option
v-for="item in dictValues" v-for="item in dictValues"
:key="item.name" :key="item.name"
:label="item.name" :label="item.name"
:value="item.type" :value="item.type"
> ></el-option>
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查看</el-button>
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>查看</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<right-toolbar <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row> </el-row>
<el-row v-show="itemshow"> <el-row v-show="itemshow">
<el-table <el-table :data="physicalActionList">
:data="physicalActionList" <el-table-column :label="classTypeName" align="center">
style="width: 1111px; margin: 20px auto" <el-table-column prop="itemName" label="项目" align="center"></el-table-column>
>
<el-table-column :label="classTypeName" width="150" align="center">
<el-table-column
prop="itemName"
label="项目"
width="150"
align="center"
>
</el-table-column>
<el-table-column label="男孩" align="center"> <el-table-column label="男孩" align="center">
<el-table-column <el-table-column prop="maleAvgScore" label="平均值" align="center"></el-table-column>
prop="maleAvgScore" <el-table-column prop="maleCityAvgScore" label="全市平均值" align="center"></el-table-column>
label="平均值" <!-- <el-table-column
width="120"
align="center"
>
</el-table-column>
<el-table-column
prop="maleCityAvgScore"
label="全市平均值"
width="120"
align="center"
>
</el-table-column>
<el-table-column
prop="malePassCount" prop="malePassCount"
label="合格人数" label="合格人数"
width="120"
align="center" align="center"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="malePassRate" prop="malePassRate"
label="合格率" label="合格率"
width="120"
align="center" align="center"
> >
<template slot-scope="scope" <template slot-scope="scope"
>{{ scope.row.malePassRate }}%</template >{{ scope.row.malePassRate }}%</template
> >
</el-table-column> </el-table-column>-->
</el-table-column> </el-table-column>
<el-table-column label="女孩" align="center"> <el-table-column label="女孩" align="center">
<el-table-column <el-table-column prop="feMaleAvgScore" label="平均值" align="center"></el-table-column>
prop="feMaleAvgScore" <el-table-column prop="feMaleCityAvgScore" label="全市平均值" align="center"></el-table-column>
label="平均值" <!-- <el-table-column
width="120"
align="center"
>
</el-table-column>
<el-table-column
prop="feMaleCityAvgScore"
label="全市平均值"
width="120"
align="center"
>
</el-table-column>
<el-table-column
prop="feMalePassCount" prop="feMalePassCount"
label="合格人数" label="合格人数"
width="120" width="120"
@ -120,19 +61,21 @@
<template slot-scope="scope" <template slot-scope="scope"
>{{ scope.row.feMalePassRate }}%</template >{{ scope.row.feMalePassRate }}%</template
> >
</el-table-column> </el-table-column>-->
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-row> </el-row>
<el-row :gutter="20" v-if="itemshow2"> <el-row :gutter="20" v-if="itemshow2">
<el-col :span="24" :offset="0"> <el-col :span="24" :offset="0">
<el-card> <el-card>
<div slot="header" style="text-align: center"> <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> </div>
<!-- card body --> <!-- card body -->
</el-card> </el-card>
@ -161,14 +104,14 @@ export default {
analysislist: { analysislist: {
kindergartenId: "", kindergartenId: "",
classType: "", classType: "",
batchCode: "", batchCode: ""
// kindergartenId: "21", // kindergartenId: "21",
// classType: "SMALL_CLASS", // classType: "SMALL_CLASS",
// batchCode: "PC202208030005", // batchCode: "PC202208030005",
}, },
dictValues: [], dictValues: [],
classTypeName: "", classTypeName: "",
physicalActionList: [], physicalActionList: []
}; };
}, },
@ -190,7 +133,7 @@ export default {
}, },
//动作发展状况 //动作发展状况
analysisinfo() { analysisinfo() {
developmentanalysis(this.analysislist).then((res) => { developmentanalysis(this.analysislist).then(res => {
if (res.data) { if (res.data) {
var obj = res.data; var obj = res.data;
this.physicalActionList = obj.physicalActionList; this.physicalActionList = obj.physicalActionList;
@ -213,11 +156,11 @@ export default {
}, },
//班级类型 //班级类型
class() { class() {
tKindergartenInfo(this.ClassType).then((res) => { tKindergartenInfo(this.ClassType).then(res => {
res.data.forEach((e) => { res.data.forEach(e => {
var obj = { var obj = {
name: e.dictLabel, name: e.dictLabel,
type: e.dictValue, type: e.dictValue
}; };
this.dictValues.push(obj); this.dictValues.push(obj);
}); });
@ -225,7 +168,7 @@ export default {
}, },
getList() { getList() {
//用户权限 //用户权限
getRoleInfo().then((res) => { getRoleInfo().then(res => {
var user = res.data.roleKeys; var user = res.data.roleKeys;
if (user.includes("enchou")) { if (user.includes("enchou")) {
return; return;
@ -240,8 +183,8 @@ export default {
reset() { reset() {
this.form = {}; this.form = {};
this.resetForm("form"); this.resetForm("form");
}, }
}, }
}; };
</script> </script>
<style scoped='scss'> <style scoped='scss'>

96
src/views/system/kindergartenEcharts/index.vue
View File

@ -40,7 +40,7 @@
KindergartenPhysicalTestlist.testItemStudentCount KindergartenPhysicalTestlist.testItemStudentCount
}} }}
</span> </span>
人 人
<div style="display: flex; margin-top: 40px"> <div style="display: flex; margin-top: 40px">
<div slot="header" style="width: 50%; text-align: center; font-size: 18px"> <div slot="header" style="width: 50%; text-align: center; font-size: 18px">
<span class="title">本园参加体测各年龄阶段人数分部</span> <span class="title">本园参加体测各年龄阶段人数分部</span>
@ -64,7 +64,7 @@
position: relative; position: relative;
" "
> >
<span class="title">本园体测成绩达标率(%)</span> <span class="title">国民体质测定达标率(%)</span>
<span> <span>
<span <span
style=" style="
@ -205,7 +205,7 @@
<el-card v-show="MALE"> <el-card v-show="MALE">
<div class="test" style="height: 90px"> <div class="test" style="height: 90px">
<div style="text-align: center; line-height: 40px; font-size: 20px"> <div style="text-align: center; line-height: 40px; font-size: 20px">
<span>本园幼儿综合体质评估综合得分(男)</span> <span>本园幼儿综合体质评估平均得分(男)</span>
</div> </div>
<div <div
class="el-table--enable-row-hover el-table--medium" class="el-table--enable-row-hover el-table--medium"
@ -221,13 +221,12 @@
style=" style="
position: relative; position: relative;
display: inline-block; display: inline-block;
width: 200px;
text-align: center; text-align: center;
" "
v-for="(item, index) in firstCategoryScoreListMALE" v-for="(item, index) in firstCategoryScoreListMALE"
:key="index" :key="index"
> >
<span :style="index == 0 ? '' : 'margin-right:40px'"> <span :style="index == 0 ? '' : 'margin: 0 20px'">
{{ {{
index == 0 ? null : "+" index == 0 ? null : "+"
}} }}
@ -352,7 +351,7 @@
font-size: 20px; font-size: 20px;
" "
> >
<span>本园幼儿综合体质评估综合得分(女)</span> <span>本园幼儿综合体质评估平均得分(女)</span>
</div> </div>
<div <div
class="el-table--enable-row-hover el-table--medium" class="el-table--enable-row-hover el-table--medium"
@ -368,13 +367,12 @@
style=" style="
position: relative; position: relative;
display: inline-block; display: inline-block;
width: 200px;
text-align: center; text-align: center;
" "
v-for="(item, index) in firstCategoryScoreListFEMALE" v-for="(item, index) in firstCategoryScoreListFEMALE"
:key="index" :key="index"
> >
<span :style="index == 0 ? '' : 'margin-right:40px'"> <span :style="index == 0 ? '' : 'margin:0 20px'">
{{ {{
index == 0 ? null : "+" index == 0 ? null : "+"
}} }}
@ -517,18 +515,18 @@
<el-table-column label="男孩" align="center"> <el-table-column label="男孩" align="center">
<el-table-column prop="maleAvgScore" label="平均值" align="center"></el-table-column> <el-table-column prop="maleAvgScore" label="平均值" align="center"></el-table-column>
<el-table-column prop="maleCityAvgScore" label="全市平均值" align="center"></el-table-column> <el-table-column prop="maleCityAvgScore" label="全市平均值" align="center"></el-table-column>
<el-table-column prop="malePassCount" label="合格人数" align="center"></el-table-column> <!-- <el-table-column prop="malePassCount" label="合格人数" align="center"></el-table-column>
<el-table-column prop="malePassRate" label="合格率" align="center"> <el-table-column prop="malePassRate" label="合格率" align="center">
<template slot-scope="scope">{{ scope.row.malePassRate }}%</template> <template slot-scope="scope">{{ scope.row.malePassRate }}%</template>
</el-table-column> </el-table-column>-->
</el-table-column> </el-table-column>
<el-table-column label="女孩" align="center"> <el-table-column label="女孩" align="center">
<el-table-column prop="feMaleAvgScore" label="平均值" align="center"></el-table-column> <el-table-column prop="feMaleAvgScore" label="平均值" align="center"></el-table-column>
<el-table-column prop="feMaleCityAvgScore" label="全市平均值" align="center"></el-table-column> <el-table-column prop="feMaleCityAvgScore" label="全市平均值" align="center"></el-table-column>
<el-table-column prop="feMalePassCount" label="合格人数" align="center"></el-table-column> <!-- <el-table-column prop="feMalePassCount" label="合格人数" align="center"></el-table-column>
<el-table-column prop="feMalePassRate" label="合格率" align="center"> <el-table-column prop="feMalePassRate" label="合格率" align="center">
<template slot-scope="scope">{{ scope.row.feMalePassRate }}%</template> <template slot-scope="scope">{{ scope.row.feMalePassRate }}%</template>
</el-table-column> </el-table-column>-->
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -536,7 +534,6 @@
</el-card> </el-card>
</el-col> </el-col>
</el-row> </el-row>
<!-- --> <!-- -->
<el-row> <el-row>
<el-col class="card-box" :span="24" :offset="0"> <el-col class="card-box" :span="24" :offset="0">
@ -622,7 +619,7 @@
width: 100%; width: 100%;
" "
v-for="item in ilist.categoryScoreList" v-for="item in ilist.categoryScoreList"
:key="item.prentId" :key="item.categoryId"
> >
<div style="border: 1px solid #f0f0f0"> <div style="border: 1px solid #f0f0f0">
<div style="width: 70px">{{ item.className }}</div> <div style="width: 70px">{{ item.className }}</div>
@ -630,8 +627,7 @@
<div style="border: 1px solid #f0f0f0"> <div style="border: 1px solid #f0f0f0">
<div style="width: 70px">{{ item.totalAvScore }}</div> <div style="width: 70px">{{ item.totalAvScore }}</div>
</div> </div>
<div>
<div style>
<div style="display: flex; height: 62px"> <div style="display: flex; height: 62px">
<div <div
v-for="uitem in item.list" v-for="uitem in item.list"
@ -778,8 +774,8 @@ export default {
// <!-- classconstitution 班级体质分析 --> // <!-- classconstitution 班级体质分析 -->
ClassListinfo() { ClassListinfo() {
this.classconstitutionlist = []; this.classconstitutionlist = [];
for (let i = 0; i < this.classList.length; i++) { this.classList.forEach(e => {
this.echartslist.classId = this.classList[i].id; this.echartslist.classId = e.id;
ClassList(this.echartslist).then(res => { ClassList(this.echartslist).then(res => {
if (res.code == 500) { if (res.code == 500) {
} else if (!res.data) { } else if (!res.data) {
@ -787,7 +783,7 @@ export default {
this.classconstitutionlist.push(res.data); this.classconstitutionlist.push(res.data);
} }
}); });
} });
this.info(); this.info();
}, },
info() { info() {
@ -989,7 +985,7 @@ export default {
}; };
myChart.setOption(option, true); myChart.setOption(option, true);
} }
}, 600); }, 2000);
}, },
// <!-- development 动作发展分析 --> // <!-- development 动作发展分析 -->
developmentinfo() { developmentinfo() {
@ -1052,13 +1048,7 @@ export default {
} }
if (this.categoryScoreListFEMALE.length == 1) { if (this.categoryScoreListFEMALE.length == 1) {
yindicator.push({ yindicator.push({
name: name: el.categoryName,
el.categoryName +
" " +
"(" +
el.avgCategoryName +
"" +
")",
max: el.maxFraction max: el.maxFraction
}); });
yindicator.push({ yindicator.push({
@ -1071,13 +1061,7 @@ export default {
}); });
} else if (this.categoryScoreListFEMALE.length == 2) { } else if (this.categoryScoreListFEMALE.length == 2) {
yindicator.push({ yindicator.push({
name: name: el.categoryName,
el.categoryName +
" " +
"(" +
el.avgCategoryName +
"" +
")",
max: el.maxFraction max: el.maxFraction
}); });
yindicator.push({ yindicator.push({
@ -1086,13 +1070,7 @@ export default {
}); });
} else { } else {
yindicator.push({ yindicator.push({
name: name: el.categoryName,
el.categoryName +
" " +
"(" +
el.avgCategoryName +
"" +
")",
max: el.maxFraction max: el.maxFraction
}); });
} }
@ -1193,13 +1171,7 @@ export default {
} }
if (this.categoryScoreListMALE.length == 1) { if (this.categoryScoreListMALE.length == 1) {
yindicator.push({ yindicator.push({
name: name: el.categoryName,
el.categoryName +
" " +
"(" +
el.avgCategoryName +
"" +
")",
max: el.maxFraction max: el.maxFraction
}); });
yindicator.push({ yindicator.push({
@ -1212,13 +1184,7 @@ export default {
}); });
} else if (this.categoryScoreListMALE.length == 2) { } else if (this.categoryScoreListMALE.length == 2) {
yindicator.push({ yindicator.push({
name: name: el.categoryName,
el.categoryName +
" " +
"(" +
el.avgCategoryName +
"" +
")",
max: el.maxFraction max: el.maxFraction
}); });
yindicator.push({ yindicator.push({
@ -1227,13 +1193,7 @@ export default {
}); });
} else { } else {
yindicator.push({ yindicator.push({
name: name: el.categoryName,
el.categoryName +
" " +
"(" +
el.avgCategoryName +
"" +
")",
max: el.maxFraction max: el.maxFraction
}); });
} }
@ -2058,15 +2018,19 @@ export default {
data: [ data: [
{ {
value: this.KindergartenPhysicalTestlist.excellentRate, value: this.KindergartenPhysicalTestlist.excellentRate,
name: ">80优秀" name: ">31(优秀)"
}, },
{ {
value: this.KindergartenPhysicalTestlist.qualifyRate, value: this.KindergartenPhysicalTestlist.qualifyRate,
name: "60-80合格" name: "28-31(良好)"
}, },
{ {
value: this.KindergartenPhysicalTestlist.unQualifyRate, value: this.KindergartenPhysicalTestlist.qualifyRate,
name: "<60不合格" name: "20-27(合格)"
},
{
value: this.KindergartenPhysicalTestlist.excellentRate,
name: "<20(不合格)"
} }
] ]
} }

6
src/views/system/motionPrescriptionLibrary/index.vue
View File

@ -274,12 +274,11 @@ import {
prescriptionVideoUpload prescriptionVideoUpload
} from "@/api/system/motionPrescriptionLibrary"; } from "@/api/system/motionPrescriptionLibrary";
import { getToken } from "@/utils/auth"; import { getToken } from "@/utils/auth";
import baseurl from "@/api/baseurl";
export default { export default {
name: "MotionPrescriptionLibrary", name: "MotionPrescriptionLibrary",
data() { data() {
return { return {
baseurl: null, baseurl: process.env.VUE_APP_BASE_API,
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组 // 选中数组
@ -420,7 +419,6 @@ export default {
}; };
}, },
created() { created() {
this.baseurl = baseurl;
this.getList(); this.getList();
}, },
methods: { methods: {
@ -540,7 +538,7 @@ export default {
this.lookvideolist = []; this.lookvideolist = [];
getPrescriptionVideoInfo(e.id).then(res => { getPrescriptionVideoInfo(e.id).then(res => {
res.data.forEach(e => { res.data.forEach(e => {
e.prescriptionVideoUrl = baseurl + e.prescriptionVideoUrl; e.prescriptionVideoUrl = this.baseurl + e.prescriptionVideoUrl;
this.lookvideolist.push(e.prescriptionVideoUrl); this.lookvideolist.push(e.prescriptionVideoUrl);
}); });
this.lookvideoshow = true; this.lookvideoshow = true;

567
src/views/system/personalecharts/index.vue
View File

File diff suppressed because it is too large Load Diff

174
src/views/system/physique/index.vue
View File

@ -1,47 +1,19 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form <el-form ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
ref="queryForm" <kindergarten @kinbatlist="kinbatlist" style="width: 500px; display: inline"></kindergarten>
size="small"
:inline="true"
v-show="showSearch"
label-width="90px"
>
<kindergarten
@kinbatlist="kinbatlist"
style="width: 500px; display: inline"
></kindergarten>
<el-form-item label="学生性别" prop="studentSex" label-width="70px"> <el-form-item label="学生性别" prop="studentSex" label-width="70px">
<el-select <el-select v-model="analysisqueryParams.studentSex" clearable placeholder="请选择">
v-model="analysisqueryParams.studentSex" <el-option v-for="item in sexs" :key="item.value" :label="item.label" :value="item.value"></el-option>
clearable
placeholder="请选择"
>
<el-option
v-for="item in sexs"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查看</el-button>
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>查看</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<right-toolbar <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row> </el-row>
<el-row v-show="itemshow"> <el-row v-show="itemshow">
@ -56,7 +28,7 @@
> >
<div class="test" style="height: 90px"> <div class="test" style="height: 90px">
<div style="text-align: center; line-height: 40px"> <div style="text-align: center; line-height: 40px">
<span>本园幼儿综合体质评估综合得分</span> <span>本园幼儿综合体质评估平均得分</span>
</div> </div>
<div <div
class="el-table--enable-row-hover el-table--medium" class="el-table--enable-row-hover el-table--medium"
@ -67,25 +39,22 @@
style=" style="
position: relative; position: relative;
display: inline-block; display: inline-block;
width: 200px;
text-align: center; text-align: center;
" "
v-for="(item, index) in firstCategoryScoreList" v-for="(item, index) in firstCategoryScoreList"
:key="index" :key="index"
> >
<span :style="index == 0 ? '' : 'margin-right:40px'">{{ <span :style="index == 0 ? '' : 'margin: 0 20px'">
{{
index == 0 ? null : "+" index == 0 ? null : "+"
}}</span> }}
<span>
{{ item.categoryName }} ({{ item.avgCategoryFraction }})
</span> </span>
<span>{{ item.categoryName }} ({{ item.avgCategoryFraction }})</span>
</span> </span>
</div> </div>
<div style="display: inline-block; position: relative"> <div style="display: inline-block; position: relative">
<span style="margin: 0 20px">= </span> <span style="margin: 0 20px">=</span>
<span style="display: inline-block; width: 120px" <span style="display: inline-block; width: 120px">综合得分({{ totalAvgFraction }})</span>
>综合得分({{ totalAvgFraction }})</span
>
<span <span
style=" style="
@ -105,19 +74,13 @@
<div style="text-align: center"> <div style="text-align: center">
<span>幼儿园综合体质分析图</span> <span>幼儿园综合体质分析图</span>
</div> </div>
<div class=""> <div class>
<div <div ref="chart" id="chart" style="width: 1000px; height: 600px; margin: 0 auto"></div>
ref="chart"
id="chart"
style="width: 1000px; height: 600px; margin: 0 auto"
></div>
</div> </div>
</el-col> </el-col>
<el-col :span="24" :offset="0"> <el-col :span="24" :offset="0">
<div style="margin: 0 auto; width: 100%; line-height: 60px"> <div style="margin: 0 auto; width: 100%; line-height: 60px">
<div <div style="font-size: 12px; width: 100%; overflow: auto; height: 400px">
style="font-size: 12px; width: 100%; overflow: auto; height: 400px"
>
<div <div
style=" style="
display: flex; display: flex;
@ -143,9 +106,7 @@
background: #f5f7fa; background: #f5f7fa;
color: black; color: black;
" "
> >{{ item.parentName }}</div>
{{ item.parentName }}
</div>
<div <div
style=" style="
display: flex; display: flex;
@ -159,9 +120,7 @@
v-for="uitem in item.childrenTableNameList" v-for="uitem in item.childrenTableNameList"
:key="uitem.categoryId" :key="uitem.categoryId"
style="width: 90px" style="width: 90px"
> >{{ uitem.categoryName }}</div>
{{ uitem.categoryName }}
</div>
</div> </div>
</div> </div>
</div> </div>
@ -177,14 +136,12 @@
:key="item.prentId" :key="item.prentId"
> >
<div style="border: 1px solid #f0f0f0"> <div style="border: 1px solid #f0f0f0">
<div style="width: 90px; line-height: 50px"> <div style="width: 90px; line-height: 50px">{{ item.studentAge }}</div>
{{ item.studentAge }}
</div>
</div> </div>
<div style="border: 1px solid #f0f0f0"> <div style="border: 1px solid #f0f0f0">
<div style="width: 90px; line-height: 50px; height: 50px"> <div
{{ item.totalAvgFraction }} style="width: 90px; line-height: 50px; height: 50px"
</div> >{{ item.totalAvgFraction }}</div>
</div> </div>
<div> <div>
<div style="display: flex; line-height: 50px"> <div style="display: flex; line-height: 50px">
@ -197,10 +154,7 @@
line-height: 52px; line-height: 52px;
height: 52px; height: 52px;
" "
> >{{ uitem }}</div>
{{ uitem }}
</div>
</div> </div>
</div> </div>
</div> </div>
@ -215,9 +169,12 @@
<el-col :span="24" :offset="0"> <el-col :span="24" :offset="0">
<el-card> <el-card>
<div slot="header" style="text-align: center"> <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> </div>
<!-- card body --> <!-- card body -->
</el-card> </el-card>
@ -239,12 +196,12 @@ export default {
sexs: [ sexs: [
{ {
value: "MALE", value: "MALE",
label: "男", label: "男"
}, },
{ {
value: "FEMALE", value: "FEMALE",
label: "女", label: "女"
}, }
], ],
itemshow: false, itemshow: false,
itemshow2: false, itemshow2: false,
@ -257,13 +214,13 @@ export default {
// studentSex: "FEMALE", // studentSex: "FEMALE",
kindergartenId: "", kindergartenId: "",
batchCode: "", batchCode: "",
studentSex: "", studentSex: ""
}, },
categoryTableNameList: [], categoryTableNameList: [],
categoryAgeFractionList: [], categoryAgeFractionList: [],
categoryScoreList: [], categoryScoreList: [],
firstCategoryScoreList: [], firstCategoryScoreList: [],
totalAvgFraction: "", totalAvgFraction: ""
}; };
}, },
mounted() {}, mounted() {},
@ -282,7 +239,7 @@ export default {
}, },
analysisinfo() { analysisinfo() {
physiqueanalysis(this.analysisqueryParams).then((res) => { physiqueanalysis(this.analysisqueryParams).then(res => {
if (res.data == [] || !res.data) { if (res.data == [] || !res.data) {
this.itemshow2 = true; this.itemshow2 = true;
this.itemshow = false; this.itemshow = false;
@ -297,16 +254,16 @@ export default {
this.itemshow = false; this.itemshow = false;
} else { } else {
var list = []; var list = [];
this.categoryTableNameList.forEach((e) => { this.categoryTableNameList.forEach(e => {
e.childrenTableNameList.forEach((el) => { e.childrenTableNameList.forEach(el => {
list.push(el.categoryId); list.push(el.categoryId);
}); });
}); });
this.categoryAgeFractionList.forEach((el) => { this.categoryAgeFractionList.forEach(el => {
var list1 = list.map((e) => { var list1 = list.map(e => {
var num = 0; var num = 0;
var number = el.categoryAvgFractionList.findIndex( var number = el.categoryAvgFractionList.findIndex(
(o) => o.categoryId == e o => o.categoryId == e
); );
if (number != -1) { if (number != -1) {
num = el.categoryAvgFractionList[number].avgCategoryFraction; num = el.categoryAvgFractionList[number].avgCategoryFraction;
@ -317,40 +274,37 @@ export default {
}); });
let seriesData = []; let seriesData = [];
let yindicator = []; let yindicator = [];
this.categoryScoreList.forEach((el) => { this.categoryScoreList.forEach(el => {
seriesData.push(el.itemFraction); seriesData.push(el.itemFraction);
if (el.avgCategoryName == null) { if (el.avgCategoryName == null) {
el.avgCategoryName = "暂无"; el.avgCategoryName = "暂无";
} }
if (this.categoryScoreList.length == 1) { if (this.categoryScoreList.length == 1) {
yindicator.push({ yindicator.push({
name: name: el.categoryName,
el.categoryName + " " + "(" + el.avgCategoryName + "" + ")", max: el.maxFraction
max: el.maxFraction,
}); });
yindicator.push({ yindicator.push({
name: "暂无数据", name: "暂无数据",
max: 100, max: 100
}); });
yindicator.push({ yindicator.push({
name: "暂无数据", name: "暂无数据",
max: 100, max: 100
}); });
} else if (this.categoryScoreList.length == 2) { } else if (this.categoryScoreList.length == 2) {
yindicator.push({ yindicator.push({
name: name: el.categoryName,
el.categoryName + " " + "(" + el.avgCategoryName + "" + ")", max: el.maxFraction
max: el.maxFraction,
}); });
yindicator.push({ yindicator.push({
name: "暂无数据", name: "暂无数据",
max: 100, max: 100
}); });
} else { } else {
yindicator.push({ yindicator.push({
name: name: el.categoryName,
el.categoryName + " " + "(" + el.avgCategoryName + "" + ")", max: el.maxFraction
max: el.maxFraction,
}); });
} }
}); });
@ -361,41 +315,41 @@ export default {
radar: { radar: {
name: { name: {
show: true, show: true,
color: "black", color: "black"
}, },
center: ["50%", "50%"], center: ["50%", "50%"],
// 雷达图的指示器，用来指定雷达图中的多个变量（维度） // 雷达图的指示器，用来指定雷达图中的多个变量（维度）
indicator: yindicator, indicator: yindicator,
shape: "polygon", //对雷达图形设置成一个圆形,可选 circle:圆形,polygon:多角形(默认) shape: "polygon" //对雷达图形设置成一个圆形,可选 circle:圆形,polygon:多角形(默认)
}, },
series: [ series: [
{ {
type: "radar", type: "radar",
label: { label: {
show: true, show: true,
color: "#D9A508", //显示数值 color: "#D9A508" //显示数值
}, },
areaStyle: {}, //每个雷达图形成一个阴影的面积 areaStyle: {}, //每个雷达图形成一个阴影的面积
data: [ data: [
{ {
name: "成绩区域", name: "成绩区域",
value: seriesData, value: seriesData
}, }
], ],
areaStyle: { areaStyle: {
color: new echarts.graphic.RadialGradient(0.1, 0.6, 1, [ color: new echarts.graphic.RadialGradient(0.1, 0.6, 1, [
{ {
color: "rgba(255,192,0, 0.8)", color: "rgba(255,192,0, 0.8)",
offset: 0, offset: 0
}, },
{ {
color: "rgba(255,192,0, 0.9)", color: "rgba(255,192,0, 0.9)",
offset: 1, offset: 1
}, }
]), ])
}, }
}, }
], ]
}; };
// 绘制图表 // 绘制图表
myChart.setOption(option); myChart.setOption(option);
@ -407,7 +361,7 @@ export default {
}, },
getList() { getList() {
//用户权限 //用户权限
getRoleInfo().then((res) => { getRoleInfo().then(res => {
var user = res.data.roleKeys; var user = res.data.roleKeys;
if (user.includes("enchou")) { if (user.includes("enchou")) {
return; return;
@ -422,8 +376,8 @@ export default {
reset() { reset() {
this.form = {}; this.form = {};
this.resetForm("form"); this.resetForm("form");
}, }
}, }
}; };
</script> </script>
<style scoped='scss'> <style scoped='scss'>

144
src/views/system/quality/index.vue
View File

@ -1,37 +1,15 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form <el-form ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
ref="queryForm" <student style="width: 500px; display: inline" @itemlist="itemlists"></student>
size="small"
:inline="true"
v-show="showSearch"
label-width="90px"
>
<student
style="width: 500px; display: inline"
@itemlist="itemlists"
></student>
<el-form-item> <el-form-item>
<el-button <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查看</el-button>
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>查看</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<right-toolbar <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row> </el-row>
<el-card <el-card v-show="itemshow" class="box-card" style="width: 95%; margin: 0 auto">
v-show="itemshow"
class="box-card"
style="width: 95%; margin: 0 auto"
>
<div slot="header" style="text-align: center">身体素质测试</div> <div slot="header" style="text-align: center">身体素质测试</div>
<el-row style="text-align: center"> <el-row style="text-align: center">
<el-col <el-col
@ -41,8 +19,7 @@
border-right: 1px solid #ededed; border-right: 1px solid #ededed;
border-bottom: 1px solid #ededed; border-bottom: 1px solid #ededed;
" "
>身体素质测试</el-col >身体素质测试</el-col>
>
<el-col <el-col
:span="5" :span="5"
class="toptitle" class="toptitle"
@ -50,8 +27,7 @@
border-right: 1px solid #ededed; border-right: 1px solid #ededed;
border-bottom: 1px solid #ededed; border-bottom: 1px solid #ededed;
" "
>测量值</el-col >测量值</el-col>
>
<el-col <el-col
:span="9" :span="9"
class="toptitle" class="toptitle"
@ -59,20 +35,10 @@
border-right: 1px solid #ededed; border-right: 1px solid #ededed;
border-bottom: 1px solid #ededed; border-bottom: 1px solid #ededed;
" "
>成绩</el-col >成绩</el-col>
> <el-col :span="5" class="toptitle" style="border-bottom: 1px solid #ededed">备注</el-col>
<el-col
:span="5"
class="toptitle"
style="border-bottom: 1px solid #ededed"
>综合评价</el-col
>
</el-row> </el-row>
<el-row <el-row style="text-align: center" v-for="(item, index) in studentscorelist" :key="index">
style="text-align: center"
v-for="(item, index) in studentscorelist"
:key="index"
>
<el-col <el-col
:span="5" :span="5"
class="text" class="text"
@ -82,9 +48,7 @@
border-right: 1px solid #ededed; border-right: 1px solid #ededed;
border-bottom: 1px solid #ededed; border-bottom: 1px solid #ededed;
" "
> >{{ item.itemName }}</el-col>
{{ item.itemName }}
</el-col>
<el-col <el-col
class="text" class="text"
:span="5" :span="5"
@ -112,17 +76,17 @@
overflow: hidden; overflow: hidden;
" "
> >
<span style="position: absolute; left: 5%; top: 10px" <span style="position: absolute; left: 5%; top: 10px">
>{{ {{
item.measureUnit == "s" || item.measureUnit == "h" ? "时间" : "" item.measureUnit == "s" || item.measureUnit == "h" ? "时间" : ""
}}{{ }}{{
item.measureUnit == "cm" || item.measureUnit == "m" ? "距离" : "" item.measureUnit == "cm" || item.measureUnit == "m" ? "距离" : ""
}} }}
{{ item.measureUnit == "kg" ? "千克" : "" }} {{ item.measureUnit == "kg" ? "千克" : "" }}
{{ item.measureUnit == "g" ? "克" : "" }}({{ item.measureUnit }}) {{ item.measureUnit == "g" ? "克" : "" }}({{ item.measureUnit }})
</span> </span>
<span style="position: absolute; left: 6%; top: 70%">评价</span> <!-- <span style="position: absolute; left: 6%; top: 70%">评价</span> -->
<div <div
style=" style="
width: 65%; width: 65%;
@ -143,10 +107,10 @@
" "
> >
{{ {{
( (
((item.maxScore - item.minScore) / 5) * 4 + ((item.maxScore - item.minScore) / 5) * 4 +
item.minScore item.minScore
).toFixed(1) ).toFixed(1)
}} }}
</div> </div>
<div <div
@ -170,10 +134,10 @@
" "
> >
{{ {{
( (
((item.maxScore - item.minScore) / 5) * 3 + ((item.maxScore - item.minScore) / 5) * 3 +
item.minScore item.minScore
).toFixed(1) ).toFixed(1)
}} }}
</div> </div>
<div <div
@ -197,10 +161,10 @@
" "
> >
{{ {{
( (
((item.maxScore - item.minScore) / 5) * 2 + ((item.maxScore - item.minScore) / 5) * 2 +
item.minScore item.minScore
).toFixed(1) ).toFixed(1)
}} }}
</div> </div>
<div <div
@ -225,10 +189,10 @@
" "
> >
{{ {{
( (
((item.maxScore - item.minScore) / 5) * 1 + ((item.maxScore - item.minScore) / 5) * 1 +
item.minScore item.minScore
).toFixed(1) ).toFixed(1)
}} }}
</div> </div>
<div <div
@ -250,9 +214,7 @@
overflow: hidden; overflow: hidden;
width: 32px; width: 32px;
" "
> >{{ item.minScore == null ? 0 : item.minScore }}</div>
{{ item.minScore == null ? 0 : item.minScore }}
</div>
<div <div
style=" style="
position: absolute; position: absolute;
@ -273,9 +235,7 @@
overflow: hidden; overflow: hidden;
width: 32px; width: 32px;
" "
> >{{ item.maxScore == null ? 100 : item.maxScore }}</div>
{{ item.maxScore == null ? 100 : item.maxScore }}
</div>
<div <div
style=" style="
position: absolute; position: absolute;
@ -298,10 +258,9 @@
}" }"
></div> ></div>
</div> </div>
<!-- <div style="position: absolute; left: 30%; top: 72%">
<div style="position: absolute; left: 30%; top: 72%">
{{ item.leveName }} {{ item.leveName }}
</div> </div>-->
</el-col> </el-col>
<el-col <el-col
class="text" class="text"
@ -321,11 +280,8 @@
margin-left: 5%; margin-left: 5%;
margin-top: 7%; margin-top: 7%;
" "
>成绩评价</span >成绩评价</span>
> <div style="position: absolute; left: 25%; top: 40%">{{ item.scoreDictValue }}</div>
<div style="position: absolute; left: 25%; top: 40%">
{{ item.scoreDictValue }}
</div>
</el-col> </el-col>
<el-col <el-col
class="text" class="text"
@ -335,17 +291,19 @@
line-height: 100px; line-height: 100px;
border-bottom: 1px solid #ededed; border-bottom: 1px solid #ededed;
" "
>{{ item.syntheticalAssess }}</el-col >{{ item.syntheticalAssess }}</el-col>
>
</el-row> </el-row>
</el-card> </el-card>
<el-row :gutter="20" v-if="itemshow2"> <el-row :gutter="20" v-if="itemshow2">
<el-col :span="24" :offset="0"> <el-col :span="24" :offset="0">
<el-card> <el-card>
<div slot="header" style="text-align: center"> <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> </div>
<!-- card body --> <!-- card body -->
</el-card> </el-card>
@ -360,7 +318,7 @@ import { getRoleInfo, testBodyScoreInfo } from "@/api/system/quality";
export default { export default {
name: "quality", name: "quality",
components: { components: {
student, student
}, },
data() { data() {
return { return {
@ -375,14 +333,14 @@ export default {
pageNum: 1, pageNum: 1,
pageSize: 999, pageSize: 999,
studentId: "", studentId: "",
batchCode: "", batchCode: ""
// studentId: "27", // studentId: "27",
// batchCode: "PC202208230011", // batchCode: "PC202208230011",
// studentId: "14", // studentId: "14",
// batchCode: "PC202208030005", // batchCode: "PC202208030005",
// studentId: "9", // studentId: "9",
// batchCode: "PC202208030004", // batchCode: "PC202208030004",
}, }
}; };
}, },
@ -398,7 +356,7 @@ export default {
}, },
//学生身体素质 //学生身体素质
studenttext() { studenttext() {
testBodyScoreInfo(this.studentscore).then((res) => { testBodyScoreInfo(this.studentscore).then(res => {
// res.rows[3].levelMaxScore = 19.5; // res.rows[3].levelMaxScore = 19.5;
// res.rows[3].levelMinScore = 4.5; // res.rows[3].levelMinScore = 4.5;
// res.rows[3].itemScore = 7.5; // res.rows[3].itemScore = 7.5;
@ -414,7 +372,7 @@ export default {
}, },
getList() { getList() {
//用户权限 //用户权限
getRoleInfo().then((res) => { getRoleInfo().then(res => {
this.classqueryParams.kindergartenId = res.data.kindergartenId; this.classqueryParams.kindergartenId = res.data.kindergartenId;
var user = res.data.roleKeys; var user = res.data.roleKeys;
if (user.includes("enchou")) { if (user.includes("enchou")) {
@ -430,8 +388,8 @@ export default {
reset() { reset() {
this.form = {}; this.form = {};
this.resetForm("form"); this.resetForm("form");
}, }
}, }
}; };
</script> </script>
<style scoped='scss'> <style scoped='scss'>

133
src/views/system/shape/index.vue
View File

@ -1,47 +1,23 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form <el-form ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
ref="queryForm" <student style="width: 500px; display: inline" @itemlist="itemlists"></student>
size="small"
:inline="true"
v-show="showSearch"
label-width="90px"
>
<student
style="width: 500px; display: inline"
@itemlist="itemlists"
></student>
<el-form-item> <el-form-item>
<el-button <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查看</el-button>
type="primary"
icon="el-icon-search"
size="mini"
@click="handleQuery"
>查看</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<right-toolbar <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row> </el-row>
<el-row v-show="itemshow"> <el-row v-show="itemshow">
<el-col <el-col :span="11" class="card-box" style="margin-left: 30px; margin-right: 50px">
:span="11"
class="card-box"
style="margin-left: 30px; margin-right: 50px"
>
<el-card> <el-card>
<div slot="header" style="text-align: center"> <div slot="header" style="text-align: center">
<span>{{ analysislist.shapeTitle }}</span> <span>{{ analysislist.shapeTitle }}</span>
</div> </div>
<div class="el-table el-table--enable-row-hover el-table--medium"> <div class="el-table el-table--enable-row-hover el-table--medium">
<div ref="commandstats" style="height: 100px"> <div ref="commandstats" style="height: 100px">{{ analysislist.shapeDescription }}</div>
{{ analysislist.shapeDescription }}
</div>
</div> </div>
</el-card> </el-card>
</el-col> </el-col>
@ -57,45 +33,33 @@
<table cellspacing="0" style="width: 100%; height: 100px"> <table cellspacing="0" style="width: 100%; height: 100px">
<tbody> <tbody>
<tr> <tr>
<td <td class="el-table__cell is-leaf" style="text-align: center">
class="el-table__cell is-leaf"
style="text-align: center"
>
<div class="cell"> <div class="cell">
姓名: 姓名:
{{ analysislist.studentName }} {{ analysislist.studentName }}
</div> </div>
</td> </td>
<td <td class="el-table__cell is-leaf" style="text-align: center">
class="el-table__cell is-leaf"
style="text-align: center"
>
<div class="cell"> <div class="cell">
{{ {{
analysislist.heightName analysislist.heightName
? analysislist.heightName ? analysislist.heightName
: "身高" : "身高"
}}: {{ analysislist.heightScore }}: {{ analysislist.heightScore
}}{{ analysislist.heightMeasureUnit }} }}{{ analysislist.heightMeasureUnit }}
</div> </div>
</td> </td>
<td <td class="el-table__cell is-leaf" style="text-align: center">
class="el-table__cell is-leaf"
style="text-align: center"
>
<div class="cell"> <div class="cell">
{{ {{
analysislist.weightName analysislist.weightName
? analysislist.weightName ? analysislist.weightName
: "体重" : "体重"
}}: {{ analysislist.weightScore }}: {{ analysislist.weightScore
}}{{ analysislist.weightMeasureUnit }} }}{{ analysislist.weightMeasureUnit }}
</div> </div>
</td> </td>
<td <td class="el-table__cell is-leaf" style="text-align: center">
class="el-table__cell is-leaf"
style="text-align: center"
>
<div class="cell"> <div class="cell">
<div class="cell">BMI值: {{ analysislist.bmi }}</div> <div class="cell">BMI值: {{ analysislist.bmi }}</div>
</div> </div>
@ -110,7 +74,7 @@
</el-row> </el-row>
<el-row style="margin-top: 50px" v-show="itemshow"> <el-row style="margin-top: 50px" v-show="itemshow">
<el-col <!-- <el-col
:span="11" :span="11"
class="card-box" class="card-box"
style="margin-left: 30px; margin-right: 50px; height: 370px" style="margin-left: 30px; margin-right: 50px; height: 370px"
@ -290,7 +254,6 @@
></div> ></div>
</div> </div>
<!-- <div style="color: red">达标</div> -->
<div>{{ analysislist.ageHeightDescription }}</div> <div>{{ analysislist.ageHeightDescription }}</div>
<div> <div>
标准:{{ analysislist.ageHeightMin }}-{{ 标准:{{ analysislist.ageHeightMin }}-{{
@ -469,8 +432,6 @@
}" }"
></div> ></div>
</div> </div>
<!-- <div style="color: red">达标</div> -->
<div>{{ analysislist.ageWeightDescription }}</div> <div>{{ analysislist.ageWeightDescription }}</div>
<div> <div>
标准:{{ analysislist.ageWeightMin }}-{{ 标准:{{ analysislist.ageWeightMin }}-{{
@ -480,13 +441,13 @@
</div> </div>
</div> </div>
</el-card> </el-card>
</el-col> </el-col>-->
<el-col <el-col
:span="11" :span="11"
class="card-box" class="card-box"
style="height: 370px"
v-show="itemshow3" v-show="itemshow3"
style="margin-left: 30px; margin-right: 50px; height: 370px"
> >
<el-card> <el-card>
<div slot="header" style="text-align: center"> <div slot="header" style="text-align: center">
@ -497,11 +458,7 @@
class="el-table el-table--enable-row-hover el-table--medium" class="el-table el-table--enable-row-hover el-table--medium"
style="height: 310px; position: relative" style="height: 310px; position: relative"
> >
<div <div ref="chart" id="chart" style="width: 450px; height: 320px; margin: 0 auto"></div>
ref="chart"
id="chart"
style="width: 450px; height: 320px; margin: 0 auto"
></div>
<div <div
style=" style="
@ -511,7 +468,8 @@
transform: translate(-50%); transform: translate(-50%);
" "
> >
得分: <span style="color: red">{{ analysislist.bmi }}</span> 得分:
<span style="color: red">{{ analysislist.bmi }}</span>
</div> </div>
<div <div
style=" style="
@ -520,9 +478,7 @@
top: 55%; top: 55%;
transform: translate(-50%); transform: translate(-50%);
" "
> >{{ analysislist.bmiDescription }}</div>
{{ analysislist.bmiDescription }}
</div>
<!-- <div <!-- <div
class="texts" class="texts"
style=" style="
@ -615,7 +571,7 @@
{{ item.levelMinScore }}~{{ item.levelMaxScore }} {{ item.levelMinScore }}~{{ item.levelMaxScore }}
</div> </div>
</span> </span>
</div> --> </div>-->
<div></div> <div></div>
</div> </div>
</el-card> </el-card>
@ -626,9 +582,12 @@
<el-col :span="24" :offset="0"> <el-col :span="24" :offset="0">
<el-card> <el-card>
<div slot="header" style="text-align: center"> <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> </div>
<!-- card body --> <!-- card body -->
</el-card> </el-card>
@ -668,8 +627,8 @@ export default {
// studentId: "10", // studentId: "10",
// batchCode: "PC202208030005", // batchCode: "PC202208030005",
studentId: "", studentId: "",
batchCode: "", batchCode: ""
}, }
}; };
}, },
mounted() {}, mounted() {},
@ -687,7 +646,7 @@ export default {
}, },
//学生身体形态 //学生身体形态
studentanalysis() { studentanalysis() {
analysis(this.analysisstudent).then((res) => { analysis(this.analysisstudent).then(res => {
if (!res.data || res.data == "") { if (!res.data || res.data == "") {
this.itemshow2 = true; this.itemshow2 = true;
this.itemshow3 = false; this.itemshow3 = false;
@ -724,7 +683,7 @@ export default {
this.bmiItemLevel = res.data.bmiItemLevel; this.bmiItemLevel = res.data.bmiItemLevel;
this.itemweight = res.data.weightScore; this.itemweight = res.data.weightScore;
let seriesData = []; let seriesData = [];
res.data.bmiItemLevel.forEach((el) => { res.data.bmiItemLevel.forEach(el => {
seriesData.push({ seriesData.push({
value: el.levelMaxScore, value: el.levelMaxScore,
name: name:
@ -734,7 +693,7 @@ export default {
el.levelMinScore + el.levelMinScore +
"~" + "~" +
el.levelMaxScore + el.levelMaxScore +
")", ")"
}); });
}); });
var myChart = echarts.init(document.getElementById("chart")); var myChart = echarts.init(document.getElementById("chart"));
@ -746,29 +705,29 @@ export default {
// center: ["37%", "50%"], // center: ["37%", "50%"],
itemStyle: { itemStyle: {
normal: { normal: {
color: function (colors) { color: function(colors) {
var colorList = [ var colorList = [
"#91cd77", "#91cd77",
"#5470c6", "#5470c6",
"#fc8251", "#fc8251",
"#ef6567", "#ef6567",
"#f9c956", "#f9c956",
"#75bedc", "#75bedc"
]; ];
return colorList[colors.dataIndex]; return colorList[colors.dataIndex];
}, }
}, }
}, },
data: seriesData, data: seriesData,
emphasis: { emphasis: {
itemStyle: { itemStyle: {
shadowBlur: 10, shadowBlur: 10,
shadowOffsetX: 0, shadowOffsetX: 0,
shadowColor: "rgba(0, 0, 0, 1)", shadowColor: "rgba(0, 0, 0, 1)"
}, }
}, }
}, }
], ]
}; };
option && myChart.setOption(option); option && myChart.setOption(option);
this.itemshow2 = false; this.itemshow2 = false;
@ -779,7 +738,7 @@ export default {
}, },
getList() { getList() {
//用户权限 //用户权限
getRoleInfo().then((res) => { getRoleInfo().then(res => {
this.classqueryParams.kindergartenId = res.data.kindergartenId; this.classqueryParams.kindergartenId = res.data.kindergartenId;
var user = res.data.roleKeys; var user = res.data.roleKeys;
if (user.includes("enchou")) { if (user.includes("enchou")) {
@ -795,8 +754,8 @@ export default {
reset() { reset() {
this.form = {}; this.form = {};
this.resetForm("form"); this.resetForm("form");
}, }
}, }
}; };
</script> </script>
<style scoped='scss'> <style scoped='scss'>

6
src/views/system/studentInfo/index.vue
View File

@ -963,9 +963,9 @@ export default {
kindergartenId: [ kindergartenId: [
{ required: true, message: "所属幼儿园不能为空", trigger: "blur" } { required: true, message: "所属幼儿园不能为空", trigger: "blur" }
], ],
studentNumber: [ // studentNumber: [
{ required: true, message: "请输入学生编号", trigger: "blur" } // { required: true, message: "请输入学生编号", trigger: "blur" }
], // ],
phone: [ phone: [
{ {
required: true, required: true,

170
src/views/system/testItemScore/index.vue
View File

@ -333,7 +333,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column property="syntheticalAssess" label="综合评价" width="230" align="center"> <el-table-column property="syntheticalAssess" label="备注" width="230" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.syntheticalAssess"></el-input> <el-input v-model="scope.row.syntheticalAssess"></el-input>
</template> </template>
@ -427,7 +427,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column property="syntheticalAssess" label="综合评价" width="180" align="center"> <el-table-column property="syntheticalAssess" label="备注" width="180" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.syntheticalAssess"></el-input> <el-input v-model="scope.row.syntheticalAssess"></el-input>
</template> </template>
@ -763,7 +763,7 @@
</template>--> </template>-->
</el-table-column> </el-table-column>
<el-table-column property="syntheticalAssess" label="综合评价" width="180" align="center"> <el-table-column property="syntheticalAssess" label="备注" width="180" align="center">
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
<el-input v-model="scope.row.syntheticalAssess" readonly></el-input> <el-input v-model="scope.row.syntheticalAssess" readonly></el-input>
</template>--> </template>-->
@ -932,35 +932,73 @@ export default {
this.getList(); this.getList();
}, },
methods: { methods: {
oninputscore2(item) { oninputitemFractionedit(item) {
if (item.itemCode == "H001") { if (item.itemCode.split("-")[0] == "T") {
this.Height = item.itemScore;
if (item.itemScore == "") {
this.form.itemScoreList.forEach(e => {
if (e.itemCode == "W001") {
e.itemFraction = "";
e.itemScore = "";
}
});
}
}
if (item.itemScore == "") {
this.form.itemScoreList.forEach(e => { this.form.itemScoreList.forEach(e => {
if (e.testItemId == item.testItemId) { if (e.testItemId == item.testItemId) {
e.itemFraction = ""; e.itemScore = e.itemFraction;
}
});
}
},
oninputitemFractionadd(item) {
if (item.itemCode.split("-")[0] == "T") {
this.form.itemScoreList.forEach(e => {
if (e.itemId == item.itemId) {
e.itemScore = e.itemFraction;
}
});
}
},
oninputscore2(item) {
if (item.itemCode.split("-")[0] == "T") {
this.form.itemScoreList.forEach(e => {
if (e.testItemId == item.testItemId) {
e.itemFraction = e.itemScore;
} }
}); });
} else { } else {
if (item.itemCode == "W001") { if (item.itemCode == "H001") {
if (this.Height == "") { this.Height = item.itemScore;
this.$message.error("请先添加身高成绩！"); if (item.itemScore == "") {
item.itemScore = ""; this.form.itemScoreList.forEach(e => {
item.itemFraction = ""; if (e.itemCode == "W001") {
e.itemFraction = "";
e.itemScore = "";
}
});
}
}
if (item.itemScore == "") {
this.form.itemScoreList.forEach(e => {
if (e.testItemId == item.testItemId) {
e.itemFraction = "";
}
});
} else {
if (item.itemCode == "W001") {
if (this.Height == "") {
this.$message.error("请先添加身高成绩！");
item.itemScore = "";
item.itemFraction = "";
} else {
WgetStudentFraction(
this.addqueryParams.studentId,
item.testItemId,
this.Height,
item.itemScore
).then(res => {
this.form.itemScoreList.forEach(e => {
if (e.testItemId == res.data.itemId) {
e.itemFraction = res.data.fraction;
}
});
});
}
} else { } else {
WgetStudentFraction( getStudentFraction(
this.addqueryParams.studentId, this.addqueryParams.studentId,
item.testItemId, item.testItemId,
this.Height,
item.itemScore item.itemScore
).then(res => { ).then(res => {
this.form.itemScoreList.forEach(e => { this.form.itemScoreList.forEach(e => {
@ -970,50 +1008,58 @@ export default {
}); });
}); });
} }
} else {
getStudentFraction(
this.addqueryParams.studentId,
item.testItemId,
item.itemScore
).then(res => {
this.form.itemScoreList.forEach(e => {
if (e.testItemId == res.data.itemId) {
e.itemFraction = res.data.fraction;
}
});
});
} }
} }
}, },
oninputscore(item) { oninputscore(item) {
if (item.itemCode == "H001") { if (item.itemCode.split("-")[0] == "T") {
this.Height = item.itemScore;
if (item.itemScore == "") {
this.form.itemScoreList.forEach(e => {
if (e.itemCode == "W001") {
e.itemFraction = "";
e.itemScore = "";
}
});
}
}
if (item.itemScore == "") {
this.form.itemScoreList.forEach(e => { this.form.itemScoreList.forEach(e => {
if (e.itemId == item.itemId) { if (e.itemId == item.itemId) {
e.itemFraction = ""; e.itemFraction = e.itemScore;
} }
}); });
} else { } else {
if (item.itemCode == "W001") { if (item.itemCode == "H001") {
if (this.Height == "") { this.Height = item.itemScore;
this.$message.error("请先添加身高成绩！"); if (item.itemScore == "") {
item.itemScore = ""; this.form.itemScoreList.forEach(e => {
item.itemFraction = ""; if (e.itemCode == "W001") {
e.itemFraction = "";
e.itemScore = "";
}
});
}
}
if (item.itemScore == "") {
this.form.itemScoreList.forEach(e => {
if (e.itemId == item.itemId) {
e.itemFraction = "";
}
});
} else {
if (item.itemCode == "W001") {
if (this.Height == "") {
this.$message.error("请先添加身高成绩！");
item.itemScore = "";
item.itemFraction = "";
} else {
WgetStudentFraction(
this.addqueryParams.studentId,
item.itemId,
this.Height,
item.itemScore
).then(res => {
this.form.itemScoreList.forEach(e => {
if (e.itemId == res.data.itemId) {
e.itemFraction = res.data.fraction;
}
});
});
}
} else { } else {
WgetStudentFraction( getStudentFraction(
this.addqueryParams.studentId, this.addqueryParams.studentId,
item.itemId, item.itemId,
this.Height,
item.itemScore item.itemScore
).then(res => { ).then(res => {
this.form.itemScoreList.forEach(e => { this.form.itemScoreList.forEach(e => {
@ -1023,18 +1069,6 @@ export default {
}); });
}); });
} }
} else {
getStudentFraction(
this.addqueryParams.studentId,
item.itemId,
item.itemScore
).then(res => {
this.form.itemScoreList.forEach(e => {
if (e.itemId == res.data.itemId) {
e.itemFraction = res.data.fraction;
}
});
});
} }
} }
}, },

14
src/views/system/testItems/index.vue
View File

@ -863,13 +863,13 @@ export default {
trigger: "blur", trigger: "blur",
}, },
], ],
itemLevelList: [ // itemLevelList: [
{ // {
required: true, // required: true,
validator: itemLevelList, // validator: itemLevelList,
trigger: "blur", // trigger: "blur",
}, // },
], // ],
minScore: [ minScore: [
{ {
required: true, required: true,