diff --git a/src/views/equipement/standard/checkData/components/fourteen/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fourteen/checkDataCom.vue index 5bfa954..8a93499 100644 --- a/src/views/equipement/standard/checkData/components/fourteen/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/fourteen/checkDataCom.vue @@ -680,7 +680,7 @@ return { ...item, editable: props.pageType !== 'detail', - lessThanValue: `${item.lessThan}` === '1' ? '合格' : '不合格', + lessThanValue: `${item.lessThan}` === '1' || `${item.qualified}` === '1' ? '合格' : '不合格', testValueOne: item.checkType === '稳定性' ? item.testValueOne : Number(item.testValueOne), // 测量值1/测量值(上升时间) testValueTwo: item.checkType === '稳定性' ? item.testValueTwo : Number(item.testValueTwo), // 测量值2(示值) testValueThree: item.checkType === '稳定性' ? item.testValueThree : Number(item.testValueThree), // 测量值3(示值) @@ -949,7 +949,9 @@ { width: '180', text: '-', value: 'testValueSix', align: 'center', required: false, type: 'text', customHeader: true }, ] as any columns_stability_frequency.value[3].children = [...tempColumn] + console.log(columns_stability_power_level.value, '11111111111') columns_stability_power_level.value[3].children = [...tempColumn] + console.log(columns_stability_power_level.value, '2222222222222') columns_stability_relative_level.value[3].children = [...tempColumn] columns_stability_frequency.value[3].children![5].text = props.checkDate! // 最后一列的表头日期 diff --git a/src/views/equipement/standard/checkData/components/fourteen/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fourteen/checkDataCom.vue index 5bfa954..8a93499 100644 --- a/src/views/equipement/standard/checkData/components/fourteen/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/fourteen/checkDataCom.vue @@ -680,7 +680,7 @@ return { ...item, editable: props.pageType !== 'detail', - lessThanValue: `${item.lessThan}` === '1' ? '合格' : '不合格', + lessThanValue: `${item.lessThan}` === '1' || `${item.qualified}` === '1' ? '合格' : '不合格', testValueOne: item.checkType === '稳定性' ? item.testValueOne : Number(item.testValueOne), // 测量值1/测量值(上升时间) testValueTwo: item.checkType === '稳定性' ? item.testValueTwo : Number(item.testValueTwo), // 测量值2(示值) testValueThree: item.checkType === '稳定性' ? item.testValueThree : Number(item.testValueThree), // 测量值3(示值) @@ -949,7 +949,9 @@ { width: '180', text: '-', value: 'testValueSix', align: 'center', required: false, type: 'text', customHeader: true }, ] as any columns_stability_frequency.value[3].children = [...tempColumn] + console.log(columns_stability_power_level.value, '11111111111') columns_stability_power_level.value[3].children = [...tempColumn] + console.log(columns_stability_power_level.value, '2222222222222') columns_stability_relative_level.value[3].children = [...tempColumn] columns_stability_frequency.value[3].children![5].text = props.checkDate! // 最后一列的表头日期 diff --git a/src/views/equipement/standard/checkData/components/second/checkDataCom.vue b/src/views/equipement/standard/checkData/components/second/checkDataCom.vue index a12436c..139d89c 100644 --- a/src/views/equipement/standard/checkData/components/second/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/second/checkDataCom.vue @@ -641,10 +641,12 @@ break } handleResult( - voltageListStability.value.map((item: { lessThanValue: string }) => { + voltageListStability.value.map((item: { lessThanValue: string }, index) => { return { ...item, lessThan: item.lessThanValue === '是' || item.lessThanValue === '合格' ? '1' : item.lessThanValue === '否' || item.lessThanValue === '不合格' ? '0' : '', // 是否小于相对扩展不确定度Urel(0/1) + testValueSix: voltageListRepeatability.value[index].averageValue, // 核查读数6(本次重复性示值算术平均值) + testValueSixDate: props.checkDate, // 核查读数6日期(本次核查日期) } }), (data: any) => { voltageListStability.value = handeData(data, voltageListStability.value).map((item: any, index: number) => ({ @@ -680,10 +682,12 @@ break } handleResult( - effectListStability.value.map((item: { lessThanValue: string }) => { + effectListStability.value.map((item: { lessThanValue: string }, index) => { return { ...item, lessThan: item.lessThanValue === '是' || item.lessThanValue === '合格' ? '1' : item.lessThanValue === '否' || item.lessThanValue === '不合格' ? '0' : '', // 是否小于相对扩展不确定度Urel(0/1) + testValueSix: effectListRepeatability.value[index].averageValue, // 核查读数6(本次重复性示值算术平均值) + testValueSixDate: props.checkDate, // 核查读数6日期(本次核查日期) } }), (data: any) => { effectListStability.value = handeData(data, effectListStability.value).map((item: any, index: number) => ({ @@ -719,10 +723,12 @@ break } handleResult( - electricityDirectListStability.value.map((item: { lessThanValue: string }) => { + electricityDirectListStability.value.map((item: { lessThanValue: string }, index) => { return { ...item, lessThan: item.lessThanValue === '是' || item.lessThanValue === '合格' ? '1' : item.lessThanValue === '否' || item.lessThanValue === '不合格' ? '0' : '', // 是否小于相对扩展不确定度Urel(0/1) + testValueSix: electricityDirectListRepeatability.value[index].averageValue, // 核查读数6(本次重复性示值算术平均值) + testValueSixDate: props.checkDate, // 核查读数6日期(本次核查日期) } }), (data: any) => { electricityDirectListStability.value = handeData(data, electricityDirectListStability.value).map((item: any, index: number) => ({ @@ -758,10 +764,12 @@ break } handleResult( - electricityIndirectListStability.value.map((item: { lessThanValue: string }) => { + electricityIndirectListStability.value.map((item: { lessThanValue: string }, index) => { return { ...item, lessThan: item.lessThanValue === '是' || item.lessThanValue === '合格' ? '1' : item.lessThanValue === '否' || item.lessThanValue === '不合格' ? '0' : '', // 是否小于相对扩展不确定度Urel(0/1) + testValueSix: electricityIndirectListRepeatability.value[index].averageValue, // 核查读数6(本次重复性示值算术平均值) + testValueSixDate: props.checkDate, // 核查读数6日期(本次核查日期) } }), (data: any) => { electricityIndirectListStability.value = handeData(data, electricityIndirectListStability.value).map((item: any, index: number) => ({ @@ -797,10 +805,12 @@ break } handleResult( - rippleVoltageListStability.value.map((item: { lessThanValue: string }) => { + rippleVoltageListStability.value.map((item: { lessThanValue: string }, index) => { return { ...item, lessThan: item.lessThanValue === '是' || item.lessThanValue === '合格' ? '1' : item.lessThanValue === '否' || item.lessThanValue === '不合格' ? '0' : '', // 是否小于相对扩展不确定度Urel(0/1) + testValueSix: rippleVoltageListRepeatability.value[index].averageValue, // 核查读数6(本次重复性示值算术平均值) + testValueSixDate: props.checkDate, // 核查读数6日期(本次核查日期) } }), (data: any) => { rippleVoltageListStability.value = handeData(data, rippleVoltageListStability.value).map((item: any, index: number) => ({