diff --git a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue index b6df51b..607e8c9 100644 --- a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue @@ -42,9 +42,9 @@ appearanceFunctionCheck: 0, // 外观 voltageRegulation: 0, // 电源电压调整率 loadRegulation: 0, // 负载调整率 - voltageRepresentError: 0, // 电压表示值误差 - currentRepresentErrorDirect: 0, // 电流表示值误差(直接测量) - currentRepresentErrorIndirect: 0, // 电流表示值误差(间接测量) + voltageRepresentError: 0, // 电压示值误差 + currentRepresentErrorDirect: 0, // 电流示值误差(直接测量) + currentRepresentErrorIndirect: 0, // 电流示值误差(间接测量) rippleVoltage: 0, // 纹波电压 voltageOutputStability: 0, // 输出电压短期稳定性 remark: '无', // 情况说明 @@ -70,9 +70,9 @@ // ---------------------------------------检定项数据表格---------------------------------------------------- const lineVoltageRegulationList = ref([]) // 电源电压调整率 const loadRegulationList = ref([]) // 负载调整率 -const voltageRepresentationValueErrorList = ref([]) // 电压表示值误差 -const ammeterDirectList = ref([]) // 电流表示值误差（直接测量） -const ammeterIndirectList = ref([]) // 电流表示值误差（间接测量） +const voltageRepresentationValueErrorList = ref([]) // 电压示值误差 +const ammeterDirectList = ref([]) // 电流示值误差（直接测量） +const ammeterIndirectList = ref([]) // 电流示值误差（间接测量） const rippleVoltageList = ref([]) // 纹波电压 const outputVoltageStabilityList = ref([]) // 输出电压短期稳定性 const listDict = ref<{ [key: string]: IDetailMeasureList[] }>({}) @@ -80,9 +80,9 @@ listDict.value = { '1-电源电压调整率': lineVoltageRegulationList.value, // 1 '2-负载调整率': loadRegulationList.value, // 2 - '3-电压表示值误差': voltageRepresentationValueErrorList.value, // 3 - '4-电流表示值误差(直接测量)': ammeterDirectList.value, // 4 - '5-电流表示值误差(间接测量)': ammeterIndirectList.value, // 5 + '3-电压示值误差': voltageRepresentationValueErrorList.value, // 3 + '4-电流示值误差(直接测量)': ammeterDirectList.value, // 4 + '5-电流示值误差(间接测量)': ammeterIndirectList.value, // 5 '6-纹波电压': rippleVoltageList.value, // 6 '7-输出电压短期稳定性': outputVoltageStabilityList.value, // 7 } @@ -107,7 +107,7 @@ { text: '被检电源技术指标', value: 'technicalIndex', align: 'center', required: false, type: 'text' }, { text: '负载调整率', value: 'loadRegulation', align: 'center', required: false, type: 'text' }, ]) -// 电压表示值误差 +// 电压示值误差 const columns_voltage_representation_value_error = ref([ { text: '检定项目', value: 'params', align: 'center', required: false, type: 'text' }, { text: '输出通道', value: 'outputChannel', align: 'center', required: false, type: 'text' }, @@ -117,7 +117,7 @@ { text: '最大允许误差', value: 'maximumError', align: 'center', required: false, type: 'text' }, { text: '绝对误差', value: 'absoluteError', align: 'center', required: false, type: 'text' }, ]) -// 电流表示值误差（间接测量） +// 电流示值误差（间接测量） const columns_ammeter_indirect = ref([ { text: '检定项目', value: 'params', align: 'center', required: false, type: 'text' }, { text: '输出通道', value: 'outputChannel', align: 'center', required: false, type: 'text' }, @@ -150,9 +150,9 @@ const columnsDict = ref<{ [key: string]: any[] | TableColumn[] }>({ '1-电源电压调整率': columns_line_voltage_regulation.value, // 1 '2-负载调整率': columns_load_regulation.value, // 2 - '3-电压表示值误差': columns_voltage_representation_value_error.value, // 3 - '4-电流表示值误差(直接测量)': columns_voltage_representation_value_error.value, // 4 - '5-电流表示值误差(间接测量)': columns_ammeter_indirect.value, // 5 + '3-电压示值误差': columns_voltage_representation_value_error.value, // 3 + '4-电流示值误差(直接测量)': columns_voltage_representation_value_error.value, // 4 + '5-电流示值误差(间接测量)': columns_ammeter_indirect.value, // 5 '6-纹波电压': columns_ripple_voltage.value, // 6 '7-输出电压短期稳定性': columns_output_voltage_stability.value, // 7 }) @@ -264,16 +264,16 @@ loadRegulationList.value.push({ ...item, params: '负载调整率' }) break case '3': - // 电压表示值误差 - voltageRepresentationValueErrorList.value.push({ ...item, params: '电压表示值误差', maximumError: !item.maximumError.includes('.') ? calcMaxError(item) : Number(item.maximumError) || 0 }) + // 电压示值误差 + voltageRepresentationValueErrorList.value.push({ ...item, params: '电压示值误差', maximumError: !item.maximumError.includes('.') ? calcMaxError(item) : Number(item.maximumError) || 0 }) break case '4': - // 电流表示值误差(直接测量) - ammeterDirectList.value.push({ ...item, params: '电流表示值误差(直接测量)', maximumError: !item.maximumError.includes('.') ? calcMaxError(item) : Number(item.maximumError) || 0 }) + // 电流示值误差(直接测量) + ammeterDirectList.value.push({ ...item, params: '电流示值误差(直接测量)', maximumError: !item.maximumError.includes('.') ? calcMaxError(item) : Number(item.maximumError) || 0 }) break case '5': - // 电流表示值误差(间接测量) - ammeterIndirectList.value.push({ ...item, params: '电流表示值误差(间接测量)', maximumError: !item.maximumError.includes('.') ? calcMaxError(item) : Number(item.maximumError) || 0 }) + // 电流示值误差(间接测量) + ammeterIndirectList.value.push({ ...item, params: '电流示值误差(间接测量)', maximumError: !item.maximumError.includes('.') ? calcMaxError(item) : Number(item.maximumError) || 0 }) break case '6': // 纹波电压 @@ -310,9 +310,9 @@ itemFormData.value.appearanceFunctionCheck = res.data.appearanceFunctionCheck // 外观及功能检查 itemFormData.value.voltageRegulation = res.data.voltageRegulation // 电源电压调整率 itemFormData.value.loadRegulation = res.data.loadRegulation // 负载调整率 - itemFormData.value.voltageRepresentError = res.data.voltageRepresentError // 电压表示值误差 - itemFormData.value.currentRepresentErrorDirect = res.data.currentRepresentErrorDirect // 电流表示值误差(直接测量) - itemFormData.value.currentRepresentErrorIndirect = res.data.currentRepresentErrorIndirect // 电流表示值误差(间接测量) + itemFormData.value.voltageRepresentError = res.data.voltageRepresentError // 电压示值误差 + itemFormData.value.currentRepresentErrorDirect = res.data.currentRepresentErrorDirect // 电流示值误差(直接测量) + itemFormData.value.currentRepresentErrorIndirect = res.data.currentRepresentErrorIndirect // 电流示值误差(间接测量) itemFormData.value.rippleVoltage = res.data.rippleVoltage // 纹波电压 itemFormData.value.voltageOutputStability = res.data.voltageOutputStability // 输出电压短期稳定性 initInputData(res.data.measureItemDataDcPowerList.map((item: IDetailMeasureList) => ({ ...item, id: '' }))) @@ -377,17 +377,17 @@ loadRegulationList.value = result || loadRegulationList.value setListDict() break - case '电压表示值误差': + case '电压示值误差': result = await caclItem(listDict.value[`${index}-${title}`], columnsDict.value[`${index}-${title}`], title) as IDetailMeasureList[] voltageRepresentationValueErrorList.value = result || voltageRepresentationValueErrorList.value setListDict() break - case '电流表示值误差(直接测量)': + case '电流示值误差(直接测量)': result = await caclItem(listDict.value[`${index}-${title}`], columnsDict.value[`${index}-${title}`], title) as IDetailMeasureList[] ammeterDirectList.value = result || ammeterDirectList.value setListDict() break - case '电流表示值误差(间接测量)': + case '电流示值误差(间接测量)': result = await caclItem(listDict.value[`${index}-${title}`], columnsDict.value[`${index}-${title}`], title) as IDetailMeasureList[] ammeterIndirectList.value = result || ammeterIndirectList.value setListDict() @@ -513,9 +513,9 @@ - + @@ -531,9 +531,9 @@ - + @@ -548,9 +548,9 @@ - + diff --git a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue index b6df51b..607e8c9 100644 --- a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue @@ -42,9 +42,9 @@ appearanceFunctionCheck: 0, // 外观 voltageRegulation: 0, // 电源电压调整率 loadRegulation: 0, // 负载调整率 - voltageRepresentError: 0, // 电压表示值误差 - currentRepresentErrorDirect: 0, // 电流表示值误差(直接测量) - currentRepresentErrorIndirect: 0, // 电流表示值误差(间接测量) + voltageRepresentError: 0, // 电压示值误差 + currentRepresentErrorDirect: 0, // 电流示值误差(直接测量) + currentRepresentErrorIndirect: 0, // 电流示值误差(间接测量) rippleVoltage: 0, // 纹波电压 voltageOutputStability: 0, // 输出电压短期稳定性 remark: '无', // 情况说明 @@ -70,9 +70,9 @@ // ---------------------------------------检定项数据表格---------------------------------------------------- const lineVoltageRegulationList = ref([]) // 电源电压调整率 const loadRegulationList = ref([]) // 负载调整率 -const voltageRepresentationValueErrorList = ref([]) // 电压表示值误差 -const ammeterDirectList = ref([]) // 电流表示值误差（直接测量） -const ammeterIndirectList = ref([]) // 电流表示值误差（间接测量） +const voltageRepresentationValueErrorList = ref([]) // 电压示值误差 +const ammeterDirectList = ref([]) // 电流示值误差（直接测量） +const ammeterIndirectList = ref([]) // 电流示值误差（间接测量） const rippleVoltageList = ref([]) // 纹波电压 const outputVoltageStabilityList = ref([]) // 输出电压短期稳定性 const listDict = ref<{ [key: string]: IDetailMeasureList[] }>({}) @@ -80,9 +80,9 @@ listDict.value = { '1-电源电压调整率': lineVoltageRegulationList.value, // 1 '2-负载调整率': loadRegulationList.value, // 2 - '3-电压表示值误差': voltageRepresentationValueErrorList.value, // 3 - '4-电流表示值误差(直接测量)': ammeterDirectList.value, // 4 - '5-电流表示值误差(间接测量)': ammeterIndirectList.value, // 5 + '3-电压示值误差': voltageRepresentationValueErrorList.value, // 3 + '4-电流示值误差(直接测量)': ammeterDirectList.value, // 4 + '5-电流示值误差(间接测量)': ammeterIndirectList.value, // 5 '6-纹波电压': rippleVoltageList.value, // 6 '7-输出电压短期稳定性': outputVoltageStabilityList.value, // 7 } @@ -107,7 +107,7 @@ { text: '被检电源技术指标', value: 'technicalIndex', align: 'center', required: false, type: 'text' }, { text: '负载调整率', value: 'loadRegulation', align: 'center', required: false, type: 'text' }, ]) -// 电压表示值误差 +// 电压示值误差 const columns_voltage_representation_value_error = ref([ { text: '检定项目', value: 'params', align: 'center', required: false, type: 'text' }, { text: '输出通道', value: 'outputChannel', align: 'center', required: false, type: 'text' }, @@ -117,7 +117,7 @@ { text: '最大允许误差', value: 'maximumError', align: 'center', required: false, type: 'text' }, { text: '绝对误差', value: 'absoluteError', align: 'center', required: false, type: 'text' }, ]) -// 电流表示值误差（间接测量） +// 电流示值误差（间接测量） const columns_ammeter_indirect = ref([ { text: '检定项目', value: 'params', align: 'center', required: false, type: 'text' }, { text: '输出通道', value: 'outputChannel', align: 'center', required: false, type: 'text' }, @@ -150,9 +150,9 @@ const columnsDict = ref<{ [key: string]: any[] | TableColumn[] }>({ '1-电源电压调整率': columns_line_voltage_regulation.value, // 1 '2-负载调整率': columns_load_regulation.value, // 2 - '3-电压表示值误差': columns_voltage_representation_value_error.value, // 3 - '4-电流表示值误差(直接测量)': columns_voltage_representation_value_error.value, // 4 - '5-电流表示值误差(间接测量)': columns_ammeter_indirect.value, // 5 + '3-电压示值误差': columns_voltage_representation_value_error.value, // 3 + '4-电流示值误差(直接测量)': columns_voltage_representation_value_error.value, // 4 + '5-电流示值误差(间接测量)': columns_ammeter_indirect.value, // 5 '6-纹波电压': columns_ripple_voltage.value, // 6 '7-输出电压短期稳定性': columns_output_voltage_stability.value, // 7 }) @@ -264,16 +264,16 @@ loadRegulationList.value.push({ ...item, params: '负载调整率' }) break case '3': - // 电压表示值误差 - voltageRepresentationValueErrorList.value.push({ ...item, params: '电压表示值误差', maximumError: !item.maximumError.includes('.') ? calcMaxError(item) : Number(item.maximumError) || 0 }) + // 电压示值误差 + voltageRepresentationValueErrorList.value.push({ ...item, params: '电压示值误差', maximumError: !item.maximumError.includes('.') ? calcMaxError(item) : Number(item.maximumError) || 0 }) break case '4': - // 电流表示值误差(直接测量) - ammeterDirectList.value.push({ ...item, params: '电流表示值误差(直接测量)', maximumError: !item.maximumError.includes('.') ? calcMaxError(item) : Number(item.maximumError) || 0 }) + // 电流示值误差(直接测量) + ammeterDirectList.value.push({ ...item, params: '电流示值误差(直接测量)', maximumError: !item.maximumError.includes('.') ? calcMaxError(item) : Number(item.maximumError) || 0 }) break case '5': - // 电流表示值误差(间接测量) - ammeterIndirectList.value.push({ ...item, params: '电流表示值误差(间接测量)', maximumError: !item.maximumError.includes('.') ? calcMaxError(item) : Number(item.maximumError) || 0 }) + // 电流示值误差(间接测量) + ammeterIndirectList.value.push({ ...item, params: '电流示值误差(间接测量)', maximumError: !item.maximumError.includes('.') ? calcMaxError(item) : Number(item.maximumError) || 0 }) break case '6': // 纹波电压 @@ -310,9 +310,9 @@ itemFormData.value.appearanceFunctionCheck = res.data.appearanceFunctionCheck // 外观及功能检查 itemFormData.value.voltageRegulation = res.data.voltageRegulation // 电源电压调整率 itemFormData.value.loadRegulation = res.data.loadRegulation // 负载调整率 - itemFormData.value.voltageRepresentError = res.data.voltageRepresentError // 电压表示值误差 - itemFormData.value.currentRepresentErrorDirect = res.data.currentRepresentErrorDirect // 电流表示值误差(直接测量) - itemFormData.value.currentRepresentErrorIndirect = res.data.currentRepresentErrorIndirect // 电流表示值误差(间接测量) + itemFormData.value.voltageRepresentError = res.data.voltageRepresentError // 电压示值误差 + itemFormData.value.currentRepresentErrorDirect = res.data.currentRepresentErrorDirect // 电流示值误差(直接测量) + itemFormData.value.currentRepresentErrorIndirect = res.data.currentRepresentErrorIndirect // 电流示值误差(间接测量) itemFormData.value.rippleVoltage = res.data.rippleVoltage // 纹波电压 itemFormData.value.voltageOutputStability = res.data.voltageOutputStability // 输出电压短期稳定性 initInputData(res.data.measureItemDataDcPowerList.map((item: IDetailMeasureList) => ({ ...item, id: '' }))) @@ -377,17 +377,17 @@ loadRegulationList.value = result || loadRegulationList.value setListDict() break - case '电压表示值误差': + case '电压示值误差': result = await caclItem(listDict.value[`${index}-${title}`], columnsDict.value[`${index}-${title}`], title) as IDetailMeasureList[] voltageRepresentationValueErrorList.value = result || voltageRepresentationValueErrorList.value setListDict() break - case '电流表示值误差(直接测量)': + case '电流示值误差(直接测量)': result = await caclItem(listDict.value[`${index}-${title}`], columnsDict.value[`${index}-${title}`], title) as IDetailMeasureList[] ammeterDirectList.value = result || ammeterDirectList.value setListDict() break - case '电流表示值误差(间接测量)': + case '电流示值误差(间接测量)': result = await caclItem(listDict.value[`${index}-${title}`], columnsDict.value[`${index}-${title}`], title) as IDetailMeasureList[] ammeterIndirectList.value = result || ammeterIndirectList.value setListDict() @@ -513,9 +513,9 @@ - + @@ -531,9 +531,9 @@ - + @@ -548,9 +548,9 @@ - + diff --git a/src/views/business/taskMeasure/measureData/components/sixth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/sixth/templateDetail.vue index b10be82..664f3b6 100644 --- a/src/views/business/taskMeasure/measureData/components/sixth/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/sixth/templateDetail.vue @@ -196,9 +196,9 @@ editable: true, } as any) }) - if (pageType.value === 'add') { - list.value = list.value.map((item: any) => ({ ...item, beforeAdjustSecond: item.beforeAdjustFirst || '', beforeAdjustThird: item.beforeAdjustFirst || '' })) - } + // if (pageType.value === 'add') { + // list.value = list.value.map((item: any) => ({ ...item, beforeAdjustSecond: item.beforeAdjustFirst || '', beforeAdjustThird: item.beforeAdjustFirst || '' })) + // } } /** @@ -269,8 +269,13 @@ } // -------------------------------------------处理表格函数--------------------------------------- // el-input-number组件值变化 -const handleInputNumberChange = ({ row }: any) => { - +const handleInputNumberChange = (data: any) => { + console.log(data, 'data') + if (data.cellIndex === 5 && data.column.label === '调整前') { + console.log(data, 'data') + list.value[data.$index].beforeAdjustSecond = data.row.beforeAdjustFirst + list.value[data.$index].beforeAdjustThird = data.row.beforeAdjustFirst + } } // ------------------------------------------钩子---------------------------------------------- diff --git a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue index b6df51b..607e8c9 100644 --- a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue @@ -42,9 +42,9 @@ appearanceFunctionCheck: 0, // 外观 voltageRegulation: 0, // 电源电压调整率 loadRegulation: 0, // 负载调整率 - voltageRepresentError: 0, // 电压表示值误差 - currentRepresentErrorDirect: 0, // 电流表示值误差(直接测量) - currentRepresentErrorIndirect: 0, // 电流表示值误差(间接测量) + voltageRepresentError: 0, // 电压示值误差 + currentRepresentErrorDirect: 0, // 电流示值误差(直接测量) + currentRepresentErrorIndirect: 0, // 电流示值误差(间接测量) rippleVoltage: 0, // 纹波电压 voltageOutputStability: 0, // 输出电压短期稳定性 remark: '无', // 情况说明 @@ -70,9 +70,9 @@ // ---------------------------------------检定项数据表格---------------------------------------------------- const lineVoltageRegulationList = ref([]) // 电源电压调整率 const loadRegulationList = ref([]) // 负载调整率 -const voltageRepresentationValueErrorList = ref([]) // 电压表示值误差 -const ammeterDirectList = ref([]) // 电流表示值误差（直接测量） -const ammeterIndirectList = ref([]) // 电流表示值误差（间接测量） +const voltageRepresentationValueErrorList = ref([]) // 电压示值误差 +const ammeterDirectList = ref([]) // 电流示值误差（直接测量） +const ammeterIndirectList = ref([]) // 电流示值误差（间接测量） const rippleVoltageList = ref([]) // 纹波电压 const outputVoltageStabilityList = ref([]) // 输出电压短期稳定性 const listDict = ref<{ [key: string]: IDetailMeasureList[] }>({}) @@ -80,9 +80,9 @@ listDict.value = { '1-电源电压调整率': lineVoltageRegulationList.value, // 1 '2-负载调整率': loadRegulationList.value, // 2 - '3-电压表示值误差': voltageRepresentationValueErrorList.value, // 3 - '4-电流表示值误差(直接测量)': ammeterDirectList.value, // 4 - '5-电流表示值误差(间接测量)': ammeterIndirectList.value, // 5 + '3-电压示值误差': voltageRepresentationValueErrorList.value, // 3 + '4-电流示值误差(直接测量)': ammeterDirectList.value, // 4 + '5-电流示值误差(间接测量)': ammeterIndirectList.value, // 5 '6-纹波电压': rippleVoltageList.value, // 6 '7-输出电压短期稳定性': outputVoltageStabilityList.value, // 7 } @@ -107,7 +107,7 @@ { text: '被检电源技术指标', value: 'technicalIndex', align: 'center', required: false, type: 'text' }, { text: '负载调整率', value: 'loadRegulation', align: 'center', required: false, type: 'text' }, ]) -// 电压表示值误差 +// 电压示值误差 const columns_voltage_representation_value_error = ref([ { text: '检定项目', value: 'params', align: 'center', required: false, type: 'text' }, { text: '输出通道', value: 'outputChannel', align: 'center', required: false, type: 'text' }, @@ -117,7 +117,7 @@ { text: '最大允许误差', value: 'maximumError', align: 'center', required: false, type: 'text' }, { text: '绝对误差', value: 'absoluteError', align: 'center', required: false, type: 'text' }, ]) -// 电流表示值误差（间接测量） +// 电流示值误差（间接测量） const columns_ammeter_indirect = ref([ { text: '检定项目', value: 'params', align: 'center', required: false, type: 'text' }, { text: '输出通道', value: 'outputChannel', align: 'center', required: false, type: 'text' }, @@ -150,9 +150,9 @@ const columnsDict = ref<{ [key: string]: any[] | TableColumn[] }>({ '1-电源电压调整率': columns_line_voltage_regulation.value, // 1 '2-负载调整率': columns_load_regulation.value, // 2 - '3-电压表示值误差': columns_voltage_representation_value_error.value, // 3 - '4-电流表示值误差(直接测量)': columns_voltage_representation_value_error.value, // 4 - '5-电流表示值误差(间接测量)': columns_ammeter_indirect.value, // 5 + '3-电压示值误差': columns_voltage_representation_value_error.value, // 3 + '4-电流示值误差(直接测量)': columns_voltage_representation_value_error.value, // 4 + '5-电流示值误差(间接测量)': columns_ammeter_indirect.value, // 5 '6-纹波电压': columns_ripple_voltage.value, // 6 '7-输出电压短期稳定性': columns_output_voltage_stability.value, // 7 }) @@ -264,16 +264,16 @@ loadRegulationList.value.push({ ...item, params: '负载调整率' }) break case '3': - // 电压表示值误差 - voltageRepresentationValueErrorList.value.push({ ...item, params: '电压表示值误差', maximumError: !item.maximumError.includes('.') ? calcMaxError(item) : Number(item.maximumError) || 0 }) + // 电压示值误差 + voltageRepresentationValueErrorList.value.push({ ...item, params: '电压示值误差', maximumError: !item.maximumError.includes('.') ? calcMaxError(item) : Number(item.maximumError) || 0 }) break case '4': - // 电流表示值误差(直接测量) - ammeterDirectList.value.push({ ...item, params: '电流表示值误差(直接测量)', maximumError: !item.maximumError.includes('.') ? calcMaxError(item) : Number(item.maximumError) || 0 }) + // 电流示值误差(直接测量) + ammeterDirectList.value.push({ ...item, params: '电流示值误差(直接测量)', maximumError: !item.maximumError.includes('.') ? calcMaxError(item) : Number(item.maximumError) || 0 }) break case '5': - // 电流表示值误差(间接测量) - ammeterIndirectList.value.push({ ...item, params: '电流表示值误差(间接测量)', maximumError: !item.maximumError.includes('.') ? calcMaxError(item) : Number(item.maximumError) || 0 }) + // 电流示值误差(间接测量) + ammeterIndirectList.value.push({ ...item, params: '电流示值误差(间接测量)', maximumError: !item.maximumError.includes('.') ? calcMaxError(item) : Number(item.maximumError) || 0 }) break case '6': // 纹波电压 @@ -310,9 +310,9 @@ itemFormData.value.appearanceFunctionCheck = res.data.appearanceFunctionCheck // 外观及功能检查 itemFormData.value.voltageRegulation = res.data.voltageRegulation // 电源电压调整率 itemFormData.value.loadRegulation = res.data.loadRegulation // 负载调整率 - itemFormData.value.voltageRepresentError = res.data.voltageRepresentError // 电压表示值误差 - itemFormData.value.currentRepresentErrorDirect = res.data.currentRepresentErrorDirect // 电流表示值误差(直接测量) - itemFormData.value.currentRepresentErrorIndirect = res.data.currentRepresentErrorIndirect // 电流表示值误差(间接测量) + itemFormData.value.voltageRepresentError = res.data.voltageRepresentError // 电压示值误差 + itemFormData.value.currentRepresentErrorDirect = res.data.currentRepresentErrorDirect // 电流示值误差(直接测量) + itemFormData.value.currentRepresentErrorIndirect = res.data.currentRepresentErrorIndirect // 电流示值误差(间接测量) itemFormData.value.rippleVoltage = res.data.rippleVoltage // 纹波电压 itemFormData.value.voltageOutputStability = res.data.voltageOutputStability // 输出电压短期稳定性 initInputData(res.data.measureItemDataDcPowerList.map((item: IDetailMeasureList) => ({ ...item, id: '' }))) @@ -377,17 +377,17 @@ loadRegulationList.value = result || loadRegulationList.value setListDict() break - case '电压表示值误差': + case '电压示值误差': result = await caclItem(listDict.value[`${index}-${title}`], columnsDict.value[`${index}-${title}`], title) as IDetailMeasureList[] voltageRepresentationValueErrorList.value = result || voltageRepresentationValueErrorList.value setListDict() break - case '电流表示值误差(直接测量)': + case '电流示值误差(直接测量)': result = await caclItem(listDict.value[`${index}-${title}`], columnsDict.value[`${index}-${title}`], title) as IDetailMeasureList[] ammeterDirectList.value = result || ammeterDirectList.value setListDict() break - case '电流表示值误差(间接测量)': + case '电流示值误差(间接测量)': result = await caclItem(listDict.value[`${index}-${title}`], columnsDict.value[`${index}-${title}`], title) as IDetailMeasureList[] ammeterIndirectList.value = result || ammeterIndirectList.value setListDict() @@ -513,9 +513,9 @@ - + @@ -531,9 +531,9 @@ - + @@ -548,9 +548,9 @@ - + diff --git a/src/views/business/taskMeasure/measureData/components/sixth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/sixth/templateDetail.vue index b10be82..664f3b6 100644 --- a/src/views/business/taskMeasure/measureData/components/sixth/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/sixth/templateDetail.vue @@ -196,9 +196,9 @@ editable: true, } as any) }) - if (pageType.value === 'add') { - list.value = list.value.map((item: any) => ({ ...item, beforeAdjustSecond: item.beforeAdjustFirst || '', beforeAdjustThird: item.beforeAdjustFirst || '' })) - } + // if (pageType.value === 'add') { + // list.value = list.value.map((item: any) => ({ ...item, beforeAdjustSecond: item.beforeAdjustFirst || '', beforeAdjustThird: item.beforeAdjustFirst || '' })) + // } } /** @@ -269,8 +269,13 @@ } // -------------------------------------------处理表格函数--------------------------------------- // el-input-number组件值变化 -const handleInputNumberChange = ({ row }: any) => { - +const handleInputNumberChange = (data: any) => { + console.log(data, 'data') + if (data.cellIndex === 5 && data.column.label === '调整前') { + console.log(data, 'data') + list.value[data.$index].beforeAdjustSecond = data.row.beforeAdjustFirst + list.value[data.$index].beforeAdjustThird = data.row.beforeAdjustFirst + } } // ------------------------------------------钩子---------------------------------------------- diff --git a/src/views/quality/internal/workManage/components/edit.vue b/src/views/quality/internal/workManage/components/edit.vue index e2c9cc1..d19d1de 100644 --- a/src/views/quality/internal/workManage/components/edit.vue +++ b/src/views/quality/internal/workManage/components/edit.vue @@ -1,6 +1,6 @@ - + @@ -531,9 +531,9 @@ - + @@ -548,9 +548,9 @@ - + diff --git a/src/views/business/taskMeasure/measureData/components/sixth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/sixth/templateDetail.vue index b10be82..664f3b6 100644 --- a/src/views/business/taskMeasure/measureData/components/sixth/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/sixth/templateDetail.vue @@ -196,9 +196,9 @@ editable: true, } as any) }) - if (pageType.value === 'add') { - list.value = list.value.map((item: any) => ({ ...item, beforeAdjustSecond: item.beforeAdjustFirst || '', beforeAdjustThird: item.beforeAdjustFirst || '' })) - } + // if (pageType.value === 'add') { + // list.value = list.value.map((item: any) => ({ ...item, beforeAdjustSecond: item.beforeAdjustFirst || '', beforeAdjustThird: item.beforeAdjustFirst || '' })) + // } } /** @@ -269,8 +269,13 @@ } // -------------------------------------------处理表格函数--------------------------------------- // el-input-number组件值变化 -const handleInputNumberChange = ({ row }: any) => { - +const handleInputNumberChange = (data: any) => { + console.log(data, 'data') + if (data.cellIndex === 5 && data.column.label === '调整前') { + console.log(data, 'data') + list.value[data.$index].beforeAdjustSecond = data.row.beforeAdjustFirst + list.value[data.$index].beforeAdjustThird = data.row.beforeAdjustFirst + } } // ------------------------------------------钩子---------------------------------------------- diff --git a/src/views/quality/internal/workManage/components/edit.vue b/src/views/quality/internal/workManage/components/edit.vue index e2c9cc1..d19d1de 100644 --- a/src/views/quality/internal/workManage/components/edit.vue +++ b/src/views/quality/internal/workManage/components/edit.vue @@ -1,6 +1,6 @@ @@ -397,10 +397,28 @@ diff --git a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue index b6df51b..607e8c9 100644 --- a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue @@ -42,9 +42,9 @@ appearanceFunctionCheck: 0, // 外观 voltageRegulation: 0, // 电源电压调整率 loadRegulation: 0, // 负载调整率 - voltageRepresentError: 0, // 电压表示值误差 - currentRepresentErrorDirect: 0, // 电流表示值误差(直接测量) - currentRepresentErrorIndirect: 0, // 电流表示值误差(间接测量) + voltageRepresentError: 0, // 电压示值误差 + currentRepresentErrorDirect: 0, // 电流示值误差(直接测量) + currentRepresentErrorIndirect: 0, // 电流示值误差(间接测量) rippleVoltage: 0, // 纹波电压 voltageOutputStability: 0, // 输出电压短期稳定性 remark: '无', // 情况说明 @@ -70,9 +70,9 @@ // ---------------------------------------检定项数据表格---------------------------------------------------- const lineVoltageRegulationList = ref([]) // 电源电压调整率 const loadRegulationList = ref([]) // 负载调整率 -const voltageRepresentationValueErrorList = ref([]) // 电压表示值误差 -const ammeterDirectList = ref([]) // 电流表示值误差（直接测量） -const ammeterIndirectList = ref([]) // 电流表示值误差（间接测量） +const voltageRepresentationValueErrorList = ref([]) // 电压示值误差 +const ammeterDirectList = ref([]) // 电流示值误差（直接测量） +const ammeterIndirectList = ref([]) // 电流示值误差（间接测量） const rippleVoltageList = ref([]) // 纹波电压 const outputVoltageStabilityList = ref([]) // 输出电压短期稳定性 const listDict = ref<{ [key: string]: IDetailMeasureList[] }>({}) @@ -80,9 +80,9 @@ listDict.value = { '1-电源电压调整率': lineVoltageRegulationList.value, // 1 '2-负载调整率': loadRegulationList.value, // 2 - '3-电压表示值误差': voltageRepresentationValueErrorList.value, // 3 - '4-电流表示值误差(直接测量)': ammeterDirectList.value, // 4 - '5-电流表示值误差(间接测量)': ammeterIndirectList.value, // 5 + '3-电压示值误差': voltageRepresentationValueErrorList.value, // 3 + '4-电流示值误差(直接测量)': ammeterDirectList.value, // 4 + '5-电流示值误差(间接测量)': ammeterIndirectList.value, // 5 '6-纹波电压': rippleVoltageList.value, // 6 '7-输出电压短期稳定性': outputVoltageStabilityList.value, // 7 } @@ -107,7 +107,7 @@ { text: '被检电源技术指标', value: 'technicalIndex', align: 'center', required: false, type: 'text' }, { text: '负载调整率', value: 'loadRegulation', align: 'center', required: false, type: 'text' }, ]) -// 电压表示值误差 +// 电压示值误差 const columns_voltage_representation_value_error = ref([ { text: '检定项目', value: 'params', align: 'center', required: false, type: 'text' }, { text: '输出通道', value: 'outputChannel', align: 'center', required: false, type: 'text' }, @@ -117,7 +117,7 @@ { text: '最大允许误差', value: 'maximumError', align: 'center', required: false, type: 'text' }, { text: '绝对误差', value: 'absoluteError', align: 'center', required: false, type: 'text' }, ]) -// 电流表示值误差（间接测量） +// 电流示值误差（间接测量） const columns_ammeter_indirect = ref([ { text: '检定项目', value: 'params', align: 'center', required: false, type: 'text' }, { text: '输出通道', value: 'outputChannel', align: 'center', required: false, type: 'text' }, @@ -150,9 +150,9 @@ const columnsDict = ref<{ [key: string]: any[] | TableColumn[] }>({ '1-电源电压调整率': columns_line_voltage_regulation.value, // 1 '2-负载调整率': columns_load_regulation.value, // 2 - '3-电压表示值误差': columns_voltage_representation_value_error.value, // 3 - '4-电流表示值误差(直接测量)': columns_voltage_representation_value_error.value, // 4 - '5-电流表示值误差(间接测量)': columns_ammeter_indirect.value, // 5 + '3-电压示值误差': columns_voltage_representation_value_error.value, // 3 + '4-电流示值误差(直接测量)': columns_voltage_representation_value_error.value, // 4 + '5-电流示值误差(间接测量)': columns_ammeter_indirect.value, // 5 '6-纹波电压': columns_ripple_voltage.value, // 6 '7-输出电压短期稳定性': columns_output_voltage_stability.value, // 7 }) @@ -264,16 +264,16 @@ loadRegulationList.value.push({ ...item, params: '负载调整率' }) break case '3': - // 电压表示值误差 - voltageRepresentationValueErrorList.value.push({ ...item, params: '电压表示值误差', maximumError: !item.maximumError.includes('.') ? calcMaxError(item) : Number(item.maximumError) || 0 }) + // 电压示值误差 + voltageRepresentationValueErrorList.value.push({ ...item, params: '电压示值误差', maximumError: !item.maximumError.includes('.') ? calcMaxError(item) : Number(item.maximumError) || 0 }) break case '4': - // 电流表示值误差(直接测量) - ammeterDirectList.value.push({ ...item, params: '电流表示值误差(直接测量)', maximumError: !item.maximumError.includes('.') ? calcMaxError(item) : Number(item.maximumError) || 0 }) + // 电流示值误差(直接测量) + ammeterDirectList.value.push({ ...item, params: '电流示值误差(直接测量)', maximumError: !item.maximumError.includes('.') ? calcMaxError(item) : Number(item.maximumError) || 0 }) break case '5': - // 电流表示值误差(间接测量) - ammeterIndirectList.value.push({ ...item, params: '电流表示值误差(间接测量)', maximumError: !item.maximumError.includes('.') ? calcMaxError(item) : Number(item.maximumError) || 0 }) + // 电流示值误差(间接测量) + ammeterIndirectList.value.push({ ...item, params: '电流示值误差(间接测量)', maximumError: !item.maximumError.includes('.') ? calcMaxError(item) : Number(item.maximumError) || 0 }) break case '6': // 纹波电压 @@ -310,9 +310,9 @@ itemFormData.value.appearanceFunctionCheck = res.data.appearanceFunctionCheck // 外观及功能检查 itemFormData.value.voltageRegulation = res.data.voltageRegulation // 电源电压调整率 itemFormData.value.loadRegulation = res.data.loadRegulation // 负载调整率 - itemFormData.value.voltageRepresentError = res.data.voltageRepresentError // 电压表示值误差 - itemFormData.value.currentRepresentErrorDirect = res.data.currentRepresentErrorDirect // 电流表示值误差(直接测量) - itemFormData.value.currentRepresentErrorIndirect = res.data.currentRepresentErrorIndirect // 电流表示值误差(间接测量) + itemFormData.value.voltageRepresentError = res.data.voltageRepresentError // 电压示值误差 + itemFormData.value.currentRepresentErrorDirect = res.data.currentRepresentErrorDirect // 电流示值误差(直接测量) + itemFormData.value.currentRepresentErrorIndirect = res.data.currentRepresentErrorIndirect // 电流示值误差(间接测量) itemFormData.value.rippleVoltage = res.data.rippleVoltage // 纹波电压 itemFormData.value.voltageOutputStability = res.data.voltageOutputStability // 输出电压短期稳定性 initInputData(res.data.measureItemDataDcPowerList.map((item: IDetailMeasureList) => ({ ...item, id: '' }))) @@ -377,17 +377,17 @@ loadRegulationList.value = result || loadRegulationList.value setListDict() break - case '电压表示值误差': + case '电压示值误差': result = await caclItem(listDict.value[`${index}-${title}`], columnsDict.value[`${index}-${title}`], title) as IDetailMeasureList[] voltageRepresentationValueErrorList.value = result || voltageRepresentationValueErrorList.value setListDict() break - case '电流表示值误差(直接测量)': + case '电流示值误差(直接测量)': result = await caclItem(listDict.value[`${index}-${title}`], columnsDict.value[`${index}-${title}`], title) as IDetailMeasureList[] ammeterDirectList.value = result || ammeterDirectList.value setListDict() break - case '电流表示值误差(间接测量)': + case '电流示值误差(间接测量)': result = await caclItem(listDict.value[`${index}-${title}`], columnsDict.value[`${index}-${title}`], title) as IDetailMeasureList[] ammeterIndirectList.value = result || ammeterIndirectList.value setListDict() @@ -513,9 +513,9 @@ - + @@ -531,9 +531,9 @@ - + @@ -548,9 +548,9 @@ - + diff --git a/src/views/business/taskMeasure/measureData/components/sixth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/sixth/templateDetail.vue index b10be82..664f3b6 100644 --- a/src/views/business/taskMeasure/measureData/components/sixth/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/sixth/templateDetail.vue @@ -196,9 +196,9 @@ editable: true, } as any) }) - if (pageType.value === 'add') { - list.value = list.value.map((item: any) => ({ ...item, beforeAdjustSecond: item.beforeAdjustFirst || '', beforeAdjustThird: item.beforeAdjustFirst || '' })) - } + // if (pageType.value === 'add') { + // list.value = list.value.map((item: any) => ({ ...item, beforeAdjustSecond: item.beforeAdjustFirst || '', beforeAdjustThird: item.beforeAdjustFirst || '' })) + // } } /** @@ -269,8 +269,13 @@ } // -------------------------------------------处理表格函数--------------------------------------- // el-input-number组件值变化 -const handleInputNumberChange = ({ row }: any) => { - +const handleInputNumberChange = (data: any) => { + console.log(data, 'data') + if (data.cellIndex === 5 && data.column.label === '调整前') { + console.log(data, 'data') + list.value[data.$index].beforeAdjustSecond = data.row.beforeAdjustFirst + list.value[data.$index].beforeAdjustThird = data.row.beforeAdjustFirst + } } // ------------------------------------------钩子---------------------------------------------- diff --git a/src/views/quality/internal/workManage/components/edit.vue b/src/views/quality/internal/workManage/components/edit.vue index e2c9cc1..d19d1de 100644 --- a/src/views/quality/internal/workManage/components/edit.vue +++ b/src/views/quality/internal/workManage/components/edit.vue @@ -1,6 +1,6 @@ @@ -397,10 +397,28 @@ diff --git a/src/views/quality/supervise/record/components/detail.vue b/src/views/quality/supervise/record/components/detail.vue index fdd0114..21bbd07 100644 --- a/src/views/quality/supervise/record/components/detail.vue +++ b/src/views/quality/supervise/record/components/detail.vue @@ -10,6 +10,8 @@ import pdfFileItem from '@/views/quality/supervise/record/components/pdfFileItem.vue' import { getQualityReportFile } from '@/api/quality/supervise/report' import { getQualityNoReportFile } from '@/api/quality/supervise/analysis' +import { getBizQualityCorrectiveRecordFile } from '@/api/quality/correct/index' +import { getBizQualityPreventRecordFile } from '@/api/quality/prevent/index' const $route = useRoute() const $router = useRouter() const ruleForm = ref({ @@ -136,36 +138,39 @@ ruleForm.value.correctiveDTO.correctiveRecords.forEach((item: any) => { console.log(item, 'item') rectification = [...rectification, item.fileRelList] - if (item.fileName) { - correctNameList.value.push(`${item.fileName}`) - } - else { - correctNameList.value.push('') - } - if (item.filePath) { - correctFileList.value.push(`${item.filePath}`) - } - else { - correctFileList.value.push('') - } + correctNameList.value.push(item) + // if (item.fileName) { + // correctNameList.value.push(`${item.fileName}`) + // } + // else { + // correctNameList.value.push('') + // } + // if (item.filePath) { + // correctFileList.value.push(`${item.filePath}`) + // } + // else { + // correctFileList.value.push('') + // } }) // 预防 ruleForm.value.correctiveDTO.preventRecords.forEach((item: any) => { - if (item.fileName) { - preventNameList.value.push(`${item.fileName}`) - } - else { - preventNameList.value.push('') - } - if (item.filePath) { - preventFileList.value.push(`${item.filePath}`) - } - else { - preventFileList.value.push('') - } + preventNameList.value.push(item) + // if (item.fileName) { + // preventNameList.value.push(`${item.fileName}`) + // } + // else { + // preventNameList.value.push('') + // } + // if (item.filePath) { + // preventFileList.value.push(`${item.filePath}`) + // } + // else { + // preventFileList.value.push('') + // } }) // 整改 rectification.forEach((item: any) => { + console.log(rectification, 'rectification') if (item.fileName) { rectificationNameList.value.push(`${item.fileName}`) } @@ -214,6 +219,7 @@ ElMessage.error('文件获取失败') }) } +// 不符合项 const getQualityNoReportFileItem = (id: string, fun: any) => { getQualityNoReportFile({ id, pdf: true }).then((res) => { fun(res.data) @@ -222,6 +228,24 @@ ElMessage.error('文件获取失败') }) } +// 纠正 +const getBizQualityCorrectiveRecordFileItem = (id: string, fun: any) => { + getBizQualityCorrectiveRecordFile({ id, pdf: true }).then((res) => { + fun(res.data) + }).catch(() => { + fun() + ElMessage.error('文件获取失败') + }) +} +// 预防 +const getBizQualityPreventRecordFileItem = (id: string, fun: any) => { + getBizQualityPreventRecordFile({ id, pdf: true }).then((res) => { + fun(res.data) + }).catch(() => { + fun() + ElMessage.error('文件获取失败') + }) +} - + @@ -531,9 +531,9 @@ - + @@ -548,9 +548,9 @@ - + diff --git a/src/views/business/taskMeasure/measureData/components/sixth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/sixth/templateDetail.vue index b10be82..664f3b6 100644 --- a/src/views/business/taskMeasure/measureData/components/sixth/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/sixth/templateDetail.vue @@ -196,9 +196,9 @@ editable: true, } as any) }) - if (pageType.value === 'add') { - list.value = list.value.map((item: any) => ({ ...item, beforeAdjustSecond: item.beforeAdjustFirst || '', beforeAdjustThird: item.beforeAdjustFirst || '' })) - } + // if (pageType.value === 'add') { + // list.value = list.value.map((item: any) => ({ ...item, beforeAdjustSecond: item.beforeAdjustFirst || '', beforeAdjustThird: item.beforeAdjustFirst || '' })) + // } } /** @@ -269,8 +269,13 @@ } // -------------------------------------------处理表格函数--------------------------------------- // el-input-number组件值变化 -const handleInputNumberChange = ({ row }: any) => { - +const handleInputNumberChange = (data: any) => { + console.log(data, 'data') + if (data.cellIndex === 5 && data.column.label === '调整前') { + console.log(data, 'data') + list.value[data.$index].beforeAdjustSecond = data.row.beforeAdjustFirst + list.value[data.$index].beforeAdjustThird = data.row.beforeAdjustFirst + } } // ------------------------------------------钩子---------------------------------------------- diff --git a/src/views/quality/internal/workManage/components/edit.vue b/src/views/quality/internal/workManage/components/edit.vue index e2c9cc1..d19d1de 100644 --- a/src/views/quality/internal/workManage/components/edit.vue +++ b/src/views/quality/internal/workManage/components/edit.vue @@ -1,6 +1,6 @@ @@ -397,10 +397,28 @@ diff --git a/src/views/quality/supervise/record/components/detail.vue b/src/views/quality/supervise/record/components/detail.vue index fdd0114..21bbd07 100644 --- a/src/views/quality/supervise/record/components/detail.vue +++ b/src/views/quality/supervise/record/components/detail.vue @@ -10,6 +10,8 @@ import pdfFileItem from '@/views/quality/supervise/record/components/pdfFileItem.vue' import { getQualityReportFile } from '@/api/quality/supervise/report' import { getQualityNoReportFile } from '@/api/quality/supervise/analysis' +import { getBizQualityCorrectiveRecordFile } from '@/api/quality/correct/index' +import { getBizQualityPreventRecordFile } from '@/api/quality/prevent/index' const $route = useRoute() const $router = useRouter() const ruleForm = ref({ @@ -136,36 +138,39 @@ ruleForm.value.correctiveDTO.correctiveRecords.forEach((item: any) => { console.log(item, 'item') rectification = [...rectification, item.fileRelList] - if (item.fileName) { - correctNameList.value.push(`${item.fileName}`) - } - else { - correctNameList.value.push('') - } - if (item.filePath) { - correctFileList.value.push(`${item.filePath}`) - } - else { - correctFileList.value.push('') - } + correctNameList.value.push(item) + // if (item.fileName) { + // correctNameList.value.push(`${item.fileName}`) + // } + // else { + // correctNameList.value.push('') + // } + // if (item.filePath) { + // correctFileList.value.push(`${item.filePath}`) + // } + // else { + // correctFileList.value.push('') + // } }) // 预防 ruleForm.value.correctiveDTO.preventRecords.forEach((item: any) => { - if (item.fileName) { - preventNameList.value.push(`${item.fileName}`) - } - else { - preventNameList.value.push('') - } - if (item.filePath) { - preventFileList.value.push(`${item.filePath}`) - } - else { - preventFileList.value.push('') - } + preventNameList.value.push(item) + // if (item.fileName) { + // preventNameList.value.push(`${item.fileName}`) + // } + // else { + // preventNameList.value.push('') + // } + // if (item.filePath) { + // preventFileList.value.push(`${item.filePath}`) + // } + // else { + // preventFileList.value.push('') + // } }) // 整改 rectification.forEach((item: any) => { + console.log(rectification, 'rectification') if (item.fileName) { rectificationNameList.value.push(`${item.fileName}`) } @@ -214,6 +219,7 @@ ElMessage.error('文件获取失败') }) } +// 不符合项 const getQualityNoReportFileItem = (id: string, fun: any) => { getQualityNoReportFile({ id, pdf: true }).then((res) => { fun(res.data) @@ -222,6 +228,24 @@ ElMessage.error('文件获取失败') }) } +// 纠正 +const getBizQualityCorrectiveRecordFileItem = (id: string, fun: any) => { + getBizQualityCorrectiveRecordFile({ id, pdf: true }).then((res) => { + fun(res.data) + }).catch(() => { + fun() + ElMessage.error('文件获取失败') + }) +} +// 预防 +const getBizQualityPreventRecordFileItem = (id: string, fun: any) => { + getBizQualityPreventRecordFile({ id, pdf: true }).then((res) => { + fun(res.data) + }).catch(() => { + fun() + ElMessage.error('文件获取失败') + }) +} - + @@ -531,9 +531,9 @@ - + @@ -548,9 +548,9 @@ - + diff --git a/src/views/business/taskMeasure/measureData/components/sixth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/sixth/templateDetail.vue index b10be82..664f3b6 100644 --- a/src/views/business/taskMeasure/measureData/components/sixth/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/sixth/templateDetail.vue @@ -196,9 +196,9 @@ editable: true, } as any) }) - if (pageType.value === 'add') { - list.value = list.value.map((item: any) => ({ ...item, beforeAdjustSecond: item.beforeAdjustFirst || '', beforeAdjustThird: item.beforeAdjustFirst || '' })) - } + // if (pageType.value === 'add') { + // list.value = list.value.map((item: any) => ({ ...item, beforeAdjustSecond: item.beforeAdjustFirst || '', beforeAdjustThird: item.beforeAdjustFirst || '' })) + // } } /** @@ -269,8 +269,13 @@ } // -------------------------------------------处理表格函数--------------------------------------- // el-input-number组件值变化 -const handleInputNumberChange = ({ row }: any) => { - +const handleInputNumberChange = (data: any) => { + console.log(data, 'data') + if (data.cellIndex === 5 && data.column.label === '调整前') { + console.log(data, 'data') + list.value[data.$index].beforeAdjustSecond = data.row.beforeAdjustFirst + list.value[data.$index].beforeAdjustThird = data.row.beforeAdjustFirst + } } // ------------------------------------------钩子---------------------------------------------- diff --git a/src/views/quality/internal/workManage/components/edit.vue b/src/views/quality/internal/workManage/components/edit.vue index e2c9cc1..d19d1de 100644 --- a/src/views/quality/internal/workManage/components/edit.vue +++ b/src/views/quality/internal/workManage/components/edit.vue @@ -1,6 +1,6 @@ @@ -397,10 +397,28 @@ diff --git a/src/views/quality/supervise/record/components/detail.vue b/src/views/quality/supervise/record/components/detail.vue index fdd0114..21bbd07 100644 --- a/src/views/quality/supervise/record/components/detail.vue +++ b/src/views/quality/supervise/record/components/detail.vue @@ -10,6 +10,8 @@ import pdfFileItem from '@/views/quality/supervise/record/components/pdfFileItem.vue' import { getQualityReportFile } from '@/api/quality/supervise/report' import { getQualityNoReportFile } from '@/api/quality/supervise/analysis' +import { getBizQualityCorrectiveRecordFile } from '@/api/quality/correct/index' +import { getBizQualityPreventRecordFile } from '@/api/quality/prevent/index' const $route = useRoute() const $router = useRouter() const ruleForm = ref({ @@ -136,36 +138,39 @@ ruleForm.value.correctiveDTO.correctiveRecords.forEach((item: any) => { console.log(item, 'item') rectification = [...rectification, item.fileRelList] - if (item.fileName) { - correctNameList.value.push(`${item.fileName}`) - } - else { - correctNameList.value.push('') - } - if (item.filePath) { - correctFileList.value.push(`${item.filePath}`) - } - else { - correctFileList.value.push('') - } + correctNameList.value.push(item) + // if (item.fileName) { + // correctNameList.value.push(`${item.fileName}`) + // } + // else { + // correctNameList.value.push('') + // } + // if (item.filePath) { + // correctFileList.value.push(`${item.filePath}`) + // } + // else { + // correctFileList.value.push('') + // } }) // 预防 ruleForm.value.correctiveDTO.preventRecords.forEach((item: any) => { - if (item.fileName) { - preventNameList.value.push(`${item.fileName}`) - } - else { - preventNameList.value.push('') - } - if (item.filePath) { - preventFileList.value.push(`${item.filePath}`) - } - else { - preventFileList.value.push('') - } + preventNameList.value.push(item) + // if (item.fileName) { + // preventNameList.value.push(`${item.fileName}`) + // } + // else { + // preventNameList.value.push('') + // } + // if (item.filePath) { + // preventFileList.value.push(`${item.filePath}`) + // } + // else { + // preventFileList.value.push('') + // } }) // 整改 rectification.forEach((item: any) => { + console.log(rectification, 'rectification') if (item.fileName) { rectificationNameList.value.push(`${item.fileName}`) } @@ -214,6 +219,7 @@ ElMessage.error('文件获取失败') }) } +// 不符合项 const getQualityNoReportFileItem = (id: string, fun: any) => { getQualityNoReportFile({ id, pdf: true }).then((res) => { fun(res.data) @@ -222,6 +228,24 @@ ElMessage.error('文件获取失败') }) } +// 纠正 +const getBizQualityCorrectiveRecordFileItem = (id: string, fun: any) => { + getBizQualityCorrectiveRecordFile({ id, pdf: true }).then((res) => { + fun(res.data) + }).catch(() => { + fun() + ElMessage.error('文件获取失败') + }) +} +// 预防 +const getBizQualityPreventRecordFileItem = (id: string, fun: any) => { + getBizQualityPreventRecordFile({ id, pdf: true }).then((res) => { + fun(res.data) + }).catch(() => { + fun() + ElMessage.error('文件获取失败') + }) +} @@ -352,10 +381,22 @@ diff --git a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue index b6df51b..607e8c9 100644 --- a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue @@ -42,9 +42,9 @@ appearanceFunctionCheck: 0, // 外观 voltageRegulation: 0, // 电源电压调整率 loadRegulation: 0, // 负载调整率 - voltageRepresentError: 0, // 电压表示值误差 - currentRepresentErrorDirect: 0, // 电流表示值误差(直接测量) - currentRepresentErrorIndirect: 0, // 电流表示值误差(间接测量) + voltageRepresentError: 0, // 电压示值误差 + currentRepresentErrorDirect: 0, // 电流示值误差(直接测量) + currentRepresentErrorIndirect: 0, // 电流示值误差(间接测量) rippleVoltage: 0, // 纹波电压 voltageOutputStability: 0, // 输出电压短期稳定性 remark: '无', // 情况说明 @@ -70,9 +70,9 @@ // ---------------------------------------检定项数据表格---------------------------------------------------- const lineVoltageRegulationList = ref([]) // 电源电压调整率 const loadRegulationList = ref([]) // 负载调整率 -const voltageRepresentationValueErrorList = ref([]) // 电压表示值误差 -const ammeterDirectList = ref([]) // 电流表示值误差（直接测量） -const ammeterIndirectList = ref([]) // 电流表示值误差（间接测量） +const voltageRepresentationValueErrorList = ref([]) // 电压示值误差 +const ammeterDirectList = ref([]) // 电流示值误差（直接测量） +const ammeterIndirectList = ref([]) // 电流示值误差（间接测量） const rippleVoltageList = ref([]) // 纹波电压 const outputVoltageStabilityList = ref([]) // 输出电压短期稳定性 const listDict = ref<{ [key: string]: IDetailMeasureList[] }>({}) @@ -80,9 +80,9 @@ listDict.value = { '1-电源电压调整率': lineVoltageRegulationList.value, // 1 '2-负载调整率': loadRegulationList.value, // 2 - '3-电压表示值误差': voltageRepresentationValueErrorList.value, // 3 - '4-电流表示值误差(直接测量)': ammeterDirectList.value, // 4 - '5-电流表示值误差(间接测量)': ammeterIndirectList.value, // 5 + '3-电压示值误差': voltageRepresentationValueErrorList.value, // 3 + '4-电流示值误差(直接测量)': ammeterDirectList.value, // 4 + '5-电流示值误差(间接测量)': ammeterIndirectList.value, // 5 '6-纹波电压': rippleVoltageList.value, // 6 '7-输出电压短期稳定性': outputVoltageStabilityList.value, // 7 } @@ -107,7 +107,7 @@ { text: '被检电源技术指标', value: 'technicalIndex', align: 'center', required: false, type: 'text' }, { text: '负载调整率', value: 'loadRegulation', align: 'center', required: false, type: 'text' }, ]) -// 电压表示值误差 +// 电压示值误差 const columns_voltage_representation_value_error = ref([ { text: '检定项目', value: 'params', align: 'center', required: false, type: 'text' }, { text: '输出通道', value: 'outputChannel', align: 'center', required: false, type: 'text' }, @@ -117,7 +117,7 @@ { text: '最大允许误差', value: 'maximumError', align: 'center', required: false, type: 'text' }, { text: '绝对误差', value: 'absoluteError', align: 'center', required: false, type: 'text' }, ]) -// 电流表示值误差（间接测量） +// 电流示值误差（间接测量） const columns_ammeter_indirect = ref([ { text: '检定项目', value: 'params', align: 'center', required: false, type: 'text' }, { text: '输出通道', value: 'outputChannel', align: 'center', required: false, type: 'text' }, @@ -150,9 +150,9 @@ const columnsDict = ref<{ [key: string]: any[] | TableColumn[] }>({ '1-电源电压调整率': columns_line_voltage_regulation.value, // 1 '2-负载调整率': columns_load_regulation.value, // 2 - '3-电压表示值误差': columns_voltage_representation_value_error.value, // 3 - '4-电流表示值误差(直接测量)': columns_voltage_representation_value_error.value, // 4 - '5-电流表示值误差(间接测量)': columns_ammeter_indirect.value, // 5 + '3-电压示值误差': columns_voltage_representation_value_error.value, // 3 + '4-电流示值误差(直接测量)': columns_voltage_representation_value_error.value, // 4 + '5-电流示值误差(间接测量)': columns_ammeter_indirect.value, // 5 '6-纹波电压': columns_ripple_voltage.value, // 6 '7-输出电压短期稳定性': columns_output_voltage_stability.value, // 7 }) @@ -264,16 +264,16 @@ loadRegulationList.value.push({ ...item, params: '负载调整率' }) break case '3': - // 电压表示值误差 - voltageRepresentationValueErrorList.value.push({ ...item, params: '电压表示值误差', maximumError: !item.maximumError.includes('.') ? calcMaxError(item) : Number(item.maximumError) || 0 }) + // 电压示值误差 + voltageRepresentationValueErrorList.value.push({ ...item, params: '电压示值误差', maximumError: !item.maximumError.includes('.') ? calcMaxError(item) : Number(item.maximumError) || 0 }) break case '4': - // 电流表示值误差(直接测量) - ammeterDirectList.value.push({ ...item, params: '电流表示值误差(直接测量)', maximumError: !item.maximumError.includes('.') ? calcMaxError(item) : Number(item.maximumError) || 0 }) + // 电流示值误差(直接测量) + ammeterDirectList.value.push({ ...item, params: '电流示值误差(直接测量)', maximumError: !item.maximumError.includes('.') ? calcMaxError(item) : Number(item.maximumError) || 0 }) break case '5': - // 电流表示值误差(间接测量) - ammeterIndirectList.value.push({ ...item, params: '电流表示值误差(间接测量)', maximumError: !item.maximumError.includes('.') ? calcMaxError(item) : Number(item.maximumError) || 0 }) + // 电流示值误差(间接测量) + ammeterIndirectList.value.push({ ...item, params: '电流示值误差(间接测量)', maximumError: !item.maximumError.includes('.') ? calcMaxError(item) : Number(item.maximumError) || 0 }) break case '6': // 纹波电压 @@ -310,9 +310,9 @@ itemFormData.value.appearanceFunctionCheck = res.data.appearanceFunctionCheck // 外观及功能检查 itemFormData.value.voltageRegulation = res.data.voltageRegulation // 电源电压调整率 itemFormData.value.loadRegulation = res.data.loadRegulation // 负载调整率 - itemFormData.value.voltageRepresentError = res.data.voltageRepresentError // 电压表示值误差 - itemFormData.value.currentRepresentErrorDirect = res.data.currentRepresentErrorDirect // 电流表示值误差(直接测量) - itemFormData.value.currentRepresentErrorIndirect = res.data.currentRepresentErrorIndirect // 电流表示值误差(间接测量) + itemFormData.value.voltageRepresentError = res.data.voltageRepresentError // 电压示值误差 + itemFormData.value.currentRepresentErrorDirect = res.data.currentRepresentErrorDirect // 电流示值误差(直接测量) + itemFormData.value.currentRepresentErrorIndirect = res.data.currentRepresentErrorIndirect // 电流示值误差(间接测量) itemFormData.value.rippleVoltage = res.data.rippleVoltage // 纹波电压 itemFormData.value.voltageOutputStability = res.data.voltageOutputStability // 输出电压短期稳定性 initInputData(res.data.measureItemDataDcPowerList.map((item: IDetailMeasureList) => ({ ...item, id: '' }))) @@ -377,17 +377,17 @@ loadRegulationList.value = result || loadRegulationList.value setListDict() break - case '电压表示值误差': + case '电压示值误差': result = await caclItem(listDict.value[`${index}-${title}`], columnsDict.value[`${index}-${title}`], title) as IDetailMeasureList[] voltageRepresentationValueErrorList.value = result || voltageRepresentationValueErrorList.value setListDict() break - case '电流表示值误差(直接测量)': + case '电流示值误差(直接测量)': result = await caclItem(listDict.value[`${index}-${title}`], columnsDict.value[`${index}-${title}`], title) as IDetailMeasureList[] ammeterDirectList.value = result || ammeterDirectList.value setListDict() break - case '电流表示值误差(间接测量)': + case '电流示值误差(间接测量)': result = await caclItem(listDict.value[`${index}-${title}`], columnsDict.value[`${index}-${title}`], title) as IDetailMeasureList[] ammeterIndirectList.value = result || ammeterIndirectList.value setListDict() @@ -513,9 +513,9 @@ - + @@ -531,9 +531,9 @@ - + @@ -548,9 +548,9 @@ - + diff --git a/src/views/business/taskMeasure/measureData/components/sixth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/sixth/templateDetail.vue index b10be82..664f3b6 100644 --- a/src/views/business/taskMeasure/measureData/components/sixth/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/sixth/templateDetail.vue @@ -196,9 +196,9 @@ editable: true, } as any) }) - if (pageType.value === 'add') { - list.value = list.value.map((item: any) => ({ ...item, beforeAdjustSecond: item.beforeAdjustFirst || '', beforeAdjustThird: item.beforeAdjustFirst || '' })) - } + // if (pageType.value === 'add') { + // list.value = list.value.map((item: any) => ({ ...item, beforeAdjustSecond: item.beforeAdjustFirst || '', beforeAdjustThird: item.beforeAdjustFirst || '' })) + // } } /** @@ -269,8 +269,13 @@ } // -------------------------------------------处理表格函数--------------------------------------- // el-input-number组件值变化 -const handleInputNumberChange = ({ row }: any) => { - +const handleInputNumberChange = (data: any) => { + console.log(data, 'data') + if (data.cellIndex === 5 && data.column.label === '调整前') { + console.log(data, 'data') + list.value[data.$index].beforeAdjustSecond = data.row.beforeAdjustFirst + list.value[data.$index].beforeAdjustThird = data.row.beforeAdjustFirst + } } // ------------------------------------------钩子---------------------------------------------- diff --git a/src/views/quality/internal/workManage/components/edit.vue b/src/views/quality/internal/workManage/components/edit.vue index e2c9cc1..d19d1de 100644 --- a/src/views/quality/internal/workManage/components/edit.vue +++ b/src/views/quality/internal/workManage/components/edit.vue @@ -1,6 +1,6 @@ @@ -397,10 +397,28 @@ diff --git a/src/views/quality/supervise/record/components/detail.vue b/src/views/quality/supervise/record/components/detail.vue index fdd0114..21bbd07 100644 --- a/src/views/quality/supervise/record/components/detail.vue +++ b/src/views/quality/supervise/record/components/detail.vue @@ -10,6 +10,8 @@ import pdfFileItem from '@/views/quality/supervise/record/components/pdfFileItem.vue' import { getQualityReportFile } from '@/api/quality/supervise/report' import { getQualityNoReportFile } from '@/api/quality/supervise/analysis' +import { getBizQualityCorrectiveRecordFile } from '@/api/quality/correct/index' +import { getBizQualityPreventRecordFile } from '@/api/quality/prevent/index' const $route = useRoute() const $router = useRouter() const ruleForm = ref({ @@ -136,36 +138,39 @@ ruleForm.value.correctiveDTO.correctiveRecords.forEach((item: any) => { console.log(item, 'item') rectification = [...rectification, item.fileRelList] - if (item.fileName) { - correctNameList.value.push(`${item.fileName}`) - } - else { - correctNameList.value.push('') - } - if (item.filePath) { - correctFileList.value.push(`${item.filePath}`) - } - else { - correctFileList.value.push('') - } + correctNameList.value.push(item) + // if (item.fileName) { + // correctNameList.value.push(`${item.fileName}`) + // } + // else { + // correctNameList.value.push('') + // } + // if (item.filePath) { + // correctFileList.value.push(`${item.filePath}`) + // } + // else { + // correctFileList.value.push('') + // } }) // 预防 ruleForm.value.correctiveDTO.preventRecords.forEach((item: any) => { - if (item.fileName) { - preventNameList.value.push(`${item.fileName}`) - } - else { - preventNameList.value.push('') - } - if (item.filePath) { - preventFileList.value.push(`${item.filePath}`) - } - else { - preventFileList.value.push('') - } + preventNameList.value.push(item) + // if (item.fileName) { + // preventNameList.value.push(`${item.fileName}`) + // } + // else { + // preventNameList.value.push('') + // } + // if (item.filePath) { + // preventFileList.value.push(`${item.filePath}`) + // } + // else { + // preventFileList.value.push('') + // } }) // 整改 rectification.forEach((item: any) => { + console.log(rectification, 'rectification') if (item.fileName) { rectificationNameList.value.push(`${item.fileName}`) } @@ -214,6 +219,7 @@ ElMessage.error('文件获取失败') }) } +// 不符合项 const getQualityNoReportFileItem = (id: string, fun: any) => { getQualityNoReportFile({ id, pdf: true }).then((res) => { fun(res.data) @@ -222,6 +228,24 @@ ElMessage.error('文件获取失败') }) } +// 纠正 +const getBizQualityCorrectiveRecordFileItem = (id: string, fun: any) => { + getBizQualityCorrectiveRecordFile({ id, pdf: true }).then((res) => { + fun(res.data) + }).catch(() => { + fun() + ElMessage.error('文件获取失败') + }) +} +// 预防 +const getBizQualityPreventRecordFileItem = (id: string, fun: any) => { + getBizQualityPreventRecordFile({ id, pdf: true }).then((res) => { + fun(res.data) + }).catch(() => { + fun() + ElMessage.error('文件获取失败') + }) +} @@ -352,10 +381,22 @@ diff --git a/src/views/quality/supervise/report/components/detail.vue b/src/views/quality/supervise/report/components/detail.vue index c7bcfda..d86deb3 100644 --- a/src/views/quality/supervise/report/components/detail.vue +++ b/src/views/quality/supervise/report/components/detail.vue @@ -8,6 +8,8 @@ import { getFiles } from '@/utils/download' import pdfFileItem from '@/views/quality/supervise/record/components/pdfFileItem.vue' import { getQualityNoReportFile } from '@/api/quality/supervise/analysis' +import { getBizQualityCorrectiveRecordFile } from '@/api/quality/correct/index' +import { getBizQualityPreventRecordFile } from '@/api/quality/prevent/index' const $router = useRouter() const $route = useRoute() // 不符合要求情况分析报告 @@ -93,33 +95,35 @@ ruleForm.value.correctiveRecords.forEach((item: any) => { console.log(item, 'item') rectification = [...rectification, item.fileRelList] - if (item.fileName) { - correctNameList.value.push(`${item.fileName}`) - } - else { - correctNameList.value.push('') - } - if (item.filePath) { - correctFileList.value.push(item.filePath) - } - else { - correctFileList.value.push('') - } + correctNameList.value.push(item) + // if (item.fileName) { + // correctNameList.value.push(`${item.fileName}`) + // } + // else { + // correctNameList.value.push('') + // } + // if (item.filePath) { + // correctFileList.value.push(item.filePath) + // } + // else { + // correctFileList.value.push('') + // } }) // 预防 ruleForm.value.preventRecords.forEach((item: any) => { - if (item.fileName) { - preventNameList.value.push(`${item.fileName}`) - } - else { - preventNameList.value.push('') - } - if (item.filePath) { - preventFileList.value.push(item.filePath) - } - else { - preventFileList.value.push('') - } + preventNameList.value.push(item) + // if (item.fileName) { + // preventNameList.value.push(`${item.fileName}`) + // } + // else { + // preventNameList.value.push('') + // } + // if (item.filePath) { + // preventFileList.value.push(item.filePath) + // } + // else { + // preventFileList.value.push('') + // } }) // 整改 rectification.forEach((item: any) => { @@ -184,6 +188,24 @@ ElMessage.error('文件获取失败') }) } +// 纠正 +const getBizQualityCorrectiveRecordFileItem = (id: string, fun: any) => { + getBizQualityCorrectiveRecordFile({ id, pdf: true }).then((res) => { + fun(res.data) + }).catch(() => { + fun() + ElMessage.error('文件获取失败') + }) +} +// 预防 +const getBizQualityPreventRecordFileItem = (id: string, fun: any) => { + getBizQualityPreventRecordFile({ id, pdf: true }).then((res) => { + fun(res.data) + }).catch(() => { + fun() + ElMessage.error('文件获取失败') + }) +}