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-19 14:27:59 +08:00
parent 2d0c93d7f4
commit abd75b3167
4 changed files with 362 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/views/system/testItemCityScore/index.vue
View File

@ -26,6 +26,7 @@
style="width: 228px" style="width: 228px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="平均得分" prop="itemAvgScore"> <el-form-item label="平均得分" prop="itemAvgScore">
<el-input <el-input
v-model="queryParams.itemAvgScore" v-model="queryParams.itemAvgScore"
@ -109,6 +110,12 @@
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="所属区域" align="center" prop="name" /> <el-table-column label="所属区域" align="center" prop="name" />
<el-table-column label="所属项目" align="center" prop="itemName" /> <el-table-column label="所属项目" align="center" prop="itemName" />
<el-table-column label="性别" align="center" prop="sex" >
<template slot-scope="scope">
{{ scope.row.sex == "MALE" ? "男":"" }}
{{ scope.row.sex == "FEMALE" ? "女" :"" }}
</template>
</el-table-column>
<el-table-column label="平均得分" align="center" prop="itemAvgScore"> <el-table-column label="平均得分" align="center" prop="itemAvgScore">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.dictValue == "number" ? scope.row.itemAvgScore : "" }} {{ scope.row.dictValue == "number" ? scope.row.itemAvgScore : "" }}
@ -219,6 +226,12 @@
prop="itemAvgText" prop="itemAvgText"
> >
<el-input v-model="form.itemAvgText" placeholder="请输入平均得分" /> <el-input v-model="form.itemAvgText" placeholder="请输入平均得分" />
</el-form-item>
<el-form-item label="学生性别" prop="sex">
<el-radio-group v-model="form.sex">
<el-radio :label="male">男</el-radio>
<el-radio :label="female">女</el-radio>
</el-radio-group>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -279,6 +292,13 @@
v-if="form.dictValue == 'text'" v-if="form.dictValue == 'text'"
> >
<el-input v-model="form.itemAvgText" placeholder="请输入平均得分" /> <el-input v-model="form.itemAvgText" placeholder="请输入平均得分" />
</el-form-item>
<el-form-item label="学生性别" prop="sex">
<el-radio-group v-model="form.sex">
<el-radio :label="male">男</el-radio>
<el-radio :label="female">女</el-radio>
</el-radio-group>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -485,6 +505,9 @@ export default {
ResultType2: "", ResultType2: "",
// 非单个禁用 // 非单个禁用
single: true, single: true,
//性别
male: "MALE",
female: "FEMALE",
// 非多个禁用 // 非多个禁用
multiple: true, multiple: true,
// 显示搜索条件 // 显示搜索条件
@ -550,6 +573,7 @@ export default {
{ required: true, message: "请选择所属项目", trigger: "blur" }, { required: true, message: "请选择所属项目", trigger: "blur" },
], ],
}, },
realVal:'',
}; };
}, },
created() { created() {
@ -557,18 +581,26 @@ export default {
}, },
methods: { methods: {
NumberCheck(num) { NumberCheck(num) {
let str = this.form.itemAvgScore; let str = this.form.itemAvgScore;
//限制只能输入一个小数点 // console.log(str)
if (str.indexOf(".") != -1) { if (Number.isNaN(Number.parseFloat(str))) {
var str_ = str.substr(str.indexOf(".") + 1); } else {
if (str_.indexOf(".") != -1) { //限制只能输入一个小数点
str = str.substr(0, str.indexOf(".") + str_.indexOf(".") + 1); if (str.indexOf(".") != -1) {
} var str_ = str.substr(str.indexOf(".") + 1);
} if (str_.indexOf(".") != -1) {
//正则替换，保留数字和小数点 str = str.substr(0, str.indexOf(".") + str_.indexOf(".") + 1);
str = str.replace(/[^\d^\.]+/g,'') }
this.form.itemAvgScore=str }
}, //正则替换，保留数字和小数点
// str = str.replace(/[^\d^\.]+/g, "");
// console.log(str)
// this.form2.itemAvgScore = str;
str = parseFloat(str).toFixed(3)
this.realVal = str.substring(0, str.length - 1)
}
},
normalizer3(node) { normalizer3(node) {
if (node.children && !node.children.length) { if (node.children && !node.children.length) {
@ -730,6 +762,7 @@ export default {
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.form.itemAvgScore = this.realVal;
if (this.form.resultDictType == this.ResultType1.dictValue) { if (this.form.resultDictType == this.ResultType1.dictValue) {
console.log(this.ResultType1.dictValue); console.log(this.ResultType1.dictValue);
this.form.itemAvgText = ""; this.form.itemAvgText = "";

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

@ -17,14 +17,6 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<!-- <el-form-item label="测试项目平均成绩" label-width="200">
<el-input
v-model="queryParams.itemAvgScore"
placeholder="请输入测试项目平均成绩"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-form-item> <el-form-item>
<el-button <el-button
type="primary" type="primary"
@ -100,10 +92,14 @@
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="主键id" align="center" prop="id" /> --> <!-- <el-table-column label="主键id" align="center" prop="id" /> -->
<el-table-column label="所属项目" align="center" prop="itemName" /> <el-table-column label="所属项目" align="center" prop="itemName" />
<el-table-column label="平均得分" align="center"> <el-table-column label="性别" align="center" prop="sex">
<!-- <template slot-scope="scope"> <template slot-scope="scope">
{{ fun(scope.row.itemAvgScore) }} {{ scope.row.sex == "MALE" ? "男" : "" }}
</template> --> {{ scope.row.sex == "FEMALE" ? "女" : "" }}
</template>
</el-table-column>
<el-table-column label="平均得分" align="center" prop="itemAvgScore">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.dictValue == "number" ? scope.row.itemAvgScore : "" }} {{ scope.row.dictValue == "number" ? scope.row.itemAvgScore : "" }}
{{ scope.row.dictValue == "text" ? scope.row.itemAvgText : "" }} {{ scope.row.dictValue == "text" ? scope.row.itemAvgText : "" }}
@ -194,7 +190,7 @@
> >
<el-input <el-input
v-model="form.itemAvgScore" v-model="form.itemAvgScore"
@input="NumberCheck2()" @input="NumberCheck2()"
style="width: 360px" style="width: 360px"
placeholder="请输入平均得分" placeholder="请输入平均得分"
/> />
@ -210,6 +206,12 @@
style="width: 360px" style="width: 360px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="学生性别" prop="sex">
<el-radio-group v-model="form.sex">
<el-radio :label="male">男</el-radio>
<el-radio :label="female">女</el-radio>
</el-radio-group>
</el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -227,7 +229,7 @@
:before-close="cancel" :before-close="cancel"
> >
<el-form <el-form
ref="form" ref="form2"
:model="form2" :model="form2"
:rules="rules" :rules="rules"
label-width="80px" label-width="80px"
@ -267,6 +269,7 @@
v-if="form2.resultDictType == ''" v-if="form2.resultDictType == ''"
> >
<el-input placeholder="请输入平均得分" style="width: 360px" /> <el-input placeholder="请输入平均得分" style="width: 360px" />
</el-form-item> </el-form-item>
<el-form-item <el-form-item
@ -280,7 +283,9 @@
placeholder="请输入平均得分" placeholder="请输入平均得分"
style="width: 360px" style="width: 360px"
/> />
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="平均得分" label="平均得分"
@ -293,6 +298,12 @@
style="width: 360px" style="width: 360px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="学生性别" prop="sex">
<el-radio-group v-model="form2.sex">
<el-radio :label="male">男</el-radio>
<el-radio :label="female">女</el-radio>
</el-radio-group>
</el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
@ -498,17 +509,21 @@ import { tKindergartenInfo } from "@/api/system/kindergartenInfo";
export default { export default {
name: "TestItemCountryScore", name: "TestItemCountryScore",
data() { data() {
var roleMoeny = (rule, value, callback) => { var roleMoeny = (rule, value, callback) => {
// value=String(value).split(".")[0] + "." + value.split(".")[1].slice(0, 2)
// console.log(arr)
if (Number.isNaN(Number.parseFloat(value))) { if (Number.isNaN(Number.parseFloat(value))) {
callback(new Error("请输入")); callback(new Error("请输入数字"));
} else if (!this.form2.itemAvgScore) { } else if (!this.form2.itemAvgScore) {
callback(new Error("不能为空")); callback(new Error("不能为空"));
} else } else if (this.form2.itemAvgScore * 1 > 99999999) {
if (this.form2.itemAvgScore * 1 > 99999999) {
callback(new Error("最大99999999")); // 限制最大额度 callback(new Error("最大99999999")); // 限制最大额度
} else if (this.form2.itemAvgScore == "0") {
callback(new Error("请输入成绩")); // 限制最大额度
} else { } else {
callback(); callback();
} }
}; };
var roleMoeny2 = (rule, value, callback) => { var roleMoeny2 = (rule, value, callback) => {
@ -539,6 +554,7 @@ export default {
// 非单个禁用 // 非单个禁用
single: true, single: true,
// 非多个禁用 // 非多个禁用
multiple: true, multiple: true,
// 显示搜索条件 // 显示搜索条件
showSearch: true, showSearch: true,
@ -547,6 +563,9 @@ export default {
// 总条数 // 总条数
total: 0, total: 0,
total2: 0, total2: 0,
//性别
male: "MALE",
female: "FEMALE",
//xiangmu //xiangmu
testItemslists: [], testItemslists: [],
// 全国平均成绩表格数据 // 全国平均成绩表格数据
@ -564,6 +583,7 @@ export default {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
itemName: null, itemName: null,
sex: null,
}, },
queryParams2: { queryParams2: {
pageNum: 1, pageNum: 1,
@ -578,49 +598,89 @@ export default {
// 表单校验 // 表单校验
rulesxg: { rulesxg: {
itemAvgScore: [{ required: true, validator: roleMoeny2, message: "", trigger: "blur"}], itemId: [
{ required: true, message: "请选择所属项目", trigger: "blur" },
}, ],
rules: { itemAvgScore: [
itemId: [{ required: true }], {
itemAvgScore: [ { required: true, validator: roleMoeny, message: "",trigger: "blur" }], required: true,
validator: roleMoeny2,
message: "",
trigger: "blur",
},
],
itemAvgText: [ itemAvgText: [
{ required: true, message: "请输入平均得分", trigger: "blur" }, { required: true, message: "请输入平均得分", trigger: "blur" },
], ],
}, },
rules: {
itemId: [
{ required: true, message: "请选择所属项目", trigger: "blur" },
],
itemAvgScore: [
{
required: true,
validator: roleMoeny,
message: "",
trigger: "blur",
},
],
itemAvgText: [
{ required: true, message: "请输入平均得分", trigger: "blur" },
],
},
realVal:'',
}; };
}, },
created() { created() {
this.getList(); this.getList();
}, },
methods: { methods:
{
//添加的只能保留一个小数点 //添加的只能保留一个小数点
NumberCheck(num) { NumberCheck(num) {
let str = this.form2.itemAvgScore; let str = this.form2.itemAvgScore;
//限制只能输入一个小数点 // console.log(str)
if (str.indexOf(".") != -1) { if (Number.isNaN(Number.parseFloat(str))) {
var str_ = str.substr(str.indexOf(".") + 1); } else {
if (str_.indexOf(".") != -1) { //限制只能输入一个小数点
str = str.substr(0, str.indexOf(".") + str_.indexOf(".") + 1); if (str.indexOf(".") != -1) {
} var str_ = str.substr(str.indexOf(".") + 1);
} if (str_.indexOf(".") != -1) {
//正则替换，保留数字和小数点 str = str.substr(0, str.indexOf(".") + str_.indexOf(".") + 1);
str = str.replace(/[^\d^\.]+/g,'') }
this.form2.itemAvgScore=str }
}, //正则替换，保留数字和小数点
NumberCheck2(num) { // str = str.replace(/[^\d^\.]+/g, "");
let str = this.form.itemAvgScore; // console.log(str)
//限制只能输入一个小数点 // this.form2.itemAvgScore = str;
if (str.indexOf(".") != -1) {
var str_ = str.substr(str.indexOf(".") + 1); str = parseFloat(str).toFixed(3)
if (str_.indexOf(".") != -1) { this.realVal = str.substring(0, str.length - 1)
str = str.substr(0, str.indexOf(".") + str_.indexOf(".") + 1); }
} },
} NumberCheck2(num) {
//正则替换，保留数字和小数点 let str = this.form.itemAvgScore;
str = str.replace(/[^\d^\.]+/g,'') if (Number.isNaN(Number.parseFloat(str))) {
this.form.itemAvgScore=str } else {
}, //限制只能输入一个小数点
if (str.indexOf(".") != -1) {
var str_ = str.substr(str.indexOf(".") +1);
if (str_.indexOf(".") != -1) {
str = str.substr(0, str.indexOf(".") + str_.indexOf(".") + 1);
}
}
//正则替换，保留数字和小数点
str = parseFloat(str).toFixed(3)
this.realVal = str.substring(0, str.length - 1)
// str = str.replace(/[^\d^\.]+/g, "");
// this.form.itemAvgScore = str;
console.log(this.realVal)
}
},
// // fun(val) { // // fun(val) {
// // return Number(val).toFixed(2); // // return Number(val).toFixed(2);
// }, // },
@ -680,21 +740,26 @@ export default {
this.xmname = "请选择所属项目"; this.xmname = "请选择所属项目";
this.itemId2 = ""; this.itemId2 = "";
this.reset(); this.reset();
this.$nextTick(() => {
this.$refs.form2.clearValidate();
});
}, },
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
id: null, id: null,
itemId: null, itemId: "",
itemAvgScore: "", itemAvgScore: "",
itemAvgText: "", itemAvgText: "",
resultDictType: "", //number text resultDictType: "", //number text
sex: "",
}; };
this.form2 = { this.form2 = {
itemId: null, itemId: "",
itemAvgScore: "", itemAvgScore: null,
itemAvgText: "", itemAvgText: "",
resultDictType: "", //number text resultDictType: "", //number text
sex: "",
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@ -731,7 +796,6 @@ export default {
this.reset(); this.reset();
this.open = true; this.open = true;
this.title = "添加全国平均成绩"; this.title = "添加全国平均成绩";
this.itemId2 = "";
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
@ -750,6 +814,9 @@ export default {
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.form.itemAvgScore = this.realVal;
this.form2.itemAvgScore = this.realVal;
if (this.form.dictValue == this.ResultType1.dictValue) { if (this.form.dictValue == this.ResultType1.dictValue) {
console.log(this.ResultType1.dictValue); console.log(this.ResultType1.dictValue);
this.form.itemAvgText = ""; this.form.itemAvgText = "";
@ -758,29 +825,47 @@ export default {
console.log(this.ResultType2.dictValue); console.log(this.ResultType2.dictValue);
this.form.itemAvgScore = ""; this.form.itemAvgScore = "";
} }
console.log(this.form); // console.log(this.form2);
this.form2.itemAvgScore = Number(this.form2.itemAvgScore).toFixed(2); // console.log(this.form);
console.log(this.form2.itemAvgScore); // console.log(this.form2.itemAvgScore);
this.$refs["form"].validate((valid) => {
if (valid) { if (this.form.id != null) {
if (this.form.id != null) { this.$refs["form"].validate((valid) => {
if (valid) {
updateTestItemCountryScore(this.form).then((response) => { updateTestItemCountryScore(this.form).then((response) => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open2 = false; this.open2 = false;
this.getList(); this.getList();
}); });
} else { this.itemId2 = "";
this.xmname = "";
this.xmname = "请选择所属项目";
}
});
} else {
this.$refs["form2"].validate((valid) => {
if (valid) {
this.form2.itemAvgScore = Number(this.form2.itemAvgScore)
addTestItemCountryScore(this.form2).then((response) => { addTestItemCountryScore(this.form2).then((response) => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;
// console.log(this.form2)
this.getList(); this.getList();
// this.form.itemId = "";
this.itemId2 = "";
this.xmname = "";
this.xmname = "请选择所属项目";
}); });
} else {
if (this.form2.itemAvgScore == "") {
this.form2.itemAvgScore == "";
}
} }
} });
}); }
this.itemId2 = "";
this.xmname="";
this.xmname="请选择所属项目";
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {

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

@ -278,7 +278,7 @@
<el-form-item label="个人成绩得分" prop="itemFraction"> <el-form-item label="个人成绩得分" prop="itemFraction">
<el-input <el-input
v-model="form.itemFraction" v-model="form.itemFraction"
@input="NumberCheck4()" @input="NumberCheck4()"
placeholder="请输入个人成绩得分" placeholder="请输入个人成绩得分"
style="width: 360px" style="width: 360px"
/> />
@ -451,39 +451,32 @@
prop="itemScore" prop="itemScore"
v-if="form2.scoreDictId == '' || form2.scoreDictId == null" v-if="form2.scoreDictId == '' || form2.scoreDictId == null"
> >
<el-input placeholder="请输入个人成绩" style="width: 360px" /> <el-input placeholder="请输入个人成绩" style="width: 360px" />
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="个人成绩" label="个人成绩"
prop="scoreDictValue" prop="scoreDictValue"
v-else-if="form2.scoreDictId == ResultType2.dictCode" v-else-if="form2.scoreDictId == ResultType2.dictCode"
> >
<el-input <el-input
v-model="form2.scoreDictValue" v-model="form2.scoreDictValue"
placeholder="请输入个人成绩" placeholder="请输入个人成绩"
style="width: 360px" style="width: 360px"
/> />
</el-form-item> </el-form-item>
<el-form-item <el-form-item
label="个人成绩" label="个人成绩"
prop="itemScore" prop="itemScore"
v-else-if="form2.scoreDictId == ResultType1.dictCode" v-else-if="form2.scoreDictId == ResultType1.dictCode"
> >
<el-input <el-input
v-model="form2.itemScore" v-model="form2.itemScore"
@input="NumberCheck()" @input="NumberCheck()"
placeholder="请输入个人成绩" placeholder="请输入个人成绩"
style="width: 360px" style="width: 360px"
/> />
</el-form-item> </el-form-item>
<!-- <el-form-item <!-- <el-form-item
label="个人成绩得分" label="个人成绩得分"
@ -497,7 +490,7 @@
<el-form-item label="个人成绩得分" prop="itemFraction"> <el-form-item label="个人成绩得分" prop="itemFraction">
<el-input <el-input
v-model="form2.itemFraction" v-model="form2.itemFraction"
@input="NumberCheck2()" @input="NumberCheck2()"
placeholder="请输入个人成绩得分" placeholder="请输入个人成绩得分"
style="width: 360px" style="width: 360px"
/> />
@ -1135,7 +1128,6 @@ import {
import { tKindergartenInfo } from "@/api/system/kindergartenInfo"; import { tKindergartenInfo } from "@/api/system/kindergartenInfo";
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
export default { export default {
name: "TestItemScore", name: "TestItemScore",
components: { Treeselect }, components: { Treeselect },
data() { data() {
@ -1162,7 +1154,7 @@ export default {
} }
}; };
var roleMoeny3 = (rule, value, callback) => { var roleMoeny3 = (rule, value, callback) => {
if (Number.isNaN(Number.parseFloat(value))) { if (Number.isNaN(Number.parseFloat(value))) {
callback(new Error("请输入数字")); callback(new Error("请输入数字"));
} else if (!this.form.itemFraction) { } else if (!this.form.itemFraction) {
@ -1173,7 +1165,7 @@ export default {
callback(); callback();
} }
}; };
var roleMoeny4 = (rule, value, callback) => { var roleMoeny4 = (rule, value, callback) => {
if (Number.isNaN(Number.parseFloat(value))) { if (Number.isNaN(Number.parseFloat(value))) {
callback(new Error("请输入数字")); callback(new Error("请输入数字"));
} else if (!this.form.itemFraction) { } else if (!this.form.itemFraction) {
@ -1195,7 +1187,7 @@ export default {
// 遮罩层 // 遮罩层
// 遮罩层 // 遮罩层
loading: true, loading: true,
itemScore:'', itemScore: "",
testItemScoreLists: [], testItemScoreLists: [],
xmname: "请选择所属班级", xmname: "请选择所属班级",
@ -1281,8 +1273,15 @@ export default {
form: {}, form: {},
form2: {}, form2: {},
// 表单校验 // 表单校验
rules2: { rules2: {
itemScore: [{ required: true, validator: roleMoeny3, message: "",trigger: "blur" }], itemScore: [
{
required: true,
validator: roleMoeny3,
message: "",
trigger: "blur",
},
],
classId: [ classId: [
{ required: true, message: "所属班级不能为空", trigger: "blur" }, { required: true, message: "所属班级不能为空", trigger: "blur" },
], ],
@ -1300,19 +1299,31 @@ export default {
}, },
], ],
scoreDictValue: [ scoreDictValue: [
{ required: true, message: "请输入个人成绩", trigger: "blur" }, { required: true, message: "请输入个人成绩", trigger: "blur" },
], ],
itemFraction: [{ required: true, validator: roleMoeny4, message: "" ,trigger: "blur"}], itemFraction: [
{
required: true,
validator: roleMoeny4,
message: "",
trigger: "blur",
},
],
syntheticalAssess: [ syntheticalAssess: [
{ required: true, message: "综合评价不能为空", trigger: "blur" }, { required: true, message: "综合评价不能为空", trigger: "blur" },
], ],
}, },
rules: { rules: {
itemScore: [
itemScore: [{ required: true, validator: roleMoeny, message: "" ,trigger: "blur"}], {
required: true,
validator: roleMoeny,
message: "",
trigger: "blur",
},
],
classId: [ classId: [
{ required: true, message: "所属班级不能为空", trigger: "blur" }, { required: true, message: "所属班级不能为空", trigger: "blur" },
], ],
@ -1330,16 +1341,23 @@ export default {
}, },
], ],
scoreDictValue: [ scoreDictValue: [
{ required: true, message: "请输入个人成绩", trigger: "blur" }, { required: true, message: "请输入个人成绩", trigger: "blur" },
], ],
itemFraction: [{ required: true, validator: roleMoeny2, message: "",trigger: "blur" }], itemFraction: [
{
required: true,
validator: roleMoeny2,
message: "",
trigger: "blur",
},
],
syntheticalAssess: [ syntheticalAssess: [
{ required: true, message: "综合评价不能为空", trigger: "blur" }, { required: true, message: "综合评价不能为空", trigger: "blur" },
], ],
}, },
realVal: "",
}; };
}, },
created() { created() {
@ -1349,58 +1367,84 @@ export default {
methods: { methods: {
//只能输入一位小数点 //只能输入一位小数点
NumberCheck(num) { NumberCheck(num) {
let str = this.form2.itemScore; let str = this.form2.itemScore;
//限制只能输入一个小数点 //限制只能输入一个小数点
if (str.indexOf(".") != -1) { if (Number.isNaN(Number.parseFloat(str))) {
var str_ = str.substr(str.indexOf(".") + 1); } else {
if (str_.indexOf(".") != -1) { //限制只能输入一个小数点
str = str.substr(0, str.indexOf(".") + str_.indexOf(".") + 1); if (str.indexOf(".") != -1) {
} var str_ = str.substr(str.indexOf(".") + 1);
} if (str_.indexOf(".") != -1) {
//正则替换，保留数字和小数点 str = str.substr(0, str.indexOf(".") + str_.indexOf(".") + 1);
str = str.replace(/[^\d^\.]+/g,'') }
this.form2.itemScore=str }
},
//个人成绩得分只能输入一个小数点 str = parseFloat(str).toFixed(3);
NumberCheck2(num) { this.realVal = str.substring(0, str.length - 1);
let str = this.form2.itemFraction; }
//限制只能输入一个小数点 },
if (str.indexOf(".") != -1) { //个人成绩得分只能输入一个小数点
var str_ = str.substr(str.indexOf(".") + 1); NumberCheck2(num) {
if (str_.indexOf(".") != -1) { let str = this.form2.itemFraction;
str = str.substr(0, str.indexOf(".") + str_.indexOf(".") + 1); //限制只能输入一个小数点
} if (Number.isNaN(Number.parseFloat(str))) {
} } else {
//正则替换，保留数字和小数点 //限制只能输入一个小数点
str = str.replace(/[^\d^\.]+/g,'') if (str.indexOf(".") != -1) {
this.form2.itemFraction=str var str_ = str.substr(str.indexOf(".") + 1);
}, if (str_.indexOf(".") != -1) {
NumberCheck3(num) { str = str.substr(0, str.indexOf(".") + str_.indexOf(".") + 1);
let str = this.form.itemScore; }
//限制只能输入一个小数点 }
if (str.indexOf(".") != -1) {
var str_ = str.substr(str.indexOf(".") + 1); str = parseFloat(str).toFixed(3);
if (str_.indexOf(".") != -1) { this.realVal = str.substring(0, str.length - 1);
str = str.substr(0, str.indexOf(".") + str_.indexOf(".") + 1); }
} },
} NumberCheck3(num) {
//正则替换，保留数字和小数点 let str = this.form.itemScore;
str = str.replace(/[^\d^\.]+/g,'') //限制只能输入一个小数点
this.form.itemScore=str if (Number.isNaN(Number.parseFloat(str))) {
}, } else {
NumberCheck4(num) { //限制只能输入一个小数点
let str = this.form.itemFraction; if (str.indexOf(".") != -1) {
//限制只能输入一个小数点 var str_ = str.substr(str.indexOf(".") +1);
if (str.indexOf(".") != -1) { if (str_.indexOf(".") != -1) {
var str_ = str.substr(str.indexOf(".") + 1); str = str.substr(0, str.indexOf(".") + str_.indexOf(".") + 1);
if (str_.indexOf(".") != -1) { }
str = str.substr(0, str.indexOf(".") + str_.indexOf(".") + 1); }
} //正则替换，保留数字和小数点
} str = parseFloat(str).toFixed(3)
//正则替换，保留数字和小数点 this.realVal = str.substring(0, str.length - 1)
str = str.replace(/[^\d^\.]+/g,'')
this.form.itemFraction=str
}, // str = str.replace(/[^\d^\.]+/g, "");
// this.form.itemAvgScore = str;
console.log(this.realVal)
}
},
NumberCheck4(num) {
let str = this.form.itemFraction;
//限制只能输入一个小数点
if (Number.isNaN(Number.parseFloat(str))) {
} else {
//限制只能输入一个小数点
if (str.indexOf(".") != -1) {
var str_ = str.substr(str.indexOf(".") +1);
if (str_.indexOf(".") != -1) {
str = str.substr(0, str.indexOf(".") + str_.indexOf(".") + 1);
}
}
//正则替换，保留数字和小数点
str = parseFloat(str).toFixed(3)
this.realVal = str.substring(0, str.length - 1)
// str = str.replace(/[^\d^\.]+/g, "");
// this.form.itemAvgScore = str;
}
},
// 班级信息 // 班级信息
xmclick(row) { xmclick(row) {
console.log(row); console.log(row);
@ -1681,6 +1725,10 @@ export default {
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.form2.itemScore = this.realVal;
this.form.itemFraction = this.realVal;
this.form.itemScore = this.realVal;
this.form2.itemFraction = this.realVal;
this.$refs["form"].validate((valid) => { this.$refs["form"].validate((valid) => {
if (valid) { if (valid) {
if (this.form.id != null) { if (this.form.id != null) {

45
src/views/system/testItems/index.vue
View File

@ -383,6 +383,21 @@
placeholder="最高分" placeholder="最高分"
style="width: 75px; margin-right: 9px" style="width: 75px; margin-right: 9px"
/> />
<el-select
v-model="item.standardFlag"
clearable
placeholder="请选择是否达标"
style="width: 150px"
>
<el-option
v-for="item in list"
:key="item.id"
:label="item.label"
:value="item.id"
>
</el-option>
</el-select>
<el-button <el-button
type="info" type="info"
circle circle
@ -536,6 +551,17 @@ export default {
total: 0, total: 0,
//度量单位表 //度量单位表
measureUnitTypelist: [], measureUnitTypelist: [],
//shifouhege
list: [
{
label: "是",
id: 1,
},
{
label: "否",
id: 0,
},
],
//字典类型 //字典类型
itemResultTypelist: [], itemResultTypelist: [],
ResultType1: "", ResultType1: "",
@ -649,6 +675,13 @@ export default {
trigger: "change", trigger: "change",
}, },
], ],
standardFlag: [
{
required: true,
message: "请选择是否达标",
trigger: "blur",
},
],
}, },
}; };
}, },
@ -666,6 +699,7 @@ export default {
levelName: "", levelName: "",
levelMinScore: "", levelMinScore: "",
levelMaxScore: "", levelMaxScore: "",
standardFlag: "",
}); });
}, },
/** 查询测试项目列表 */ /** 查询测试项目列表 */
@ -678,9 +712,11 @@ export default {
tKindergartenInfo(this.itemResultType).then((res) => { tKindergartenInfo(this.itemResultType).then((res) => {
// console.log(res); // console.log(res);
this.itemResultTypelist = res.data; this.itemResultTypelist = res.data;
console.log(this.itemResultTypelist);
this.ResultType1 = this.itemResultTypelist[0]; this.ResultType1 = this.itemResultTypelist[0];
this.ResultType2 = this.itemResultTypelist[1]; this.ResultType2 = this.itemResultTypelist[1];
console.log(this.ResultType1); // console.log(this.ResultType1);
}); });
tKindergartenInfo(this.measureUnitType).then((res) => { tKindergartenInfo(this.measureUnitType).then((res) => {
// console.log(res); // console.log(res);
@ -718,7 +754,12 @@ export default {
levelDescription: "", levelDescription: "",
minScore: "", minScore: "",
itemLevelList: [ itemLevelList: [
{ levelName: "", levelMinScore: "", levelMaxScore: "" }, {
levelName: "",
levelMinScore: "",
levelMaxScore: "",
standardFlag: "",
},
], ],
sorting: null, sorting: null,
remark: null, remark: null,