diff --git a/src/views/equipement/standard/checkData/components/first/checkDataCom.vue b/src/views/equipement/standard/checkData/components/first/checkDataCom.vue index 980047a..6169e78 100644 --- a/src/views/equipement/standard/checkData/components/first/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/first/checkDataCom.vue @@ -28,9 +28,9 @@ const infoId = ref('') const ruleFormRef = ref() // 表单ref const form = ref({ - bestQualified: '合格', // 稳定性考核是否合格_最佳点 - worstQualified: '合格', // 稳定性考核是否合格_最差点 - modelQualified: '合格', // 稳定性考核是否合格_典型点 + bestQualified: '1合格', // 稳定性考核是否合格_最佳点 + worstQualified: '1合格', // 稳定性考核是否合格_最差点 + modelQualified: '1合格', // 稳定性考核是否合格_典型点 }) const belongStandardEquipment = ref('1') const itemCategoryId = ref('') @@ -537,16 +537,6 @@ } // 需求逻辑:时间数据少于4条则默认合格(这里跟3比较是因为其中有一条是本次核查日期) -// if (dateArrStability.value.length < 3) { -// form.value.bestQualified = '合格' -// form.value.worstQualified = '合格' -// form.value.modelQualified = '合格' -// } -// else { -// form.value.bestQualified = '不合格' -// form.value.worstQualified = '不合格' -// form.value.modelQualified = '不合格' -// } // 保存之前的校验 function checkList() { @@ -574,6 +564,19 @@ ElMessage.warning('请计算典型点稳定性') return false } + + // 保存之前判断一下结论 如果所有的相对重复性是否小于相对扩展不确定度Urel全为是,则结论合格 + if (bestListStability.value.every(item => item.lessThan === '是') && worstListStability.value.every(item => item.lessThan === '是') && modelListStability.value.every(item => item.lessThan === '是')) { + form.value.bestQualified = '合格' + form.value.worstQualified = '合格' + form.value.modelQualified = '合格' + } + else { + form.value.bestQualified = '不合格' + form.value.worstQualified = '不合格' + form.value.modelQualified = '不合格' + } + return true }