From fee7b9b4faa9e857f96a0aa1ca3c2261fc2ef97e Mon Sep 17 00:00:00 2001 From: shidongli Date: Fri, 26 Aug 2022 16:38:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E6=95=99=E5=B8=88=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/classinfo/index.vue | 4 ++-- src/views/system/teacherInfo/index.vue | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/views/system/classinfo/index.vue b/src/views/system/classinfo/index.vue index ff2bbcd..62ee7e6 100644 --- a/src/views/system/classinfo/index.vue +++ b/src/views/system/classinfo/index.vue @@ -238,7 +238,7 @@ @@ -388,7 +388,7 @@ export default { console.log(str); // 验证手机号的正则表达式 const regMobile = - /^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57])[0-9]{8}$/; + /^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[189]))\d{8}$/; const reg = /^(0[0-9]{2,3}\-)([2-9][0-9]{6,7})+(\-[0-9]{1,4})?$/; const isTel = reg.test(str); diff --git a/src/views/system/teacherInfo/index.vue b/src/views/system/teacherInfo/index.vue index d4455ed..a4e1cea 100644 --- a/src/views/system/teacherInfo/index.vue +++ b/src/views/system/teacherInfo/index.vue @@ -247,7 +247,7 @@ @@ -581,6 +581,7 @@ import { export default { name: "TeacherInfo", data() { + // const checkMobile =/^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[189]))\d{8}$/; // 验证手机号的规则 var checkMobile = (rule, value, cb) => { // 验证手机号的正则表达式 @@ -590,7 +591,7 @@ export default { cb(); } else { const regMobile = - /^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57])[0-9]{8}$/; + /^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[189]))\d{8}$/; const reg = /^(0[0-9]{2,3}\-)([2-9][0-9]{6,7})+(\-[0-9]{1,4})?$/; const isTel = reg.test(value); From df64c30fe8e2d1aa0e9d510bda3eacf684b325ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Fri, 26 Aug 2022 17:05:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/testItemScore.js | 14 +- src/views/system/testItemScore/index.vue | 943 +++++++---------------- 2 files changed, 272 insertions(+), 685 deletions(-) diff --git a/src/api/system/testItemScore.js b/src/api/system/testItemScore.js index e9be007..39e1041 100644 --- a/src/api/system/testItemScore.js +++ b/src/api/system/testItemScore.js @@ -45,10 +45,12 @@ export function testScoreBatch(query) { } // 查询个人成绩录入管理详细 -export function getTestItemScore(id) { +export function getTestItemScore(query) { return request({ - url: '/system/testItemScore/' + id, - method: 'get' + url: '/system/testItemScore/getInfo', + method: 'get', + params: query + }) } @@ -71,10 +73,10 @@ export function updateTestItemScore(data) { } // 删除个人成绩录入管理 -export function delTestItemScore(id) { +export function delTestItemScore(studentId, batchCode) { return request({ - url: '/system/testItemScore/' + id, - method: 'delete' + url: '/system/testItemScore/deleteItemScore?studentId=' + studentId + '&batchCode=' + batchCode, + method: 'post', }) } // 反显 diff --git a/src/views/system/testItemScore/index.vue b/src/views/system/testItemScore/index.vue index ecd8826..c644c7a 100644 --- a/src/views/system/testItemScore/index.vue +++ b/src/views/system/testItemScore/index.vue @@ -117,37 +117,13 @@ - - - - - - + @@ -186,118 +162,6 @@ @pagination="getList" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- 确 定 - 取 消 -
- - - + - + {{ xmname }} - - + + {{ stname }} + + {{ stname }} - - + + {{ itemNumbername }} + + -
- 项目名称: - - - - - - -
- - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + +
确 定 取 消 @@ -925,86 +810,85 @@ >重置 - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + +
@@ -1031,187 +915,6 @@ export default { name: "TestItemScore", components: { Treeselect }, data() { - var roleMoeny = (rule, value, callback) => { - var str = value; - var str_ = ""; - var str2 = ""; - console.log(str); - if (str == undefined) { - return callback(new Error("请填写")); - } - if (value.includes(".")) { - str_ = str.substr(str.indexOf(".")).length; - str2 = str.substr(0, str.indexOf(".")).length; - console.log(str2); - if (Number.isNaN(Number.parseFloat(str))) { - callback(new Error("请输入成绩")); - } else if (!this.form2.itemScore) { - callback(new Error("不能为空")); - } else if (this.form2.itemScore * 1 > 99999999) { - callback(new Error("最大99999999")); // 限制最大额度 - } else if (this.form2.itemScore == "0") { - callback(new Error("请输入成绩")); // 限制最大额度 - } else if (str_ > 3) { - callback(new Error("小数点后两位")); // 限制最大额度 - } else if (str2 > 3) { - callback(new Error("整数为三位")); // 限制最大额度 - } else { - callback(); - } - } else { - str2 = str.length; - if (Number.isNaN(Number.parseFloat(str))) { - callback(new Error("请输入成绩得分")); - } else if (!this.form2.itemScore) { - callback(new Error("不能为空")); - } else if (this.form2.itemScore * 1 > 99999999) { - callback(new Error("最大99999999")); // 限制最大额度 - } else if (this.form2.itemScore == "0") { - callback(new Error("请输入成绩")); // 限制最大额度 - } else if (str2 > 3) { - callback(new Error("整数为三位")); // 限制最大额度 - } else { - callback(); - } - } - }; - var roleMoeny2 = (rule, value, callback) => { - var str = value; - console.log(str); - var str_ = ""; - var str2 = ""; - if (str == undefined) { - return callback(new Error("请填写")); - } - if (str.includes(".")) { - str_ = str.substr(str.indexOf(".")).length; - str2 = str.substr(0, str.indexOf(".")).length; - console.log(str2); - if (Number.isNaN(Number.parseFloat(str))) { - callback(new Error("请输入成绩得分")); - } else if (!this.form2.itemFraction) { - callback(new Error("不能为空")); - } else if (this.form2.itemFraction * 1 > 99999999) { - callback(new Error("最大99999999")); // 限制最大额度 - } else if (this.form2.itemFraction == "0") { - callback(new Error("请输入成绩")); // 限制最大额度 - } else if (str_ > 3) { - callback(new Error("小数点后两位")); // 限制最大额度 - } else if (str2 > 3) { - callback(new Error("整数为三位")); // 限制最大额度 - } else { - callback(); - } - } else { - str2 = str.length; - console.log(str2); - if (Number.isNaN(Number.parseFloat(str))) { - callback(new Error("请输入成绩得分")); - } else if (!this.form2.itemFraction) { - callback(new Error("不能为空")); - } else if (this.form2.itemFraction * 1 > 99999999) { - callback(new Error("最大99999999")); // 限制最大额度 - } else if (this.form2.itemFraction == "0") { - callback(new Error("请输入成绩")); // 限制最大额度 - } else if (str2 > 3) { - callback(new Error("整数为三位")); // 限制最大额度 - } else { - callback(); - } - } - }; - - var roleMoeny3 = (rule, value, callback) => { - console.log(this.form.itemScore); - var str = String(this.form.itemScore); - console.log(str); - var str_ = ""; - var str2 = ""; - if (str == undefined) { - return callback(new Error("请填写")); - } - if (str.includes(".")) { - str_ = str.substr(str.indexOf(".")).length; - str2 = str.substr(0, str.indexOf(".")).length; - console.log(str2); - if (Number.isNaN(Number.parseFloat(str))) { - callback(new Error("请输入成绩")); - } else if (!this.form.itemScore) { - callback(new Error("不能为空")); - } else if (this.form.itemScore * 1 > 99999999) { - callback(new Error("最大99999999")); // 限制最大额度 - } else if (this.form.itemScore == "0") { - callback(new Error("请输入成绩")); // 限制最大额度 - } else if (str_ > 3) { - callback(new Error("小数点后两位")); // 限制最大额度 - } else if (str2 > 3) { - callback(new Error("整数为三位")); // 限制最大额度 - } else { - callback(); - } - } else { - str2 = str.length; - console.log(str2); - if (Number.isNaN(Number.parseFloat(str))) { - callback(new Error("请输入成绩")); - } else if (!this.form.itemScore) { - callback(new Error("不能为空")); - } else if (this.form.itemScore * 1 > 99999999) { - callback(new Error("最大99999999")); // 限制最大额度 - } else if (this.form.itemScore == "0") { - callback(new Error("请输入成绩")); // 限制最大额度 - } else if (str2 > 3) { - callback(new Error("整数为三位")); // 限制最大额度 - } else { - callback(); - } - } - }; - var roleMoeny4 = (rule, value, callback) => { - var str = String(this.form.itemFraction); - var str_ = ""; - var str2 = ""; - if (str == undefined) { - return callback(new Error("请填写")); - } - if (str.includes(".")) { - str_ = str.substr(str.indexOf(".")).length; - str2 = str.substr(0, str.indexOf(".")).length; - console.log(str2); - if (Number.isNaN(Number.parseFloat(str))) { - callback(new Error("请输入成绩得分")); - } else if (!this.form.itemFraction) { - callback(new Error("不能为空")); - } else if (this.form.itemFraction * 1 > 99999999) { - callback(new Error("最大99999999")); // 限制最大额度 - } else if (this.form.itemFraction == "0") { - callback(new Error("请输入成绩")); // 限制最大额度 - } else if (str_ > 3) { - callback(new Error("小数点后两位")); // 限制最大额度 - } else if (str2 > 3) { - callback(new Error("整数为三位")); // 限制最大额度 - } else { - callback(); - } - } else { - str2 = str.length; - console.log(str2); - if (Number.isNaN(Number.parseFloat(str))) { - callback(new Error("请输入成绩得分")); - } else if (!this.form.itemFraction) { - callback(new Error("不能为空")); - } else if (this.form.itemFraction * 1 > 99999999) { - callback(new Error("最大99999999")); // 限制最大额度 - } else if (this.form.itemFraction == "0") { - callback(new Error("请输入成绩")); // 限制最大额度 - } else if (str2 > 3) { - callback(new Error("整数为三位")); // 限制最大额度 - } else { - callback(); - } - } - }; - return { value: "", //项目测试类型 @@ -1275,11 +978,8 @@ export default { title: "", // 是否显示弹出层 open: false, - open2: false, itemId2: "", itemId3: "", - itemId4: "", - itemId5: "", // 查询参数 queryParams: { pageNum: 1, @@ -1311,65 +1011,14 @@ export default { batchCode: null, }, addqueryParams: { - testItemId: "", - testItemId: "", + studentId: "", + batchId: "", batchCode: "", }, // 表单参数 form: {}, - form2: {}, // 表单校验 - rules2: { - itemScore: [ - { - required: true, - validator: roleMoeny3, - message: "", - trigger: "blur", - }, - ], - classId: [ - { required: true, message: "所属班级不能为空", trigger: "blur" }, - ], - studentId: [ - { required: true, message: "学生姓名不能为空", trigger: "blur" }, - ], - testItemId: [ - { required: true, message: "测试项目名称不能为空", trigger: "blur" }, - ], - batchCode: [ - { - required: true, - message: "批次编号不能为空", - trigger: "blur", - }, - ], - - scoreDictValue: [ - { required: true, message: "请输入个人成绩", trigger: "blur" }, - ], - itemFraction: [ - { - required: true, - validator: roleMoeny4, - message: "", - trigger: "blur", - }, - ], - - syntheticalAssess: [ - { required: true, message: "综合评价不能为空", trigger: "blur" }, - ], - }, rules: { - itemScore: [ - { - required: true, - validator: roleMoeny, - message: "", - trigger: "blur", - }, - ], classId: [ { required: true, message: "所属班级不能为空", trigger: "blur" }, ], @@ -1386,24 +1035,8 @@ export default { trigger: "blur", }, ], - - scoreDictValue: [ - { required: true, message: "请输入个人成绩", trigger: "blur" }, - ], - itemFraction: [ - { - required: true, - validator: roleMoeny2, - message: "", - trigger: "blur", - }, - ], - syntheticalAssess: [ - { required: true, message: "综合评价不能为空", trigger: "blur" }, - ], }, - realVal: "", - realVal2: "", + testitems: [], }; }, created() { @@ -1411,24 +1044,39 @@ export default { }, methods: { + testclick() { + if (this.addqueryParams.studentId == "") { + this.$message.error("请先选择学生"); + } else { + this.innerVisible4 = true; + } + }, + delitem(item) { + console.log(item); + this.form.itemScoreList = this.form.itemScoreList.filter((e) => { + return e.id != item.id; + }); + }, getAllTestItemScore() { + this.form.itemScoreList = []; console.log(this.addqueryParams); getAllTestItemScoreInfo(this.addqueryParams).then((res) => { - console.log(res); - if (res.data) { - this.form2.itemScore = res.data.itemScore; - this.form2.itemFraction = res.data.itemFraction; - this.form2.syntheticalAssess = res.data.syntheticalAssess; - } + console.log(this.form); + this.form.itemScoreList = res.data; }); }, //幼儿园左侧点击 kindergartenNameclick(row) { - this.form2.kindergartenId = row.id; this.queryParams2.kindergartenId = row.id; this.kindergartenName = row.kindergartenName; this.kindergartenId = row.id; this.yryinnerVisible = false; + this.xmname = "请选择所属班级"; + this.stname = "请选择学生姓名"; + this.itemId2 = ""; + this.itemId3 = ""; + this.form.classId = null; + this.form.studentId = null; }, //幼儿园关闭 kindergartencancel() { @@ -1440,13 +1088,13 @@ export default { this.xmname = row.className; this.itemId2 = row.id; this.form.classId = row.id; - this.form2.classId = row.id; - console.log(this.form); this.innerVisible = false; this.form.className = row.className; - this.queryParams3.classId = row.id; + this.stname = "请选择学生姓名"; + this.itemId3 = ""; + this.form.studentId = null; }, //打开选择学生页面 studentinfoclick() { @@ -1463,59 +1111,27 @@ export default { } }, // 学生信息 - studentclick(row) { this.stname = row.studentName; this.itemId3 = row.id; this.form.studentId = row.id; - this.form2.studentId = row.id; this.addqueryParams.studentId = row.id; this.innerVisible2 = false; this.form.studentName = row.studentName; - // console.log(row); - }, - - //测试项目 - testclick(row) { - if (row.resultDictType == this.ResultType2.dictCode) { - this.form2.scoreDictId = this.ResultType2.dictCode; //wenben - } else if (row.resultDictType == this.ResultType1.dictCode) { - this.form2.scoreDictId = this.ResultType1.dictCode; //number + if (this.form.batchCode != null) { + this.getAllTestItemScore(); } - console.log(this.form); - console.log(this.form2); - console.log(row); - this.itemId4 = row.id; - this.form.testItemId = row.id; - this.form2.testItemId = row.id; - this.form.itemName = row.itemName; - this.addqueryParams.testItemId = row.id; - // if (row.resultDictType == this.ResultType1.dictCode) { - // this.form2.resultDictType = this.ResultType1.dictValue; - // this.form.dictValue = this.ResultType1.dictValue; - // this.form2.scoreDictValue = ""; - // } - - // if (row.resultDictType == this.ResultType2.dictCode) { - // this.form2.resultDictType = this.ResultType2.dictValue; - // this.form.dictValue = this.ResultType2.dictValue; - // this.form.itemScore = ""; - // this.form2.itemScore = ""; - // } + // console.log(row); }, //批次编号 batchCodeclick(row) { - // console.log(row); - // ResultType1 this.itemNumbername = row.batchCode; - this.itemId5 = row.id; - // this.form.itemScore = row.id; - // this.form2.itemScore = row.id; this.addqueryParams.batchCode = row.batchCode; + this.addqueryParams.batchId = row.id; + console.log(this.addqueryParams); this.innerVisible4 = false; this.form.batchCode = row.batchCode; - this.form2.batchCode = row.batchCode; this.getAllTestItemScore(); }, /** 查询个人成绩录入管理列表 */ @@ -1546,6 +1162,7 @@ export default { this.itemResultTypelist = res.data; this.ResultType1 = this.itemResultTypelist[0]; this.ResultType2 = this.itemResultTypelist[1]; + console.log(this.ResultType1); }); }, // 取消按钮 @@ -1559,57 +1176,18 @@ export default { this.itemNumbername = "请选择批次编号"; this.itemId2 = ""; this.itemId3 = ""; - this.itemId4 = ""; - this.itemId5 = ""; this.queryParams2.kindergartenId = ""; this.queryParams3.classId = ""; }, - cancel2() { - this.open2 = false; - // this.xmname = "请选择所属项目"; - this.reset(); - }, // 表单重置 reset() { this.form = { - id: null, + id: "", classId: null, studentId: null, - testItemId: null, - scoreDictId: null, - scoreDictValue: null, batchCode: null, - itemScore: null, - syntheticalAssess: null, - delFlag: null, - createBy: null, - createTime: null, - updateBy: null, - updateTime: null, - scoreDictValue: "", - itemScore: "", - resultDictType: "", - itemFraction: "", + itemScoreList: [], }; - this.form2 = { - classId: null, - studentId: null, - testItemId: null, - scoreDictId: null, - scoreDictValue: null, - batchCode: null, - itemScore: null, - syntheticalAssess: null, - scoreDictValue: "", - itemScore: "", - itemFraction: "", - }; - // this.form2 = { - // itemId: null, - // scoreDictValue: "", - // item: "", - // resultDictType: "", //number text - // }; this.resetForm("form"); }, /** 搜索按钮操作 */ @@ -1669,44 +1247,51 @@ export default { this.open = true; this.itemId2 = ""; this.itemId3 = ""; - this.itemId4 = ""; - this.itemId5 = ""; this.title = "添加个人成绩录入管理"; }, /** 修改按钮操作 */ handleUpdate(row) { this.reset(); const id = row.id || this.ids; - getTestItemScore(id).then((response) => { - if (response.data.itemScore == "" || response.data.itemScore == null) { - response.data.dictvalue = "text"; - } else if ( - response.data.scoreDictValue == "" || - response.data.scoreDictValue == null - ) { - response.data.dictvalue = "number"; - } + var list = { + studentId: row.studentId, + batchCode: row.batchCode, + }; + getTestItemScore(list).then((response) => { + console.log(); this.form = response.data; - // this.form = response.className; - // this.queryParams.xmname = this.className; - this.open2 = true; - this.title = "修改个人成绩录入管理"; + this.open = true; + this.queryParams3.classId = response.data.classId; + this.stname = response.data.studentName; + this.itemId3 = response.data.studentId; + this.addqueryParams.studentId = response.data.studentId; + this.itemNumbername = response.data.batchCode; console.log(this.form); }); }, /** 提交按钮 */ submitForm() { - console.log(this.form2); this.$refs["form"].validate((valid) => { if (valid) { - if (this.form.id != null) { + if (this.form.id == null) { updateTestItemScore(this.form).then((response) => { this.$modal.msgSuccess("修改成功"); - this.open2 = false; + this.open = false; this.getList(); + this.xmname = "请选择所属班级"; + this.stname = "请选择学生姓名"; + this.itemNumbername = "请选择批次编号"; + this.itemId2 = ""; + this.itemId3 = ""; + this.kindergartenName = "请选择幼儿园"; + this.kindergartenId = ""; + this.queryParams2.kindergartenId = ""; }); } else { - addTestItemScore(this.form2).then((response) => { + this.form.itemScoreList.forEach((e) => { + e.testItemId = e.itemId; + }); + addTestItemScore(this.form).then((response) => { this.$modal.msgSuccess("新增成功"); this.open = false; this.getList(); @@ -1715,8 +1300,6 @@ export default { this.itemNumbername = "请选择批次编号"; this.itemId2 = ""; this.itemId3 = ""; - this.itemId4 = ""; - this.itemId5 = ""; this.kindergartenName = "请选择幼儿园"; this.kindergartenId = ""; this.queryParams2.kindergartenId = ""; @@ -1727,11 +1310,13 @@ export default { }, /** 删除按钮操作 */ handleDelete(row) { - const ids = row.id || this.ids; + const studentId = row.studentId; + const batchCode = row.batchCode; + this.$modal .confirm("是否确认删除个人成绩的数据项？") .then(function () { - return delTestItemScore(ids); + return delTestItemScore(studentId, batchCode); }) .then(() => { this.getList();