提交 a9539533 编写于 作者: zhentian.jia's avatar zhentian.jia

成绩不能有交集

上级 99bd6f5a
...@@ -627,11 +627,11 @@ ...@@ -627,11 +627,11 @@
</el-form-item> </el-form-item>
<div v-show="formExam.condition == 1" v-for="(item , index) in formExam.exam" :key="index"> <div v-show="formExam.condition == 1" v-for="(item , index) in formExam.exam" :key="index">
<el-form-item label="发放证书"> <el-form-item label="发放证书">
<el-col :span="8"> <el-col :span="6">
<el-select <el-select
v-model="index.certificate" v-model="index.certificate"
placeholder="请选择证书" placeholder="请选择证书"
style="width: 350px" style=""
> >
<el-option <el-option
v-for="item in optionsCertificate" v-for="item in optionsCertificate"
...@@ -650,13 +650,15 @@ ...@@ -650,13 +650,15 @@
<el-col :span="3"> <el-col :span="3">
<el-input v-model="item.num"></el-input> <el-input v-model="item.num"></el-input>
</el-col> </el-col>
<el-col class="line" :span="3.5"> &nbsp 门考试平均分:</el-col> <el-col class="line" :span="3.5" > &nbsp 门考试平均分:</el-col>
<el-col :span="3"> <el-col :span="3">
<el-input v-model="item.minGrade"></el-input> <el-input v-model="item.minGrade" @change="updateMin(index)"></el-input>
<!-- <el-input-number v-model="item.minGrade" :min="0" :max="100" @change="updateMin(index)"></el-input-number> -->
</el-col> </el-col>
<el-col class="line" :span="1.5"> &nbsp 分~ &nbsp</el-col> <el-col class="line" :span="1.5"> &nbsp 分~ &nbsp</el-col>
<el-col :span="3"> <el-col :span="3">
<el-input-number v-model="item.maxGrade" :step="2" step-strictly controls-position="right" :min="0" :max="100"></el-input-number> <el-input v-model="item.maxGrade" @change="updateMax(index)"></el-input>
<!-- <el-input-number v-model="item.maxGrade" :min="0" :max="100" @change="updateMax(index)"></el-input-number> -->
</el-col> </el-col>
</el-form-item> </el-form-item>
</div> </div>
...@@ -879,8 +881,8 @@ export default { ...@@ -879,8 +881,8 @@ export default {
condition: '', condition: '',
exam: [{ exam: [{
num: 8, num: 8,
minGrade: 60, minGrade: 0,
maxGrade: 80, maxGrade: 0,
certificate: '', certificate: '',
}] }]
}, },
...@@ -3042,7 +3044,7 @@ export default { ...@@ -3042,7 +3044,7 @@ export default {
let obj = { let obj = {
num: 10, num: 10,
minGrade: 0, minGrade: 0,
maxGrade: 100, maxGrade: 0,
certificate: '', certificate: '',
}; };
vm.formExam.exam.push(obj); vm.formExam.exam.push(obj);
...@@ -3051,6 +3053,63 @@ export default { ...@@ -3051,6 +3053,63 @@ export default {
console.log(index); console.log(index);
vm.formExam.exam.splice(index,1); vm.formExam.exam.splice(index,1);
}, },
baseCheck(index) {
vm.formExam.exam[index].minGrade = parseInt(vm.formExam.exam[index].minGrade);
vm.formExam.exam[index].maxGrade = parseInt(vm.formExam.exam[index].maxGrade);
if(vm.formExam.exam[index].minGrade > 100) {
vm.formExam.exam[index].minGrade = 100;
}
if(vm.formExam.exam[index].maxGrade > 100) {
vm.formExam.exam[index].maxGrade = 100;
}
if(vm.formExam.exam[index].minGrade < 0) {
vm.formExam.exam[index].minGrade = 0;
}
if(vm.formExam.exam[index].maxGrade < 0) {
vm.formExam.exam[index].maxGrade = 0;
}
},
//区间不能有交集
withoutUnion(index,type) {
let examList = vm.formExam.exam;
for(let i=0;i<examList.length;i++) {
if(index === i) {
break;
}
if(vm.formExam.exam[index].maxGrade >= examList[i].minGrade &&
vm.formExam.exam[index].maxGrade <= examList[i].maxGrade) {
if(type == 'max') {
vm.formExam.exam[index].maxGrade = vm.formExam.exam[index].minGrade;
} else if(type == 'min') {
vm.formExam.exam[index].minGrade = vm.formExam.exam[index].maxGrade;
}
}
}
},
updateMin(index) {
vm.baseCheck(index);
if(!Number.isInteger(vm.formExam.exam[index].minGrade)){
vm.formExam.exam[index].minGrade = vm.formExam.exam[index].maxGrade;
return;
}
if(vm.formExam.exam[index].minGrade > vm.formExam.exam[index].maxGrade) {
vm.formExam.exam[index].minGrade = vm.formExam.exam[index].maxGrade;
}
},
updateMax(index) {
vm.baseCheck(index);
if(!Number.isInteger(vm.formExam.exam[index].maxGrade)){
console.log('只能整数');
vm.formExam.exam[index].maxGrade = vm.formExam.exam[index].minGrade;
return;
}
// console.log('index',index,'min',min,'max',max);
if(vm.formExam.exam[index].minGrade > vm.formExam.exam[index].maxGrade) {
vm.formExam.exam[index].maxGrade = vm.formExam.exam[index].minGrade;
console.log('max值',vm.formExam.exam[index].maxGrade);
}
vm.withoutUnion(index,'max')
},
} }
}; };
</script> </script>
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册