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

修改页面

Browse Source
This commit is contained in:
曹辉 2022-08-31 13:12:14 +08:00
parent 9749aa02f4
commit 33dee5e101
5 changed files with 93 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.development
View File

@ -5,7 +5,7 @@ VUE_APP_TITLE = 幼儿园体质检测管理系统
ENV = 'development'
# 若依管理系统/开发环境
VUE_APP_BASE_API = 'http://192.168.16.81:8081'
VUE_APP_BASE_API = 'http://192.168.16.81:8080'
#'/dev-api'
# 路由懒加载

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

@ -81,11 +81,19 @@
<el-card style="margin-top: 10px">
<div
class="el-table--enable-row-hover el-table--medium"
style="margin: 20px auto;height: 110px; text-align: center;border-bottom:1px solid #f0f0f0;line-height:40px"
style="
margin: 20px auto;
height: 110px;
text-align: center;
border-bottom: 1px solid #f0f0f0;
line-height: 40px;
"
>
<div style="text-align: center; font-size: 18px; margin-bottom: 10px">
幼儿综合得分
</div>
<div
style="text-align: center; font-size: 18px; margin-bottom: 10px"
>
幼儿综合得分
</div>
<div style="display: inline-block">
<span
style="
@ -142,7 +150,7 @@
src="@/icons/金牌2.png"
alt=""
/>
<div style="margin-top: 10px;font-size:14px">{{ item }}</div>
<div style="margin-top: 10px; font-size: 14px">{{ item }}</div>
</span>
</div>
</el-card>
@ -199,14 +207,14 @@ export default {
synthesizelist: {
studentId: "",
batchCode: "",
studentId: "27",
batchCode: "PC202208230011",
// studentId: "27",
// batchCode: "PC202208230011",
},
};
},
created() {
this.synthesizeinfo();
// this.synthesizeinfo();
},
methods: {
itemlists(studentId, batchCode) {
@ -229,8 +237,33 @@ export default {
console.log(this.sythesizestudent);
let seriesData = [];
let yindicator = [];
console.log(res.data);
if (res.data.physiqueCategoryList.length == 1) {
var obj = {
categoryName: "暂无",
categoryNameAbbreviate: "暂无",
categoryScore: null,
levelName: "暂无",
maxScore: null,
};
res.data.physiqueCategoryList.push(obj);
res.data.physiqueCategoryList.push(obj);
res.data.physiqueCategoryList.push(obj);
}
if (res.data.physiqueCategoryList.length == 2) {
var obj = {
categoryName: "暂无",
categoryNameAbbreviate: "暂无",
categoryScore: null,
levelName: "暂无",
maxScore: null,
};
res.data.physiqueCategoryList.push(obj);
res.data.physiqueCategoryList.push(obj);
}
res.data.physiqueCategoryList.forEach((el) => {
// console.log(el.categoryScore);
console.log(el);
seriesData.push(el.categoryScore);
if (el.levelName == null) {
el.levelName = "暂无";
@ -240,10 +273,9 @@ export default {
max: el.maxScore,
});
});
// console.log(seriesData, yindicator);
console.log(seriesData, yindicator);
var myChart = echarts.init(document.getElementById("chart"));
let option = {
//配置维度的最大值
color: "blue",

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

@ -150,33 +150,33 @@
:data="studentInfoList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="所属班级" align="center" prop="className" />
<el-table-column label="民族" align="center" prop="nationDictId">
<el-table-column type="selection" width="50" align="center" />
<el-table-column label="所属班级" align="center" prop="className" width="100"/>
<el-table-column label="民族" align="center" prop="nationDictId" width="70">
<template slot-scope="scope">
{{ nactiontype(scope.row.nationDictId) }}
</template>
</el-table-column>
<el-table-column label="学生姓名" align="center" prop="studentName" />
<el-table-column label="学生性别" align="center" prop="studentSex">
<el-table-column label="学生姓名" align="center" prop="studentName" width="100"/>
<el-table-column label="学生性别" align="center" prop="studentSex" width="80">
<template slot-scope="scope">{{
scope.row.studentSex == male ? "男" : "女"
}}</template>
</el-table-column>
<el-table-column label="学生编号" align="center" prop="studentNumber" />
<el-table-column label="学生编号" align="center" prop="studentNumber" width="180"/>
<el-table-column
label="出生日期"
align="center"
prop="birthDate"
width="180"
width="130"
>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.birthDate, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
<el-table-column label="身份证号" align="center" prop="cardNumber" />
<el-table-column label="曾用名" align="center" prop="onceName" />
<el-table-column label="家庭住址" align="center" prop="homeAddress" />
<el-table-column label="身份证号" align="center" prop="cardNumber" width="180" />
<el-table-column label="曾用名" align="center" prop="onceName" width="100" />
<el-table-column label="家庭住址" align="center" prop="homeAddress" />
<el-table-column
label="操作"
align="center"

5
src/views/system/testItemCountryScore/index.vue
View File

@ -875,12 +875,13 @@ export default {
/** 修改按钮操作 */
handleUpdate(row) {
this.itemId2 = row.itemId;
// console.log(row);
this.reset();
const id = row.id || this.ids;
getTestItemCountryScore(id).then((response) => {
this.form = response.data;
this.xmname = row.itemName;
console.log(this.form)
this.xmname = response.data.itemName;
this.open2 = true;
this.title = "修改全国平均成绩";
console.log(this.form);

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

@ -119,17 +119,6 @@
>删除</el-button
>
</el-col>
<!-- <el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['system:testItemScore:export']"
>导出</el-button
>
</el-col> -->
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
@ -139,8 +128,7 @@
<el-table
v-loading="loading"
:data="testItemScoreList"
@row-dblclick="handledbClick"
ref="table"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="50" align="center" />
<el-table-column
@ -182,7 +170,6 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total > 0"
:total="total"
@ -942,13 +929,8 @@ import {
listKindergartenInfo,
} from "@/api/system/kindergartenInfo";
import Treeselect from "@riophae/vue-treeselect";
import student from "@/views/assembly/student.vue";
export default {
name: "TestItemScore",
components: { Treeselect, student },
data() {
return {
value: "",
@ -1050,6 +1032,9 @@ export default {
batchId: "",
batchCode: "",
},
studentId: "",
batchCode: "",
// 表单参数
form: {},
// 表单校验
@ -1077,14 +1062,7 @@ export default {
created() {
this.getList();
},
methods: {
handledbClick(row, event, column) {
// alert("我被双击了");
this.$refs.table.toggleRowSelection(row);
console.log(row, event, column);
},
testclick() {
this.innerVisible4 = true;
},
@ -1142,7 +1120,7 @@ export default {
this.form.studentId = row.id;
this.form.className = row.className;
this.addqueryParams.studentId = row.id;
this.form.classId = row.id;
this.form.classId = row.classId;
this.innerVisible2 = false;
this.form.studentName = row.studentName;
if (this.form.batchCode != null) {
@ -1295,8 +1273,8 @@ export default {
this.itemId2 = "";
this.studentinfoclick();
this.handleQuery();
this.queryParams.className ="";
this.getList();
this.queryParams.className = "";
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
@ -1337,7 +1315,7 @@ export default {
this.xmname = "请选择所属班级";
this.itemId2 = "";
this.studentinfoclick();
this.queryParams.className = ""
this.queryParams.className = "";
},
/** 新增按钮操作 */
handleAdd() {
@ -1349,11 +1327,11 @@ export default {
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids;
console.log(row);
// this.reset();
var list = {
studentId: row.studentId,
batchCode: row.batchCode,
studentId: this.studentId[0],
batchCode: this.batchCode[0],
};
this.form.itemScoreList = [];
getTestItemScore(list).then((response) => {
@ -1377,7 +1355,6 @@ export default {
updateTestItemScore(this.form).then((response) => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
this.xmname = "请选择所属班级";
this.stname = "请选择学生姓名";
this.itemNumbername = "请选择批次编号";
@ -1386,6 +1363,8 @@ export default {
this.kindergartenName = "请选择幼儿园";
this.kindergartenId = "";
this.queryParams2.kindergartenId = "";
this.queryParams.kindergartenId = "";
this.getList();
});
} else {
this.form.itemScoreList.forEach((e) => {
@ -1394,7 +1373,6 @@ export default {
addTestItemScore(this.form).then((response) => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
this.xmname = "请选择所属班级";
this.stname = "请选择学生姓名";
this.itemNumbername = "请选择批次编号";
@ -1403,6 +1381,8 @@ export default {
this.kindergartenName = "请选择幼儿园";
this.kindergartenId = "";
this.queryParams2.kindergartenId = "";
this.queryParams.kindergartenId = "";
this.getList();
});
}
}
@ -1412,7 +1392,6 @@ export default {
handleDelete(row) {
const studentId = row.studentId;
const batchCode = row.batchCode;
this.$modal
.confirm("是否确认删除个人成绩的数据项？")
.then(function () {
@ -1424,16 +1403,27 @@ export default {
})
.catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download(
"system/testItemScore/export",
{
...this.queryParams,
},
`testItemScore_${new Date().getTime()}.xlsx`
);
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map((item) => item.id);
this.single = selection.length !== 1;
this.multiple = !selection.length;
this.studentId = selection.map((item) => item.studentId);
this.batchCode = selection.map((item) => item.batchCode);
console.log(this.studentId,this.batchCode)
},
// /** 修改按钮操作 */
// handleUpdate(row) {
// console.log(row.id);
// this.reset();
// const id = row.id || this.ids;
// getTestItemScore(id).then((response) => {
// this.form = response.data;
// this.open = true;
// this.title = "修改个人成绩录入管理";
// });
// },
},
};
</script>