diff --git a/src/views/business/taskMeasure/measureData/components/fourteen/components/universalCounter.vue b/src/views/business/taskMeasure/measureData/components/fourteen/components/universalCounter.vue index d0612df..d4512ed 100644 --- a/src/views/business/taskMeasure/measureData/components/fourteen/components/universalCounter.vue +++ b/src/views/business/taskMeasure/measureData/components/fourteen/components/universalCounter.vue @@ -354,15 +354,15 @@ }) break case '6': - 11111111 + // 11111111 // 频率测量范围、输入灵敏度 if (props.itemCategoryName === '通用计数器') { frequencyMeasureRangeList.value.push({ ...item, params: '频率测量范围、输入灵敏度', technicalIndex: item.technicalIndex || '/', - inputSensitivity: item.signalSourceOutputAmplitude || '', - inputSensitivityUnit: item.signalSourceOutputAmplitudeUnit || '', + inputSensitivity: pageType.value === 'add' ? item.signalSourceOutputAmplitude || '' : item.inputSensitivity || '', + inputSensitivityUnit: pageType.value === 'add' ? item.signalSourceOutputAmplitudeUnit || '' : item.inputSensitivityUnit || '', effectiveResolution: item.effectiveResolution || '', effectiveResolutionUnit: item.effectiveResolutionUnit || '', }) @@ -372,9 +372,9 @@ ...item, params: '频率测量范围、输入灵敏度及最大输入电平', technicalIndex: item.technicalIndex || '/', - inputSensitivity: item.signalSourceOutputAmplitude + item.signalSourceOutputAmplitudeUnit || '', - maxInputLevel: item.signalSourceMaxInputLevel || '', - maxInputLevelUnit: item.signalSourceMaxInputLevelUnit || '', + inputSensitivity: pageType.value === 'add' ? item.signalSourceOutputAmplitude + item.signalSourceOutputAmplitudeUnit || '' : item.inputSensitivity || '', + maxInputLevel: pageType.value === 'add' ? item.signalSourceMaxInputLevel || '' : item.maxInputLevel || '', + maxInputLevelUnit: pageType.value === 'add' ? item.signalSourceMaxInputLevelUnit || '' : item.maxInputLevelUnit || '', }) } diff --git a/src/views/business/taskMeasure/measureData/components/fourteen/components/universalCounter.vue b/src/views/business/taskMeasure/measureData/components/fourteen/components/universalCounter.vue index d0612df..d4512ed 100644 --- a/src/views/business/taskMeasure/measureData/components/fourteen/components/universalCounter.vue +++ b/src/views/business/taskMeasure/measureData/components/fourteen/components/universalCounter.vue @@ -354,15 +354,15 @@ }) break case '6': - 11111111 + // 11111111 // 频率测量范围、输入灵敏度 if (props.itemCategoryName === '通用计数器') { frequencyMeasureRangeList.value.push({ ...item, params: '频率测量范围、输入灵敏度', technicalIndex: item.technicalIndex || '/', - inputSensitivity: item.signalSourceOutputAmplitude || '', - inputSensitivityUnit: item.signalSourceOutputAmplitudeUnit || '', + inputSensitivity: pageType.value === 'add' ? item.signalSourceOutputAmplitude || '' : item.inputSensitivity || '', + inputSensitivityUnit: pageType.value === 'add' ? item.signalSourceOutputAmplitudeUnit || '' : item.inputSensitivityUnit || '', effectiveResolution: item.effectiveResolution || '', effectiveResolutionUnit: item.effectiveResolutionUnit || '', }) @@ -372,9 +372,9 @@ ...item, params: '频率测量范围、输入灵敏度及最大输入电平', technicalIndex: item.technicalIndex || '/', - inputSensitivity: item.signalSourceOutputAmplitude + item.signalSourceOutputAmplitudeUnit || '', - maxInputLevel: item.signalSourceMaxInputLevel || '', - maxInputLevelUnit: item.signalSourceMaxInputLevelUnit || '', + inputSensitivity: pageType.value === 'add' ? item.signalSourceOutputAmplitude + item.signalSourceOutputAmplitudeUnit || '' : item.inputSensitivity || '', + maxInputLevel: pageType.value === 'add' ? item.signalSourceMaxInputLevel || '' : item.maxInputLevel || '', + maxInputLevelUnit: pageType.value === 'add' ? item.signalSourceMaxInputLevelUnit || '' : item.maxInputLevelUnit || '', }) } diff --git a/src/views/business/taskMeasure/measureData/components/ninth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/ninth/templateDetail.vue index abd4e88..aa2ce20 100644 --- a/src/views/business/taskMeasure/measureData/components/ninth/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/ninth/templateDetail.vue @@ -499,6 +499,7 @@ verticalGraduatedList.value.push({ ...item, params: '垂直刻度(显示位置从上到下)', conclusion: item.verticalScale === '起始幅度' ? '起点' : item.conclusion || '/', standardAttenuatorAttenuation: item.standardAttenuatorAttenuation || '', signalSourceAmplitude: item.signalSourceAmplitude || '', upperIndex: item.verticalScale === '起始幅度' ? '起点' : (item.upperIndex || clearSymbol(item.technicalIndex) || '/'), lowerIndex: item.verticalScale === '起始幅度' ? '起点' : (item.lowerIndex || `${item.technicalIndex === '/' ? '' : '-'}${clearSymbol(item.technicalIndex)}` || '/'), oneValue: item.verticalScale === '起始幅度' ? '起点' : (item.oneValue || '/') }) break case '7': + console.log(item, '1111') // 输入频响 inputFrequencyResponseList.value.push({ ...item, params: '输入频响', oneValue: item.oneValue || '', twoValue: item.twoValue || '', threeValue: item.threeValue || '', conclusion: handlerReferencePoint(item) !== 'none' ? '参考点' : item.conclusion || '/', @@ -527,6 +528,7 @@ break case '12': // 校准信号 + console.log(item, 'item') calibratingSignalList.value.push({ ...item, params: '校准信号', oneValue: item.typeValue === '频率' ? '/' : clearSymbol(item.oneValue) || '', twoValue: item.typeValue === '频率' ? '/' : clearSymbol(item.twoValue) || '', threeValue: item.typeValue === '频率' ? '/' : clearSymbol(item.threeValue) || '', measureResult: item.measureResult || '/' }) calibratingSignalList.value = calibratingSignalList.value.map((item: any) => ({ ...item, @@ -679,7 +681,7 @@ break case '校准信号': calibratingSignalList.value = result || calibratingSignalList.value - calibrating_signal_unit.value = [...calibrating_signal_unit.value, '测量结果', '指标下限', '指标上限'] + calibrating_signal_unit.value = [...calibrating_signal_unit.value, '测量结果'] break } setListDict() @@ -943,20 +945,20 @@ -