From ce1d4373486ff0a0373a3525124ec53593fafcf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Thu, 25 Aug 2022 09:50:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5=E5=85=A5?= =?UTF-8?q?=E5=AD=A6=E6=97=A5=E6=9C=9F=EF=BC=8C=E6=9B=B4=E6=94=B9=E9=A2=98?= =?UTF-8?q?=E7=9B=AE=E5=92=8Clogo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/Sidebar/Logo.vue | 8 ++-- src/views/system/classinfo/index.vue | 54 +++++++++++++++++++++----- 2 files changed, 49 insertions(+), 13 deletions(-) diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue index 8be99f2..4e2edaa 100644 --- a/src/layout/components/Sidebar/Logo.vue +++ b/src/layout/components/Sidebar/Logo.vue @@ -35,7 +35,7 @@ export default { }, data() { return { - title: '幼儿园体质检测管理系统', + title: '智慧幼儿体质评估与促进系统', logo: logoImg } } @@ -66,10 +66,11 @@ export default { width: 100%; & .sidebar-logo { - width: 32px; + width: 18px; height: 32px; vertical-align: middle; - margin-right: 12px; + + } & .sidebar-title { @@ -81,6 +82,7 @@ export default { font-size: 14px; font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif; vertical-align: middle; + } } diff --git a/src/views/system/classinfo/index.vue b/src/views/system/classinfo/index.vue index e88b6ba..5c997ef 100644 --- a/src/views/system/classinfo/index.vue +++ b/src/views/system/classinfo/index.vue @@ -33,6 +33,7 @@ @keyup.enter.native="handleQuery" /> + + + + + + + + + + + { - console.log(value); - console.log(value.length); + // console.log(value); + // console.log(value.length); // 验证手机号的正则表达式 const regMobile = /^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57])[0-9]{8}$/; @@ -415,6 +441,7 @@ export default { kindergartenId: null, className: null, classType: null, + entranceDate: null, }, queryParams2: { pageNum: 1, @@ -427,14 +454,6 @@ export default { form: {}, // 表单校验 rules: { - kindergartenId: [{ required: true, message: "请选择所属幼儿园" }], - className: [ - { required: true, message: "请输入班级名称", trigger: "blur" }, - ], - classType: [{ required: true, message: "请选择幼儿园类型" }], - classTeacher: [ - { required: true, message: "请输入班主任姓名", trigger: "blur" }, - ], phone: [ { required: true, @@ -443,6 +462,16 @@ export default { message: "", }, ], + kindergartenId: [{ required: true, message: "请选择所属幼儿园" }], + className: [ + { required: true, message: "请输入班级名称", trigger: "blur" }, + ], + classType: [{ required: true, message: "请选择幼儿园类型" }], + + classTeacher: [ + { required: true, message: "请输入班主任姓名", trigger: "blur" }], + entranceDate: [ + { required: true, message: "请选择日期", trigger: "change" }], }, }; }, @@ -477,6 +506,7 @@ export default { this.total2 = response.total; }); listClassinfo(this.queryParams).then((response) => { + console.log(response) this.classinfoList = response.rows; this.total = response.total; this.loading = false; @@ -502,6 +532,7 @@ export default { className: null, classType: null, classTeacher: null, + entranceDate:null, phone: undefined, kindergartenName: null, }; @@ -554,6 +585,7 @@ export default { this.kindergartenid2 = ""; this.title = "添加班级信息"; this.kindergartenName = "请选择所在幼儿园"; + }, /** 修改按钮操作 */ handleUpdate(row) { @@ -566,6 +598,7 @@ export default { this.kindergartenName = this.form.kindergartenName; this.open = true; this.title = "修改班级信息"; + }); }, /** 提交按钮 */ @@ -588,6 +621,7 @@ export default { } }); this.kindergartenid2 = ""; + }, /** 删除按钮操作 */ handleDelete(row) { From 6a82030986ce00c9b69a921d5a911619e1c074a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com> Date: Thu, 25 Aug 2022 10:19:01 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/classinfo/index.vue | 34 +++++++++++++--------------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/src/views/system/classinfo/index.vue b/src/views/system/classinfo/index.vue index 5c997ef..ff2bbcd 100644 --- a/src/views/system/classinfo/index.vue +++ b/src/views/system/classinfo/index.vue @@ -131,7 +131,7 @@ - + - { - // console.log(value); - // console.log(value.length); + console.log(value); + var str = String(value); + console.log(str); // 验证手机号的正则表达式 const regMobile = /^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57])[0-9]{8}$/; const reg = /^(0[0-9]{2,3}\-)([2-9][0-9]{6,7})+(\-[0-9]{1,4})?$/; - const isTel = reg.test(value); + const isTel = reg.test(str); - if (value.length == 11) { - if (regMobile.test(value)) { + if (str.length == 11) { + if (regMobile.test(str)) { return cb(); } - } else if (11 < value.length <= 13) { + } else if (11 < str.length <= 13) { if (isTel) { return cb(); } @@ -467,11 +466,13 @@ export default { { required: true, message: "请输入班级名称", trigger: "blur" }, ], classType: [{ required: true, message: "请选择幼儿园类型" }], - + classTeacher: [ - { required: true, message: "请输入班主任姓名", trigger: "blur" }], + { required: true, message: "请输入班主任姓名", trigger: "blur" }, + ], entranceDate: [ - { required: true, message: "请选择日期", trigger: "change" }], + { required: true, message: "请选择日期", trigger: "change" }, + ], }, }; }, @@ -506,7 +507,7 @@ export default { this.total2 = response.total; }); listClassinfo(this.queryParams).then((response) => { - console.log(response) + console.log(response); this.classinfoList = response.rows; this.total = response.total; this.loading = false; @@ -532,7 +533,7 @@ export default { className: null, classType: null, classTeacher: null, - entranceDate:null, + entranceDate: null, phone: undefined, kindergartenName: null, }; @@ -585,7 +586,6 @@ export default { this.kindergartenid2 = ""; this.title = "添加班级信息"; this.kindergartenName = "请选择所在幼儿园"; - }, /** 修改按钮操作 */ handleUpdate(row) { @@ -598,7 +598,6 @@ export default { this.kindergartenName = this.form.kindergartenName; this.open = true; this.title = "修改班级信息"; - }); }, /** 提交按钮 */ @@ -621,7 +620,6 @@ export default { } }); this.kindergartenid2 = ""; - }, /** 删除按钮操作 */ handleDelete(row) { From 3e999a38e6636ee1ac9dc3c9e8ad18d0c9cf9eb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com> Date: Thu, 25 Aug 2022 14:24:37 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- src/api/system/testScoreBatch.js | 13 +- .../system/KindergartenPhysicalTest/index.vue | 7 +- src/views/system/action/index.vue | 52 ++- src/views/system/classconstitution/index.vue | 9 +- src/views/system/comprehensive/index.vue | 11 + src/views/system/constitution/index.vue | 28 +- src/views/system/development/index.vue | 10 +- src/views/system/heightAndWeight/index.vue | 15 +- src/views/system/physique/index.vue | 46 +- src/views/system/quality/index.vue | 11 + src/views/system/shape/index.vue | 54 ++- src/views/system/survey/index.vue | 16 +- src/views/system/testItemScore/index.vue | 112 +++-- src/views/system/testItems/index.vue | 106 ----- src/views/system/testScoreBatch/index.vue | 435 +++++++++++++++--- 16 files changed, 673 insertions(+), 254 deletions(-) diff --git a/.env.development b/.env.development index dd5ac82..2a72dbc 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:8080' +VUE_APP_BASE_API = 'http://192.168.16.81:8081' #'/dev-api' # 路由懒加载 diff --git a/src/api/system/testScoreBatch.js b/src/api/system/testScoreBatch.js index 0181579..47905e2 100644 --- a/src/api/system/testScoreBatch.js +++ b/src/api/system/testScoreBatch.js @@ -1,6 +1,6 @@ import request from '@/utils/request' -// 查询测试成绩批次列表 +// 查询测试批次列表 export function listTestScoreBatch(query) { return request({ url: '/system/testScoreBatch/list', @@ -9,6 +9,15 @@ export function listTestScoreBatch(query) { }) } +// 查询绑定的测试项目名称 +export function temBatchInfoList(query) { + return request({ + url: '/system/testScoreBatch/temBatchInfoList', + method: 'get', + params: query + }) +} + // 查询测试成绩批次详细 export function getTestScoreBatch(id) { return request({ @@ -41,4 +50,4 @@ export function delTestScoreBatch(id) { url: '/system/testScoreBatch/' + id, method: 'delete' }) -} +} \ No newline at end of file diff --git a/src/views/system/KindergartenPhysicalTest/index.vue b/src/views/system/KindergartenPhysicalTest/index.vue index 669e3da..2c0bf21 100644 --- a/src/views/system/KindergartenPhysicalTest/index.vue +++ b/src/views/system/KindergartenPhysicalTest/index.vue @@ -176,8 +176,7 @@ 幼儿园名称:{{ analysislist.kindergartenName - }} + }} 幼儿园性质:{{ @@ -530,6 +529,7 @@ export default { label: { show: true, formatter: "{d}%", //只要百分比 + position: "inside", }, labelLine: { show: true }, color: function (colors) { @@ -611,6 +611,9 @@ export default { this.analysisqueryParams.kindergartenId = row.id; this.kindergartenName = row.kindergartenName; this.kindergartenId = row.id; + if (this.analysisqueryParams.batchCode != "") { + this.analysisinfo(); + } this.kindergartenshow = false; }, diff --git a/src/views/system/action/index.vue b/src/views/system/action/index.vue index dea67b7..c263b50 100644 --- a/src/views/system/action/index.vue +++ b/src/views/system/action/index.vue @@ -372,7 +372,7 @@ > { if (!res.rows || res.rows == "") { this.itemshow2 = true; this.itemshow = false; - this.batchCodeName = "请选择批次"; - this.batchCodeId = ""; } else { // res.rows.itemCategoryList.forEach((e) => { // e.push(res.rows.categoryName); // }); + + this.actionlist = res.rows; + this.actionforeach(); this.itemshow = true; this.itemshow2 = false; - this.actionlist = res.rows; console.log(this.actionlist); - this.actionforeach(); } }); }, @@ -665,10 +663,6 @@ export default { }, //点击批次 batchCodeshowclick() { - this.spanArr = []; - this.position = 0; // 标记位置 - this.spanArr2 = []; - this.position2 = 0; // 标记位置 if (this.queryParams.studentId == "") { this.$message.error("请先选择学生"); } else { @@ -678,6 +672,11 @@ export default { }, //点击批次左边 batchCodeclick(row) { + this.spanArr = []; + this.position = 0; // 标记位置 + this.spanArr2 = []; + this.position2 = 0; // 标记位置 + console.log(row); this.batchCodeName = row.batchName; this.batchCodeId = row.id; this.queryParams.batchCode = row.batchCode; @@ -691,13 +690,6 @@ export default { this.total4 = res.total; }); }, - //学生左侧按钮 - studentclick(row) { - this.studentname = row.studentName; - this.studentId = row.id; - this.studentshow = false; - this.queryParams.studentId = row.id; - }, //获取学生 studentlist() { listStudentInfo(this.studentqueryParams).then((res) => { @@ -731,6 +723,19 @@ export default { //班级关闭 classcancel() { this.classshow = false; + }, //学生左侧按钮 + studentclick(row) { + this.spanArr = []; + this.position = 0; // 标记位置 + this.spanArr2 = []; + this.position2 = 0; // 标记位置 + this.studentname = row.studentName; + this.studentId = row.id; + this.studentshow = false; + this.queryParams.studentId = row.id; + if (this.queryParams.batchCode != "") { + this.listActioninfo(); + } }, //班级左侧点击 classclick(row) { @@ -738,6 +743,9 @@ export default { this.className = row.className; this.classId = row.id; this.studentqueryParams.classId = row.id; + this.studentname = "请选择学生"; + this.studentId = ""; + this.queryParams.studentId = ""; this.classshow = false; }, //幼儿园左侧点击 @@ -745,6 +753,12 @@ export default { this.classqueryParams.kindergartenId = row.id; this.kindergartenName = row.kindergartenName; this.kindergartenId = row.id; + this.kindergartenId = row.id; + this.className = "请选择班级"; + this.classId = ""; + this.studentname = "请选择学生"; + this.studentId = ""; + this.queryParams.studentId = ""; this.kindergartenshow = false; }, //班级类型 diff --git a/src/views/system/classconstitution/index.vue b/src/views/system/classconstitution/index.vue index 31ac081..869533a 100644 --- a/src/views/system/classconstitution/index.vue +++ b/src/views/system/classconstitution/index.vue @@ -498,7 +498,6 @@ export default { this.itemshow2 = true; this.itemshow = false; } else { - this.listname = []; this.totalAvgFraction = res.data.totalAvgFraction; this.categoryTableNameList = res.data.categoryTableNameList; @@ -681,7 +680,7 @@ export default { series: yseries, }; - option && myChart.setOption(option,true); + option && myChart.setOption(option, true); this.itemshow2 = false; this.itemshow = true; } @@ -740,6 +739,9 @@ export default { this.classId = row.id; this.ClassListlist.classId = row.id; this.classshow = false; + if (this.ClassListlist.batchCode != "") { + this.ClassListinfo(); + } }, //幼儿园左侧点击 kindergartenNameclick(row) { @@ -747,6 +749,9 @@ export default { this.ClassListlist.kindergartenId = row.id; this.kindergartenName = row.kindergartenName; this.kindergartenId = row.id; + this.className = "请选择班级"; + this.classId = ""; + this.ClassListlist.classId = ""; this.kindergartenshow = false; }, //班级类型 diff --git a/src/views/system/comprehensive/index.vue b/src/views/system/comprehensive/index.vue index 5736d40..474e683 100644 --- a/src/views/system/comprehensive/index.vue +++ b/src/views/system/comprehensive/index.vue @@ -816,6 +816,9 @@ export default { this.studentId = row.id; this.studentshow = false; this.synthesizelist.studentId = row.id; + if (this.synthesizelist.batchCode != "") { + this.synthesizeinfo(); + } }, //获取学生 studentlist() { @@ -858,10 +861,18 @@ export default { this.classId = row.id; this.studentqueryParams.classId = row.id; this.classshow = false; + this.studentname = "请选择学生"; + this.studentId = ""; + this.synthesizelist.studentId = ""; }, //幼儿园左侧点击 kindergartenNameclick(row) { this.classqueryParams.kindergartenId = row.id; + this.className = "请选择班级"; + this.classId = ""; + this.studentname = "请选择学生"; + this.studentId = ""; + this.synthesizelist.studentId = ""; this.kindergartenName = row.kindergartenName; this.kindergartenId = row.id; this.kindergartenshow = false; diff --git a/src/views/system/constitution/index.vue b/src/views/system/constitution/index.vue index c49ab95..5904ede 100644 --- a/src/views/system/constitution/index.vue +++ b/src/views/system/constitution/index.vue @@ -513,7 +513,7 @@ export default { options() { var myEchart = document.getElementsByClassName("bar"); // var myEchart = document.querySelectorAll(".bar"); - for (var i = 0; i <= this.analysislist.itemScoreList.length; i++) { + for (var i = 0; i < this.analysislist.itemScoreList.length; i++) { var ydata = [ this.analysislist.itemScoreList[i].itemScore, this.analysislist.itemScoreList[i].schoolAvgScore, @@ -659,13 +659,7 @@ export default { this.total4 = res.total; }); }, - //学生左侧按钮 - studentclick(row) { - this.studentname = row.studentName; - this.studentId = row.id; - this.studentshow = false; - this.analysisqueryParams.studentId = row.id; - }, + //获取学生 studentlist() { listStudentInfo(this.studentqueryParams).then((res) => { @@ -700,12 +694,25 @@ export default { classcancel() { this.classshow = false; }, + //学生左侧按钮 + studentclick(row) { + this.studentname = row.studentName; + this.studentId = row.id; + this.studentshow = false; + this.analysisqueryParams.studentId = row.id; + if (this.analysisqueryParams.batchCode != "") { + this.analysislists(); + } + }, //班级左侧点击 classclick(row) { // console.log(row); this.className = row.className; this.classId = row.id; this.studentqueryParams.classId = row.id; + this.studentname = "请选择学生"; + this.studentId = ""; + this.analysisqueryParams.studentId = ""; this.classshow = false; }, //幼儿园左侧点击 @@ -713,6 +720,11 @@ export default { this.classqueryParams.kindergartenId = row.id; this.kindergartenName = row.kindergartenName; this.kindergartenId = row.id; + this.className = "请选择班级"; + this.classId = ""; + this.studentname = "请选择学生"; + this.studentId = ""; + this.analysisqueryParams.studentId = ""; this.kindergartenshow = false; }, //班级类型 diff --git a/src/views/system/development/index.vue b/src/views/system/development/index.vue index 31565f4..f2340f2 100644 --- a/src/views/system/development/index.vue +++ b/src/views/system/development/index.vue @@ -43,6 +43,7 @@ :key="item.name" :label="item.name" :value="item.type" + @click.native="classTypeclick" > @@ -281,7 +282,7 @@
-
此批次暂无结果分析
+
此批次暂无数据
@@ -419,11 +420,18 @@ export default { kindergartencancel() { this.kindergartenshow = false; }, + //classTypeclick + classTypeclick() { + if (this.analysislist.batchCode != "") { + this.analysisinfo(); + } + }, //幼儿园左侧点击 kindergartenNameclick(row) { this.analysislist.kindergartenId = row.id; this.kindergartenName = row.kindergartenName; this.kindergartenId = row.id; + this.analysislist.classType = ""; this.kindergartenshow = false; }, //班级类型 diff --git a/src/views/system/heightAndWeight/index.vue b/src/views/system/heightAndWeight/index.vue index 8179a68..83432ab 100644 --- a/src/views/system/heightAndWeight/index.vue +++ b/src/views/system/heightAndWeight/index.vue @@ -279,10 +279,10 @@ export default { analysislist: [], //查询传值 analysisqueryParams: { - // kindergartenId: "", - // batchCode: "", - kindergartenId: "18", - batchCode: "PC202208030005", + kindergartenId: "", + batchCode: "", + // kindergartenId: "18", + // batchCode: "PC202208030005", }, // weightAndHeightAvgScoreList: [ @@ -322,8 +322,8 @@ export default { analysisinfo() { analysis(this.analysisqueryParams).then((res) => { if (!res.data) { - this.itemshow2=true; - this.itemshow=false; + this.itemshow2 = true; + this.itemshow = false; } else { this.analysislist = res.data; console.log(this.analysislist); @@ -597,6 +597,9 @@ export default { this.kindergartenName = row.kindergartenName; this.kindergartenId = row.id; this.kindergartenshow = false; + if (this.analysisqueryParams.batchCode != "") { + this.analysisinfo(); + } }, getList() { diff --git a/src/views/system/physique/index.vue b/src/views/system/physique/index.vue index 5540e82..768ca9e 100644 --- a/src/views/system/physique/index.vue +++ b/src/views/system/physique/index.vue @@ -32,6 +32,7 @@ :key="item.value" :label="item.label" :value="item.value" + @click.native="sexclick" > @@ -192,7 +193,7 @@ style=" position: relative; display: inline-block; - width: 80px; + width: 120px; text-align: center; " v-for="(item, index) in firstCategoryScoreList" @@ -206,22 +207,25 @@ {{ item.categoryName }}
= - {{ totalAvgFraction }} + {{ + totalAvgFraction + }} (综合得分) @@ -252,7 +256,8 @@ width: 120px; line-height: 60px; border: 1px solid #f0f0f0; - background: #f0f0f0; + background: #27848b; + color: #fff; " > 年龄 @@ -262,7 +267,8 @@ width: 120px; line-height: 60px; border: 1px solid #f0f0f0; - background: #f0f0f0; + background: #27848b; + color: #fff; " > 平均总分 @@ -273,7 +279,8 @@ text-align: center; line-height: 30px; border: 1px solid #f0f0f0; - background: #f0f0f0; + background: #27848b; + color: #fff; " > {{ item.parentName }} @@ -283,7 +290,8 @@ display: flex; line-height: 30px; border: 1px solid #f0f0f0; - background: #f0f0f0; + background: #27848b; + color: #fff; " >
- {{ analysislist.heightName }}: - {{ analysislist.heightScore + {{ + analysislist.heightName + ? analysislist.heightName + : "身高" + }}: {{ analysislist.heightScore }}{{ analysislist.heightMeasureUnit }}
@@ -397,8 +400,11 @@ style="text-align: center" >
- {{ analysislist.weightName }}: - {{ analysislist.weightScore + {{ + analysislist.weightName + ? analysislist.weightName + : "体重" + }}: {{ analysislist.weightScore }}{{ analysislist.weightMeasureUnit }}
@@ -435,6 +441,7 @@ style="height: 310px" >
@@ -610,6 +617,7 @@
{ if (!res.data || res.data == "") { + this.itemshow2 = true; + this.itemshow3 = false; + this.itemshow = false; + } else if (res.data.weightScore == 0 || res.data.weightScore == null) { + this.weightshow = false; + this.analysislist = res.data; + this.itemheight = res.data.heightScore; + this.bmiItemLevel = res.data.bmiItemLevel; + this.itemweight = res.data.weightScore; + this.itemshow2 = false; + this.itemshow3 = false; + this.itemshow = true; + } else if (res.data.heightScore == 0 || res.data.heightScore == null) { + this.heightshow = false; + this.analysislist = res.data; + this.itemheight = res.data.heightScore; + this.bmiItemLevel = res.data.bmiItemLevel; + this.itemweight = res.data.weightScore; + this.itemshow2 = false; + this.itemshow3 = false; + this.itemshow = true; } else if (res.data.bmiItemLevel == null) { this.analysislist = res.data; this.itemheight = res.data.heightScore; @@ -1186,6 +1217,9 @@ export default { this.studentId = row.id; this.studentshow = false; this.analysisstudent.studentId = row.id; + if (this.analysisstudent.batchCode != "") { + this.studentanalysis(); + } }, //获取学生 studentlist() { @@ -1227,6 +1261,9 @@ export default { this.className = row.className; this.classId = row.id; this.studentqueryParams.classId = row.id; + this.studentname = "请选择学生"; + this.studentId = ""; + this.analysisstudent.studentId = ""; this.classshow = false; }, //幼儿园左侧点击 @@ -1234,6 +1271,11 @@ export default { this.classqueryParams.kindergartenId = row.id; this.kindergartenName = row.kindergartenName; this.kindergartenId = row.id; + this.className = "请选择班级"; + this.classId = ""; + this.studentname = "请选择学生"; + this.studentId = ""; + this.analysisstudent.studentId = ""; this.kindergartenshow = false; }, //班级类型 diff --git a/src/views/system/survey/index.vue b/src/views/system/survey/index.vue index e0c7109..900be7e 100644 --- a/src/views/system/survey/index.vue +++ b/src/views/system/survey/index.vue @@ -211,7 +211,7 @@ > { - if (res.rows == [] || !res.rows) { + if (res.rows.length == 0) { this.itemshow2 = true; this.itemshow = false; } else { @@ -643,7 +643,10 @@ export default { }, //点击批次 batchCodeshowclick() { - if (this.classqueryParams.kindergartenId == "") { + if ( + this.classqueryParams.kindergartenId == "" || + this.classqueryParams.kindergartenId == null + ) { this.$message.error("请先选择幼儿园"); } else { this.testScore(); @@ -671,6 +674,13 @@ export default { this.studentlistqueryParams.kindergartenId = row.id; this.kindergartenName = row.kindergartenName; this.kindergartenId = row.id; + if ( + this.studentlistqueryParams.batchCode != "" && + this.classqueryParams.batchCode != "" + ) { + this.StudentListinfo(); + this.ClassListinfo(); + } this.kindergartenshow = false; }, diff --git a/src/views/system/testItemScore/index.vue b/src/views/system/testItemScore/index.vue index cf68a59..706eae3 100644 --- a/src/views/system/testItemScore/index.vue +++ b/src/views/system/testItemScore/index.vue @@ -302,18 +302,24 @@ - + + {{ itemNumbername }} + {{ itemNumbername }} + + + + +
项目名称: + + + + + + +
+ + - - {{ itemNumbername }} - {{ itemNumbername }} - 0 - // ? value.split(".")[0].substring(0, 10) + "." + value.split(".")[1] - // : value.substring(0, 10); - // return value; - // }, - // checkInput1() { - // this.form.maxScore = this.dealInputVal(this.form.maxScore); - // }, - // dealInputVal(value) { - // value = value.replace(/^0*(0\.|[1-9])/, "$1"); - // value = value.replace(/[^\d.]/g, ""); //清除"数字"和"."以外的字符 - // value = value.replace(/^\./g, ""); //验证第一个字符是数字而不是字符 - // value = value.replace(/\.{1,}/g, "."); //只保留第一个.清除多余的 - // value = value.replace(".", "$#$").replace(/\./g, "").replace("$#$", "."); - // value = value.replace(/^(\-)*(\d*)\.(\d\d).*$/, "$1$2.$3"); //只能输入两个小数 - // value = - // value.indexOf(".") > 0 - // ? value.split(".")[0].substring(0, 10) + "." + value.split(".")[1] - // : value.substring(0, 10); - // return value; - // }, - // checkInput2() { - // this.form.largeStandardScore = this.dealInputVal( - // this.form.largeStandardScore - // ); - // }, - // dealInputVal(value) { - // value = value.replace(/^0*(0\.|[1-9])/, "$1"); - // value = value.replace(/[^\d.]/g, ""); //清除"数字"和"."以外的字符 - // value = value.replace(/^\./g, ""); //验证第一个字符是数字而不是字符 - // value = value.replace(/\.{1,}/g, "."); //只保留第一个.清除多余的 - // value = value.replace(".", "$#$").replace(/\./g, "").replace("$#$", "."); - // value = value.replace(/^(\-)*(\d*)\.(\d\d).*$/, "$1$2.$3"); //只能输入两个小数 - // value = - // value.indexOf(".") > 0 - // ? value.split(".")[0].substring(0, 10) + "." + value.split(".")[1] - // : value.substring(0, 10); - // return value; - // }, - // checkInput3() { - // this.form.middleStandardScore = this.dealInputVal( - // this.form.middleStandardScore - // ); - // }, - // dealInputVal(value) { - // value = value.replace(/^0*(0\.|[1-9])/, "$1"); - // value = value.replace(/[^\d.]/g, ""); //清除"数字"和"."以外的字符 - // value = value.replace(/^\./g, ""); //验证第一个字符是数字而不是字符 - // value = value.replace(/\.{1,}/g, "."); //只保留第一个.清除多余的 - // value = value.replace(".", "$#$").replace(/\./g, "").replace("$#$", "."); - // value = value.replace(/^(\-)*(\d*)\.(\d\d).*$/, "$1$2.$3"); //只能输入两个小数 - // value = - // value.indexOf(".") > 0 - // ? value.split(".")[0].substring(0, 10) + "." + value.split(".")[1] - // : value.substring(0, 10); - // return value; - // }, - // checkInput4() { - // this.form.smallStandardScore = this.dealInputVal( - // this.form.smallStandardScore - // ); - // }, - // dealInputVal(value) { - // value = value.replace(/^0*(0\.|[1-9])/, "$1"); - // value = value.replace(/[^\d.]/g, ""); //清除"数字"和"."以外的字符 - // value = value.replace(/^\./g, ""); //验证第一个字符是数字而不是字符 - // value = value.replace(/\.{1,}/g, "."); //只保留第一个.清除多余的 - // value = value.replace(".", "$#$").replace(/\./g, "").replace("$#$", "."); - // value = value.replace(/^(\-)*(\d*)\.(\d\d).*$/, "$1$2.$3"); //只能输入两个小数 - // value = - // value.indexOf(".") > 0 - // ? value.split(".")[0].substring(0, 10) + "." + value.split(".")[1] - // : value.substring(0, 10); - // return value; - // }, - - // checkInput5() { - // this.form.unifiedStandardScore = this.dealInputVal( - // this.form.unifiedStandardScore - // ); - // }, - // dealInputVal(value) { - // value = value.replace(/^0*(0\.|[1-9])/, "$1"); - // value = value.replace(/[^\d.]/g, ""); //清除"数字"和"."以外的字符 - // value = value.replace(/^\./g, ""); //验证第一个字符是数字而不是字符 - // value = value.replace(/\.{1,}/g, "."); //只保留第一个.清除多余的 - // value = value.replace(".", "$#$").replace(/\./g, "").replace("$#$", "."); - // value = value.replace(/^(\-)*(\d*)\.(\d\d).*$/, "$1$2.$3"); //只能输入两个小数 - // value = - // value.indexOf(".") > 0 - // ? value.split(".")[0].substring(0, 10) + "." + value.split(".")[1] - // : value.substring(0, 10); - // return value; - // }, - delInput(index) { this.form.itemLevelList.splice(index, 1); console.log(this.form.itemLevelList); diff --git a/src/views/system/testScoreBatch/index.vue b/src/views/system/testScoreBatch/index.vue index 37a07d7..ff8c238 100644 --- a/src/views/system/testScoreBatch/index.vue +++ b/src/views/system/testScoreBatch/index.vue @@ -1,6 +1,13 @@