diff --git a/.env.development b/.env.development index 2a72dbc..dd5ac82 100644 --- a/.env.development +++ b/.env.development @@ -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' # 路由懒加载 diff --git a/src/views/system/comprehensive/index.vue b/src/views/system/comprehensive/index.vue index e8a38ec..23cdd71 100644 --- a/src/views/system/comprehensive/index.vue +++ b/src/views/system/comprehensive/index.vue @@ -81,11 +81,19 @@
-
- 幼儿综合得分 -
+
+ 幼儿综合得分 +
-
{{ item }}
+
{{ item }}
@@ -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", diff --git a/src/views/system/studentInfo/index.vue b/src/views/system/studentInfo/index.vue index 06b1872..271475b 100644 --- a/src/views/system/studentInfo/index.vue +++ b/src/views/system/studentInfo/index.vue @@ -150,33 +150,33 @@ :data="studentInfoList" @selection-change="handleSelectionChange" > - - - + + + - - + + - + - - - + + + { 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); diff --git a/src/views/system/testItemScore/index.vue b/src/views/system/testItemScore/index.vue index cd0d898..6390008 100644 --- a/src/views/system/testItemScore/index.vue +++ b/src/views/system/testItemScore/index.vue @@ -119,17 +119,6 @@ >删除 - - { @@ -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 = "修改个人成绩录入管理"; + // }); + // }, }, };