diff --git a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue index ab8860c..f0306bd 100644 --- a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue @@ -376,15 +376,31 @@ break case '3': // 电压示值误差 - voltageRepresentationValueErrorList.value.push(InterceptDecimal(item, index)) + if (pageType.value === 'add') { + voltageRepresentationValueErrorList.value.push(InterceptDecimal(item, index)) + } + else { + voltageRepresentationValueErrorList.value.push({ ...item, params: '电压示值误差' }) + } break case '4': // 电流示值误差(直接测量) - ammeterDirectList.value.push(InterceptDecimal(item, index)) + if (pageType.value === 'add') { + ammeterDirectList.value.push(InterceptDecimal(item, index)) + } + else { + ammeterDirectList.value.push({ ...item, params: '电流示值误差(直接测量)' }) + } break case '5': // 电流示值误差(间接测量) - ammeterIndirectList.value.push(InterceptDecimal(item, index)) + if (pageType.value === 'add') { + ammeterIndirectList.value.push(InterceptDecimal(item, index)) + } + else { + ammeterIndirectList.value.push({ ...item, params: '电流示值误差(间接测量)' }) + } + break case '6': // 纹波电压 diff --git a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue index ab8860c..f0306bd 100644 --- a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue @@ -376,15 +376,31 @@ break case '3': // 电压示值误差 - voltageRepresentationValueErrorList.value.push(InterceptDecimal(item, index)) + if (pageType.value === 'add') { + voltageRepresentationValueErrorList.value.push(InterceptDecimal(item, index)) + } + else { + voltageRepresentationValueErrorList.value.push({ ...item, params: '电压示值误差' }) + } break case '4': // 电流示值误差(直接测量) - ammeterDirectList.value.push(InterceptDecimal(item, index)) + if (pageType.value === 'add') { + ammeterDirectList.value.push(InterceptDecimal(item, index)) + } + else { + ammeterDirectList.value.push({ ...item, params: '电流示值误差(直接测量)' }) + } break case '5': // 电流示值误差(间接测量) - ammeterIndirectList.value.push(InterceptDecimal(item, index)) + if (pageType.value === 'add') { + ammeterIndirectList.value.push(InterceptDecimal(item, index)) + } + else { + ammeterIndirectList.value.push({ ...item, params: '电流示值误差(间接测量)' }) + } + break case '6': // 纹波电压 diff --git a/src/views/business/taskMeasure/measureData/components/sixteen/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/sixteen/templateDetail.vue index 1d1153d..8345bcf 100644 --- a/src/views/business/taskMeasure/measureData/components/sixteen/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/sixteen/templateDetail.vue @@ -297,7 +297,15 @@ // 计算单独鉴定项 const caclItem = async (list: IDetailMeasureList[], columns: TableColumn[] | any[], title: string) => { if (!checkList(list, columns, title)) { return } - const res = await calculateFun(list) + // ===================临时修改,后台要求传measureValueUnit: dbm====后面确定是否删除=================== + const sendparams = list.map((item) => { + return { + ...item, + measureValueUnit: 'dbm', + } + }) + // ===================临时修改,后台要求传measureValueUnit: dbm====后面确定是否删除=================== + const res = await calculateFun(sendparams) return res.map(item => ({ ...item, params: title })) } // 点击计算结果 diff --git a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue index ab8860c..f0306bd 100644 --- a/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/second/templateDetail.vue @@ -376,15 +376,31 @@ break case '3': // 电压示值误差 - voltageRepresentationValueErrorList.value.push(InterceptDecimal(item, index)) + if (pageType.value === 'add') { + voltageRepresentationValueErrorList.value.push(InterceptDecimal(item, index)) + } + else { + voltageRepresentationValueErrorList.value.push({ ...item, params: '电压示值误差' }) + } break case '4': // 电流示值误差(直接测量) - ammeterDirectList.value.push(InterceptDecimal(item, index)) + if (pageType.value === 'add') { + ammeterDirectList.value.push(InterceptDecimal(item, index)) + } + else { + ammeterDirectList.value.push({ ...item, params: '电流示值误差(直接测量)' }) + } break case '5': // 电流示值误差(间接测量) - ammeterIndirectList.value.push(InterceptDecimal(item, index)) + if (pageType.value === 'add') { + ammeterIndirectList.value.push(InterceptDecimal(item, index)) + } + else { + ammeterIndirectList.value.push({ ...item, params: '电流示值误差(间接测量)' }) + } + break case '6': // 纹波电压 diff --git a/src/views/business/taskMeasure/measureData/components/sixteen/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/sixteen/templateDetail.vue index 1d1153d..8345bcf 100644 --- a/src/views/business/taskMeasure/measureData/components/sixteen/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/sixteen/templateDetail.vue @@ -297,7 +297,15 @@ // 计算单独鉴定项 const caclItem = async (list: IDetailMeasureList[], columns: TableColumn[] | any[], title: string) => { if (!checkList(list, columns, title)) { return } - const res = await calculateFun(list) + // ===================临时修改,后台要求传measureValueUnit: dbm====后面确定是否删除=================== + const sendparams = list.map((item) => { + return { + ...item, + measureValueUnit: 'dbm', + } + }) + // ===================临时修改,后台要求传measureValueUnit: dbm====后面确定是否删除=================== + const res = await calculateFun(sendparams) return res.map(item => ({ ...item, params: title })) } // 点击计算结果 diff --git a/src/views/business/taskMeasure/measureData/detail.vue b/src/views/business/taskMeasure/measureData/detail.vue index 4ecf992..abd2cde 100644 --- a/src/views/business/taskMeasure/measureData/detail.vue +++ b/src/views/business/taskMeasure/measureData/detail.vue @@ -509,7 +509,9 @@ else if (belongStandardEquipment.value === '16') { // 第16套 低频信号源 params = { ...templateDetailRef.value.itemFormData, - measureDataLowFrequencySignalList: templateDetailRef.value.getList().map((item: any) => ({ ...item, id: pageType.value === 'add' ? '' : item.id })), + // measureDataLowFrequencySignalList: templateDetailRef.value.getList().map((item: any) => ({ ...item, id: pageType.value === 'add' ? '' : item.id })), + // ===================临时修改,后台要求传measureValueUnit: dbm====后面确定是否删除=================== + measureDataLowFrequencySignalList: templateDetailRef.value.getList().map((item: any) => ({ ...item, id: pageType.value === 'add' ? '' : item.id, measureValueUnit: 'dbm' })), id: pageType.value === 'edit' ? infoId.value : '', equipmentDTOs: templateDetailRef.value.templateFormAndTableRef.measureEquipmentList.map((item: { id: string; standardId: string; standardName: string }) => { return {