|
@@ -456,19 +456,25 @@
|
|
|
}
|
|
|
for(let x=0;x<self.dialogForm.riskPlanSensorList.length;x++){
|
|
|
for(let i=0;i<self.form.labRiskPlanLevels.length;i++){
|
|
|
- for(let o=0;o<self.form.labRiskPlanLevels[i].riskPlanSensorList.length;o++){
|
|
|
- if(self.dialogForm.riskPlanSensorList[x].sensorType==self.form.labRiskPlanLevels[i].riskPlanSensorList[o].sensorType){
|
|
|
- num ++
|
|
|
- if(self.dialogForm.riskPlanSensorList[x].minMonitor>=self.form.labRiskPlanLevels[i].riskPlanSensorList[o].minMonitor&&
|
|
|
- self.dialogForm.riskPlanSensorList[x].minMonitor<=self.form.labRiskPlanLevels[i].riskPlanSensorList[o].maxMonitor){
|
|
|
- age++
|
|
|
- console.log('age++');
|
|
|
- }else if(self.dialogForm.riskPlanSensorList[x].maxMonitor>=self.form.labRiskPlanLevels[i].riskPlanSensorList[o].minMonitor&&
|
|
|
- self.dialogForm.riskPlanSensorList[x].maxMonitor<=self.form.labRiskPlanLevels[i].riskPlanSensorList[o].maxMonitor){
|
|
|
- age++
|
|
|
- console.log('age++');
|
|
|
+ if(self.dialogForm.riskPlanSensorList.length == self.form.labRiskPlanLevels[i].riskPlanSensorList.length){
|
|
|
+ for(let o=0;o<self.form.labRiskPlanLevels[i].riskPlanSensorList.length;o++){
|
|
|
+ if(self.dialogForm.riskPlanSensorList[x].sensorType==self.form.labRiskPlanLevels[i].riskPlanSensorList[o].sensorType){
|
|
|
+ num ++
|
|
|
+ if(self.dialogForm.riskPlanSensorList[x].minMonitor>=self.form.labRiskPlanLevels[i].riskPlanSensorList[o].minMonitor&&
|
|
|
+ self.dialogForm.riskPlanSensorList[x].minMonitor<=self.form.labRiskPlanLevels[i].riskPlanSensorList[o].maxMonitor){
|
|
|
+ age++
|
|
|
+ console.log('age++');
|
|
|
+ }else if(self.dialogForm.riskPlanSensorList[x].maxMonitor>=self.form.labRiskPlanLevels[i].riskPlanSensorList[o].minMonitor&&
|
|
|
+ self.dialogForm.riskPlanSensorList[x].maxMonitor<=self.form.labRiskPlanLevels[i].riskPlanSensorList[o].maxMonitor){
|
|
|
+ age++
|
|
|
+ console.log('age++');
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
+ if(self.dialogForm.riskPlanSensorList.length == num && self.dialogForm.riskPlanSensorList.length == age){
|
|
|
+ self.msgError('监测区间不能与其他级别检测条件完全重复,请重新输入');
|
|
|
+ return
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -478,7 +484,7 @@
|
|
|
console.log('age',age);
|
|
|
//提交数据对比已存在数据 是否区间重复
|
|
|
if(self.dialogForm.riskPlanSensorList.length == num && self.dialogForm.riskPlanSensorList.length == age){
|
|
|
- self.msgError('监测区间不能与其他级别检测条件完全重复重复,请重新输入');
|
|
|
+ self.msgError('监测区间不能与其他级别检测条件完全重复,请重新输入');
|
|
|
return
|
|
|
}
|
|
|
this.$refs["dialogForm"].validate(valid => {
|