diff --git a/src/views/equipement/standard/checkData/components/eighth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/eighth/checkDataCom.vue index 1e95ed7..40b10a2 100644 --- a/src/views/equipement/standard/checkData/components/eighth/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/eighth/checkDataCom.vue @@ -467,7 +467,8 @@ } else { listRepeatability.value = tempListRepeatability// 重复性查询数据 - listStability.value = tempListStability// 稳定性查询数据 + // listStability.value = tempListStability // 稳定性查询数据 + listStability.value = solveListStability(tempListStability) // 稳定性查询数据 } nextTick(() => { @@ -490,12 +491,21 @@ fetchHistoryIndication() // 重新拉取稳定性日期 } // ====================计算结论===================== - if (listStability.value.every(item => `${item}` === '是')) { - form.value.conclusion = '设备性能正常' - } - else { - form.value.conclusion = '设备性能异常' - } + // if (listStability.value.every(item => `${item.lessThan}` === '是')) { + // form.value.conclusion = '设备性能正常' + // } + // else { + // form.value.conclusion = '设备性能异常' + // } + // 计算结论 + nextTick(() => { + const tempResult = listStability.value.every((item: { lessThan: string }) => { + return item.lessThan === '是' + }) + const dateNum = dateCount(columns_stability.value) + form.value.conclusion = dateNum < 4 ? '设备性能正常' : tempResult ? '设备性能正常' : '设备性能异常' + }) + // form.value.conclusion = listStability.value.length ? listStability.value[0].conclusion! : ''// 结论 loading.close() @@ -563,7 +573,6 @@ listStability.value = listStability.value.map((item) => { return { ...item, - lessThan: item.lessThan === '是' ? '1' : item.lessThan === '否' ? '0' : '', // 是否小于相对扩展不确定度Urel(0/1) conclusion: form.value.conclusion, // 结论 } }) @@ -585,9 +594,8 @@ // 统计日期 function dateCount(columns: TableColumn[]) { let dateNum = 0 // 稳定性表格有几个日期 - // 统计有几个日期 - columns[2].children?.forEach((item) => { + columns[2].children!.forEach((item) => { if (item.text !== '-' && item.text !== '') { dateNum += 1 } @@ -597,8 +605,7 @@ watch(() => props.pageType, (newValue) => { if (newValue === 'detail') { - listRepeatability.value - = listRepeatability.value.map((item) => { item.editable = false; return item }) + listRepeatability.value = listRepeatability.value.map((item) => { item.editable = false; return item }) } }) diff --git a/src/views/equipement/standard/checkData/components/eighth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/eighth/checkDataCom.vue index 1e95ed7..40b10a2 100644 --- a/src/views/equipement/standard/checkData/components/eighth/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/eighth/checkDataCom.vue @@ -467,7 +467,8 @@ } else { listRepeatability.value = tempListRepeatability// 重复性查询数据 - listStability.value = tempListStability// 稳定性查询数据 + // listStability.value = tempListStability // 稳定性查询数据 + listStability.value = solveListStability(tempListStability) // 稳定性查询数据 } nextTick(() => { @@ -490,12 +491,21 @@ fetchHistoryIndication() // 重新拉取稳定性日期 } // ====================计算结论===================== - if (listStability.value.every(item => `${item}` === '是')) { - form.value.conclusion = '设备性能正常' - } - else { - form.value.conclusion = '设备性能异常' - } + // if (listStability.value.every(item => `${item.lessThan}` === '是')) { + // form.value.conclusion = '设备性能正常' + // } + // else { + // form.value.conclusion = '设备性能异常' + // } + // 计算结论 + nextTick(() => { + const tempResult = listStability.value.every((item: { lessThan: string }) => { + return item.lessThan === '是' + }) + const dateNum = dateCount(columns_stability.value) + form.value.conclusion = dateNum < 4 ? '设备性能正常' : tempResult ? '设备性能正常' : '设备性能异常' + }) + // form.value.conclusion = listStability.value.length ? listStability.value[0].conclusion! : ''// 结论 loading.close() @@ -563,7 +573,6 @@ listStability.value = listStability.value.map((item) => { return { ...item, - lessThan: item.lessThan === '是' ? '1' : item.lessThan === '否' ? '0' : '', // 是否小于相对扩展不确定度Urel(0/1) conclusion: form.value.conclusion, // 结论 } }) @@ -585,9 +594,8 @@ // 统计日期 function dateCount(columns: TableColumn[]) { let dateNum = 0 // 稳定性表格有几个日期 - // 统计有几个日期 - columns[2].children?.forEach((item) => { + columns[2].children!.forEach((item) => { if (item.text !== '-' && item.text !== '') { dateNum += 1 } @@ -597,8 +605,7 @@ watch(() => props.pageType, (newValue) => { if (newValue === 'detail') { - listRepeatability.value - = listRepeatability.value.map((item) => { item.editable = false; return item }) + listRepeatability.value = listRepeatability.value.map((item) => { item.editable = false; return item }) } }) diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue index 90de480..cf7f8f1 100644 --- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue @@ -398,7 +398,7 @@ // form.value.qualified = '不合格' // } if (listStability.value && listStability.value.length) { - form.value.qualified = `${listStability.value[0].qualified}1` === '1' ? '合格' : '不合格' + form.value.qualified = `${listStability.value[0].qualified}` === '1' ? '合格' : '不合格' } } @@ -419,7 +419,7 @@ return { ...item, editable: props.pageType !== 'detail', - lessThan: `${item.lessThan}` === '1' ? '合格' : '不合格', + lessThan: `${item.lessThan}` !== '' ? `${item.lessThan}` === '1' ? '合格' : '不合格' : item.lessThan, kuValueOne: item.checkType === '稳定性' ? item.kuValueOne : Number(item.kuValueOne), kuValueTwo: item.checkType === '稳定性' ? item.kuValueTwo : Number(item.kuValueTwo), kuValueThree: item.checkType === '稳定性' ? item.kuValueThree : Number(item.kuValueThree), @@ -468,8 +468,8 @@ } }) // 稳定性 - if (listStability && listStability.length) { - form.value.qualified = `${listStability[0].qualified}1` === '1' ? '合格' : '不合格' + if (listStability && listStability.length && `${listStability[0].qualified}` !== '') { + form.value.qualified = `${listStability[0].qualified}` === '1' ? '合格' : '不合格' } return { diff --git a/src/views/equipement/standard/checkData/components/eighth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/eighth/checkDataCom.vue index 1e95ed7..40b10a2 100644 --- a/src/views/equipement/standard/checkData/components/eighth/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/eighth/checkDataCom.vue @@ -467,7 +467,8 @@ } else { listRepeatability.value = tempListRepeatability// 重复性查询数据 - listStability.value = tempListStability// 稳定性查询数据 + // listStability.value = tempListStability // 稳定性查询数据 + listStability.value = solveListStability(tempListStability) // 稳定性查询数据 } nextTick(() => { @@ -490,12 +491,21 @@ fetchHistoryIndication() // 重新拉取稳定性日期 } // ====================计算结论===================== - if (listStability.value.every(item => `${item}` === '是')) { - form.value.conclusion = '设备性能正常' - } - else { - form.value.conclusion = '设备性能异常' - } + // if (listStability.value.every(item => `${item.lessThan}` === '是')) { + // form.value.conclusion = '设备性能正常' + // } + // else { + // form.value.conclusion = '设备性能异常' + // } + // 计算结论 + nextTick(() => { + const tempResult = listStability.value.every((item: { lessThan: string }) => { + return item.lessThan === '是' + }) + const dateNum = dateCount(columns_stability.value) + form.value.conclusion = dateNum < 4 ? '设备性能正常' : tempResult ? '设备性能正常' : '设备性能异常' + }) + // form.value.conclusion = listStability.value.length ? listStability.value[0].conclusion! : ''// 结论 loading.close() @@ -563,7 +573,6 @@ listStability.value = listStability.value.map((item) => { return { ...item, - lessThan: item.lessThan === '是' ? '1' : item.lessThan === '否' ? '0' : '', // 是否小于相对扩展不确定度Urel(0/1) conclusion: form.value.conclusion, // 结论 } }) @@ -585,9 +594,8 @@ // 统计日期 function dateCount(columns: TableColumn[]) { let dateNum = 0 // 稳定性表格有几个日期 - // 统计有几个日期 - columns[2].children?.forEach((item) => { + columns[2].children!.forEach((item) => { if (item.text !== '-' && item.text !== '') { dateNum += 1 } @@ -597,8 +605,7 @@ watch(() => props.pageType, (newValue) => { if (newValue === 'detail') { - listRepeatability.value - = listRepeatability.value.map((item) => { item.editable = false; return item }) + listRepeatability.value = listRepeatability.value.map((item) => { item.editable = false; return item }) } }) diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue index 90de480..cf7f8f1 100644 --- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue @@ -398,7 +398,7 @@ // form.value.qualified = '不合格' // } if (listStability.value && listStability.value.length) { - form.value.qualified = `${listStability.value[0].qualified}1` === '1' ? '合格' : '不合格' + form.value.qualified = `${listStability.value[0].qualified}` === '1' ? '合格' : '不合格' } } @@ -419,7 +419,7 @@ return { ...item, editable: props.pageType !== 'detail', - lessThan: `${item.lessThan}` === '1' ? '合格' : '不合格', + lessThan: `${item.lessThan}` !== '' ? `${item.lessThan}` === '1' ? '合格' : '不合格' : item.lessThan, kuValueOne: item.checkType === '稳定性' ? item.kuValueOne : Number(item.kuValueOne), kuValueTwo: item.checkType === '稳定性' ? item.kuValueTwo : Number(item.kuValueTwo), kuValueThree: item.checkType === '稳定性' ? item.kuValueThree : Number(item.kuValueThree), @@ -468,8 +468,8 @@ } }) // 稳定性 - if (listStability && listStability.length) { - form.value.qualified = `${listStability[0].qualified}1` === '1' ? '合格' : '不合格' + if (listStability && listStability.length && `${listStability[0].qualified}` !== '') { + form.value.qualified = `${listStability[0].qualified}` === '1' ? '合格' : '不合格' } return { diff --git a/src/views/equipement/standard/checkData/components/thirteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/thirteenth/checkDataCom.vue index cfea6f1..9ba4023 100644 --- a/src/views/equipement/standard/checkData/components/thirteenth/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/thirteenth/checkDataCom.vue @@ -1382,7 +1382,7 @@ ...item, editable: props.pageType !== 'detail', checkPointDefineFront: tempCheckPoint, // 核查点 - conclusion: `${item.conclusion}` === '1' ? '合格' : '不合格', + conclusion: `${item.conclusion}` !== '' ? `${item.conclusion}` === '1' ? '合格' : '不合格' : item.conclusion, testValueOne: item.checkType === '稳定性' ? item.testValueOne : (item.checkType === '重复性' && `${item.testValueOne}` === '') ? undefined : Number(item.testValueOne), // 测量值1/测量值(上升时间) testValueTwo: item.checkType === '稳定性' ? item.testValueTwo : (item.checkType === '重复性' && `${item.testValueTwo}` === '') ? undefined : Number(item.testValueTwo), // 测量值2(示值) testValueThree: item.checkType === '稳定性' ? item.testValueThree : (item.checkType === '重复性' && `${item.testValueThree}` === '') ? undefined : Number(item.testValueThree), // 测量值3(示值) @@ -1400,7 +1400,7 @@ // 稳定性考核是否合格 let tempStabilityList = [] tempStabilityList = list.filter((item: { checkType: string }) => item.checkType === '稳定性') - if (tempStabilityList.length) { + if (tempStabilityList.length && tempStabilityList[0].qualified !== '') { form.value.qualified = tempStabilityList[0].qualified === 1 ? '合格' : '不合格' } diff --git a/src/views/equipement/standard/checkData/components/eighth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/eighth/checkDataCom.vue index 1e95ed7..40b10a2 100644 --- a/src/views/equipement/standard/checkData/components/eighth/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/eighth/checkDataCom.vue @@ -467,7 +467,8 @@ } else { listRepeatability.value = tempListRepeatability// 重复性查询数据 - listStability.value = tempListStability// 稳定性查询数据 + // listStability.value = tempListStability // 稳定性查询数据 + listStability.value = solveListStability(tempListStability) // 稳定性查询数据 } nextTick(() => { @@ -490,12 +491,21 @@ fetchHistoryIndication() // 重新拉取稳定性日期 } // ====================计算结论===================== - if (listStability.value.every(item => `${item}` === '是')) { - form.value.conclusion = '设备性能正常' - } - else { - form.value.conclusion = '设备性能异常' - } + // if (listStability.value.every(item => `${item.lessThan}` === '是')) { + // form.value.conclusion = '设备性能正常' + // } + // else { + // form.value.conclusion = '设备性能异常' + // } + // 计算结论 + nextTick(() => { + const tempResult = listStability.value.every((item: { lessThan: string }) => { + return item.lessThan === '是' + }) + const dateNum = dateCount(columns_stability.value) + form.value.conclusion = dateNum < 4 ? '设备性能正常' : tempResult ? '设备性能正常' : '设备性能异常' + }) + // form.value.conclusion = listStability.value.length ? listStability.value[0].conclusion! : ''// 结论 loading.close() @@ -563,7 +573,6 @@ listStability.value = listStability.value.map((item) => { return { ...item, - lessThan: item.lessThan === '是' ? '1' : item.lessThan === '否' ? '0' : '', // 是否小于相对扩展不确定度Urel(0/1) conclusion: form.value.conclusion, // 结论 } }) @@ -585,9 +594,8 @@ // 统计日期 function dateCount(columns: TableColumn[]) { let dateNum = 0 // 稳定性表格有几个日期 - // 统计有几个日期 - columns[2].children?.forEach((item) => { + columns[2].children!.forEach((item) => { if (item.text !== '-' && item.text !== '') { dateNum += 1 } @@ -597,8 +605,7 @@ watch(() => props.pageType, (newValue) => { if (newValue === 'detail') { - listRepeatability.value - = listRepeatability.value.map((item) => { item.editable = false; return item }) + listRepeatability.value = listRepeatability.value.map((item) => { item.editable = false; return item }) } }) diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue index 90de480..cf7f8f1 100644 --- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue @@ -398,7 +398,7 @@ // form.value.qualified = '不合格' // } if (listStability.value && listStability.value.length) { - form.value.qualified = `${listStability.value[0].qualified}1` === '1' ? '合格' : '不合格' + form.value.qualified = `${listStability.value[0].qualified}` === '1' ? '合格' : '不合格' } } @@ -419,7 +419,7 @@ return { ...item, editable: props.pageType !== 'detail', - lessThan: `${item.lessThan}` === '1' ? '合格' : '不合格', + lessThan: `${item.lessThan}` !== '' ? `${item.lessThan}` === '1' ? '合格' : '不合格' : item.lessThan, kuValueOne: item.checkType === '稳定性' ? item.kuValueOne : Number(item.kuValueOne), kuValueTwo: item.checkType === '稳定性' ? item.kuValueTwo : Number(item.kuValueTwo), kuValueThree: item.checkType === '稳定性' ? item.kuValueThree : Number(item.kuValueThree), @@ -468,8 +468,8 @@ } }) // 稳定性 - if (listStability && listStability.length) { - form.value.qualified = `${listStability[0].qualified}1` === '1' ? '合格' : '不合格' + if (listStability && listStability.length && `${listStability[0].qualified}` !== '') { + form.value.qualified = `${listStability[0].qualified}` === '1' ? '合格' : '不合格' } return { diff --git a/src/views/equipement/standard/checkData/components/thirteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/thirteenth/checkDataCom.vue index cfea6f1..9ba4023 100644 --- a/src/views/equipement/standard/checkData/components/thirteenth/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/thirteenth/checkDataCom.vue @@ -1382,7 +1382,7 @@ ...item, editable: props.pageType !== 'detail', checkPointDefineFront: tempCheckPoint, // 核查点 - conclusion: `${item.conclusion}` === '1' ? '合格' : '不合格', + conclusion: `${item.conclusion}` !== '' ? `${item.conclusion}` === '1' ? '合格' : '不合格' : item.conclusion, testValueOne: item.checkType === '稳定性' ? item.testValueOne : (item.checkType === '重复性' && `${item.testValueOne}` === '') ? undefined : Number(item.testValueOne), // 测量值1/测量值(上升时间) testValueTwo: item.checkType === '稳定性' ? item.testValueTwo : (item.checkType === '重复性' && `${item.testValueTwo}` === '') ? undefined : Number(item.testValueTwo), // 测量值2(示值) testValueThree: item.checkType === '稳定性' ? item.testValueThree : (item.checkType === '重复性' && `${item.testValueThree}` === '') ? undefined : Number(item.testValueThree), // 测量值3(示值) @@ -1400,7 +1400,7 @@ // 稳定性考核是否合格 let tempStabilityList = [] tempStabilityList = list.filter((item: { checkType: string }) => item.checkType === '稳定性') - if (tempStabilityList.length) { + if (tempStabilityList.length && tempStabilityList[0].qualified !== '') { form.value.qualified = tempStabilityList[0].qualified === 1 ? '合格' : '不合格' } diff --git a/src/views/equipement/standard/checkData/components/useStabilityCaculate.ts b/src/views/equipement/standard/checkData/components/useStabilityCaculate.ts index adcfbdc..5fee396 100644 --- a/src/views/equipement/standard/checkData/components/useStabilityCaculate.ts +++ b/src/views/equipement/standard/checkData/components/useStabilityCaculate.ts @@ -231,19 +231,33 @@ } } -export function solveListStability(list: any, length: number) { +/** + * + * @param list 稳定性表格 + * @param length fetchHistory查询稳定性的表头有几个日期 + * @returns + */ +export function solveListStability(list: any) { // 这里处理问题:过滤掉历史日期查询不到的数据,达到历史日期查询什么就展示什么的问题 // 存在接口查到第二列数据,但是历史日期接口缺没有第二列 const tempList = list.map((item: any) => { return { ...item, // 清除表中数据 - testValueOne: length < 6 ? '' : item.testValueOne, - testValueTwo: length < 5 ? '' : item.testValueTwo, - testValueThree: length < 4 ? '' : item.testValueThree, - testValueFour: length < 3 ? '' : item.testValueFour, - testValueFive: length < 2 ? '' : item.testValueFive, - testValueSix: length < 1 ? '' : item.testValueSix, + testValueOne: '', + testValueTwo: '', + testValueThree: '', + testValueFour: '', + testValueFive: '', + testValueSix: '', + + averageValueOne: '', + averageValueTwo: '', + averageValueThree: '', + averageValueFour: '', + averageValueFive: '', + averageValueSix: '', + } }) return tempList diff --git a/src/views/equipement/standard/checkData/components/eighth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/eighth/checkDataCom.vue index 1e95ed7..40b10a2 100644 --- a/src/views/equipement/standard/checkData/components/eighth/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/eighth/checkDataCom.vue @@ -467,7 +467,8 @@ } else { listRepeatability.value = tempListRepeatability// 重复性查询数据 - listStability.value = tempListStability// 稳定性查询数据 + // listStability.value = tempListStability // 稳定性查询数据 + listStability.value = solveListStability(tempListStability) // 稳定性查询数据 } nextTick(() => { @@ -490,12 +491,21 @@ fetchHistoryIndication() // 重新拉取稳定性日期 } // ====================计算结论===================== - if (listStability.value.every(item => `${item}` === '是')) { - form.value.conclusion = '设备性能正常' - } - else { - form.value.conclusion = '设备性能异常' - } + // if (listStability.value.every(item => `${item.lessThan}` === '是')) { + // form.value.conclusion = '设备性能正常' + // } + // else { + // form.value.conclusion = '设备性能异常' + // } + // 计算结论 + nextTick(() => { + const tempResult = listStability.value.every((item: { lessThan: string }) => { + return item.lessThan === '是' + }) + const dateNum = dateCount(columns_stability.value) + form.value.conclusion = dateNum < 4 ? '设备性能正常' : tempResult ? '设备性能正常' : '设备性能异常' + }) + // form.value.conclusion = listStability.value.length ? listStability.value[0].conclusion! : ''// 结论 loading.close() @@ -563,7 +573,6 @@ listStability.value = listStability.value.map((item) => { return { ...item, - lessThan: item.lessThan === '是' ? '1' : item.lessThan === '否' ? '0' : '', // 是否小于相对扩展不确定度Urel(0/1) conclusion: form.value.conclusion, // 结论 } }) @@ -585,9 +594,8 @@ // 统计日期 function dateCount(columns: TableColumn[]) { let dateNum = 0 // 稳定性表格有几个日期 - // 统计有几个日期 - columns[2].children?.forEach((item) => { + columns[2].children!.forEach((item) => { if (item.text !== '-' && item.text !== '') { dateNum += 1 } @@ -597,8 +605,7 @@ watch(() => props.pageType, (newValue) => { if (newValue === 'detail') { - listRepeatability.value - = listRepeatability.value.map((item) => { item.editable = false; return item }) + listRepeatability.value = listRepeatability.value.map((item) => { item.editable = false; return item }) } }) diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue index 90de480..cf7f8f1 100644 --- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue @@ -398,7 +398,7 @@ // form.value.qualified = '不合格' // } if (listStability.value && listStability.value.length) { - form.value.qualified = `${listStability.value[0].qualified}1` === '1' ? '合格' : '不合格' + form.value.qualified = `${listStability.value[0].qualified}` === '1' ? '合格' : '不合格' } } @@ -419,7 +419,7 @@ return { ...item, editable: props.pageType !== 'detail', - lessThan: `${item.lessThan}` === '1' ? '合格' : '不合格', + lessThan: `${item.lessThan}` !== '' ? `${item.lessThan}` === '1' ? '合格' : '不合格' : item.lessThan, kuValueOne: item.checkType === '稳定性' ? item.kuValueOne : Number(item.kuValueOne), kuValueTwo: item.checkType === '稳定性' ? item.kuValueTwo : Number(item.kuValueTwo), kuValueThree: item.checkType === '稳定性' ? item.kuValueThree : Number(item.kuValueThree), @@ -468,8 +468,8 @@ } }) // 稳定性 - if (listStability && listStability.length) { - form.value.qualified = `${listStability[0].qualified}1` === '1' ? '合格' : '不合格' + if (listStability && listStability.length && `${listStability[0].qualified}` !== '') { + form.value.qualified = `${listStability[0].qualified}` === '1' ? '合格' : '不合格' } return { diff --git a/src/views/equipement/standard/checkData/components/thirteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/thirteenth/checkDataCom.vue index cfea6f1..9ba4023 100644 --- a/src/views/equipement/standard/checkData/components/thirteenth/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/thirteenth/checkDataCom.vue @@ -1382,7 +1382,7 @@ ...item, editable: props.pageType !== 'detail', checkPointDefineFront: tempCheckPoint, // 核查点 - conclusion: `${item.conclusion}` === '1' ? '合格' : '不合格', + conclusion: `${item.conclusion}` !== '' ? `${item.conclusion}` === '1' ? '合格' : '不合格' : item.conclusion, testValueOne: item.checkType === '稳定性' ? item.testValueOne : (item.checkType === '重复性' && `${item.testValueOne}` === '') ? undefined : Number(item.testValueOne), // 测量值1/测量值(上升时间) testValueTwo: item.checkType === '稳定性' ? item.testValueTwo : (item.checkType === '重复性' && `${item.testValueTwo}` === '') ? undefined : Number(item.testValueTwo), // 测量值2(示值) testValueThree: item.checkType === '稳定性' ? item.testValueThree : (item.checkType === '重复性' && `${item.testValueThree}` === '') ? undefined : Number(item.testValueThree), // 测量值3(示值) @@ -1400,7 +1400,7 @@ // 稳定性考核是否合格 let tempStabilityList = [] tempStabilityList = list.filter((item: { checkType: string }) => item.checkType === '稳定性') - if (tempStabilityList.length) { + if (tempStabilityList.length && tempStabilityList[0].qualified !== '') { form.value.qualified = tempStabilityList[0].qualified === 1 ? '合格' : '不合格' } diff --git a/src/views/equipement/standard/checkData/components/useStabilityCaculate.ts b/src/views/equipement/standard/checkData/components/useStabilityCaculate.ts index adcfbdc..5fee396 100644 --- a/src/views/equipement/standard/checkData/components/useStabilityCaculate.ts +++ b/src/views/equipement/standard/checkData/components/useStabilityCaculate.ts @@ -231,19 +231,33 @@ } } -export function solveListStability(list: any, length: number) { +/** + * + * @param list 稳定性表格 + * @param length fetchHistory查询稳定性的表头有几个日期 + * @returns + */ +export function solveListStability(list: any) { // 这里处理问题:过滤掉历史日期查询不到的数据,达到历史日期查询什么就展示什么的问题 // 存在接口查到第二列数据,但是历史日期接口缺没有第二列 const tempList = list.map((item: any) => { return { ...item, // 清除表中数据 - testValueOne: length < 6 ? '' : item.testValueOne, - testValueTwo: length < 5 ? '' : item.testValueTwo, - testValueThree: length < 4 ? '' : item.testValueThree, - testValueFour: length < 3 ? '' : item.testValueFour, - testValueFive: length < 2 ? '' : item.testValueFive, - testValueSix: length < 1 ? '' : item.testValueSix, + testValueOne: '', + testValueTwo: '', + testValueThree: '', + testValueFour: '', + testValueFive: '', + testValueSix: '', + + averageValueOne: '', + averageValueTwo: '', + averageValueThree: '', + averageValueFour: '', + averageValueFive: '', + averageValueSix: '', + } }) return tempList diff --git a/src/views/equipement/standard/checkData/detail.vue b/src/views/equipement/standard/checkData/detail.vue index 9bf92fc..3307d15 100644 --- a/src/views/equipement/standard/checkData/detail.vue +++ b/src/views/equipement/standard/checkData/detail.vue @@ -444,10 +444,11 @@ ...form.value, ...checkDataRef.value.form, checkAccord: technologyFile.value.join(','), // 核查依据 - checkDataETwoList: list.map((item: { id: string }) => { + checkDataETwoList: list.map((item: { id: string; lessThan: string }) => { return { ...item, id: pageType.value === 'add' ? '' : item.id, + lessThan: item.lessThan === '是' ? '1' : item.lessThan === '否' ? '0' : item.lessThan, // 是否小于相对扩展不确定度Urel(0/1) } }), // 核查数据 checkEquipmentIdList: equipmentList.value.map(item => item.id), // 核查标准设备 @@ -460,7 +461,7 @@ standardEquipmentId: selectStandardId.value, // 被核查标准装置id id: infoId.value, belongStandardEquipment: belongStandardEquipment.value, // 检校标准装置 - conclusion: checkDataRef.value.form.conclusion === '设备性能正常' ? '合格' : '不合格', // 结论,与稳定性考核相同,后端需要这个字段差稳定性历史数据 + conclusion: isSolveCertParams ? checkDataRef.value.form.conclusion : checkDataRef.value.form.conclusion === '设备性能正常' ? '合格' : '不合格', // 结论,与稳定性考核相同,后端需要这个字段差稳定性历史数据 } } else if (belongStandardEquipment.value === '9') { // 频谱分析仪 @@ -878,11 +879,13 @@ // 点击生成核查记录 const createCheckRecord = () => { - if (user.bizLabCode === '') { + console.log('1', user.bizLabCode, '2', user.groupNo) + + if (user.bizLabCode === '' || !user.bizLabCode) { ElMessage.warning('此用户非计量人员,不允许生成证书') return false } - if (user.groupNo === '') { + if (user.groupNo === '' || !user.groupNo) { ElMessage.warning('此用户非计量人员,不允许生成证书') return false }