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

Merge remote-tracking branch 'origin/dev'

Browse Source 
# Conflicts:
#	.env.development
This commit is contained in:
纪寒 2022-09-15 14:18:19 +08:00
commit 56d42d611e
2 changed files with 15 additions and 31 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' ENV = 'development'
# 若依管理系统/开发环境 # 若依管理系统/开发环境
VUE_APP_BASE_API = 'http://192.168.16.64:8080' VUE_APP_BASE_API = 'http://192.168.16.81:8080'
#'/dev-api' #'/dev-api'
# 路由懒加载 # 路由懒加载

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

@ -193,7 +193,7 @@
@click="yryinnerVisible = true" @click="yryinnerVisible = true"
v-if="kindergartenName == '请选择幼儿园'" v-if="kindergartenName == '请选择幼儿园'"
style=" style="
width: 240px; width: 200px;
text-align: left; text-align: left;
height: 36px; height: 36px;
color: #c0c4cc; color: #c0c4cc;
@ -207,7 +207,7 @@
@click="yryinnerVisible = true" @click="yryinnerVisible = true"
v-else v-else
style=" style="
width: 240px; width: 200px;
text-align: left; text-align: left;
height: 36px; height: 36px;
padding-left: -10px; padding-left: -10px;
@ -1153,35 +1153,19 @@ export default {
methods: { methods: {
handledbClick(row, event, column) { handledbClick(row, event, column) {
// alert("我被双击了");
this.$refs.table.toggleRowSelection(row); this.$refs.table.toggleRowSelection(row);
console.log(row, event, column); console.log(row, event, column);
}, },
// 查看个人信息 // 查看个人信息
seepraent(row) { seepraent(row) {
this.reset(); this.reset();
// const row = row.id || this.ids;
getAllTestItemScoreInfo(row).then((res) => { getAllTestItemScoreInfo(row).then((res) => {
console.log(res)
this.getAllTestItemScore = res.data; this.getAllTestItemScore = res.data;
// console.log(this.getAllTestItemScore); console.log(this.getAllTestItemScore);
this.innerVisible5 = true; this.innerVisible5 = true;
}); });
}, },
// seepraent(row) {
// getAllTestItemScoreInfo(row).then((res) => {
// console.log(res)
// this.form.getAllTestItemScore = [];
// // // console.log(this.addqueryParams);
// this.getAllTestItemScore = res.data.getAllTestItemScore;
// // console.log(this.form);
// // this.form.itemScoreList = res.data;
// // console.log(this.getAllTestItemScore);
// this.innerVisible5 = true;
// });
// },
testclick() { testclick() {
if (this.addqueryParams.studentId == "") { if (this.addqueryParams.studentId == "") {
this.$message.error("请先选择学生"); this.$message.error("请先选择学生");
@ -1195,14 +1179,14 @@ export default {
return e.id != item.id; return e.id != item.id;
}); });
}, },
// getAllTestItemScore() { getAllTest() {
// this.form.itemScoreList = []; this.form.itemScoreList = [];
// console.log(this.addqueryParams); console.log(this.addqueryParams);
// getAllTestItemScoreInfo(this.addqueryParams).then((res) => { getAllTestItemScoreInfo(this.addqueryParams).then((res) => {
// console.log(this.form); console.log(this.form);
// this.form.itemScoreList = res.data; this.form.itemScoreList = res.data;
// }); });
// }, },
//幼儿园左侧点击 //幼儿园左侧点击
kindergartenNameclick(row) { kindergartenNameclick(row) {
this.queryParams2.kindergartenId = row.id; this.queryParams2.kindergartenId = row.id;
@ -1257,7 +1241,7 @@ export default {
this.innerVisible2 = false; this.innerVisible2 = false;
this.form.studentName = row.studentName; this.form.studentName = row.studentName;
if (this.form.batchCode != null) { if (this.form.batchCode != null) {
this.getAllTestItemScore(); this.getAllTest();
} }
// console.log(row); // console.log(row);
}, },
@ -1270,7 +1254,7 @@ export default {
console.log(this.addqueryParams); console.log(this.addqueryParams);
this.innerVisible4 = false; this.innerVisible4 = false;
this.form.batchCode = row.batchCode; this.form.batchCode = row.batchCode;
this.getAllTestItemScore(); this.getAllTest();
}, },
/** 查询个人成绩录入管理列表 */ /** 查询个人成绩录入管理列表 */