diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue index edaaa5b..81cff01 100644 --- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue +++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue @@ -329,7 +329,6 @@ form.value.itemCategoryId = $route.query.itemCategoryId as string// 设备检定项分类名称id form.value.belongStandardEquipment = $route.query.belongStandardEquipment as string || ''// 标准装置code form.value.belongStandardEquipmentName = $route.query.belongStandardEquipmentName as string || ''// 标准装置名称 - console.log('=======', form.value.measureAddress) } }) }) @@ -463,7 +462,7 @@ :disabled="pageType === 'detail'" class="full-width-input" > - + diff --git a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue index edaaa5b..81cff01 100644 --- a/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue +++ b/src/views/business/taskMeasure/measureData/components/templateFormAndTable.vue @@ -329,7 +329,6 @@ form.value.itemCategoryId = $route.query.itemCategoryId as string// 设备检定项分类名称id form.value.belongStandardEquipment = $route.query.belongStandardEquipment as string || ''// 标准装置code form.value.belongStandardEquipmentName = $route.query.belongStandardEquipmentName as string || ''// 标准装置名称 - console.log('=======', form.value.measureAddress) } }) }) @@ -463,7 +462,7 @@ :disabled="pageType === 'detail'" class="full-width-input" > - + diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue index 9cf1157..3a8adea 100644 --- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateDetail.vue @@ -18,6 +18,7 @@ import { getInfo as getItemInfo } from '@/api/business/measure/item' import { useCheckList } from '@/commonMethods/useCheckList' import { calc } from '@/utils/useCalc' +import { useMergeTableRow } from '@/commonMethods/useMergeTableRow' const props = defineProps({ infoId: String, // id @@ -259,30 +260,30 @@ ]) const columns_risetime_simulate = ref([ // 上升时间(模拟示波器) - { text: '检定项目', value: 'params', align: 'center', required: true }, + { text: '检定项目', value: 'params', align: 'center', required: true, width: '90' }, { text: '通道', value: 'thoroughfare', align: 'center', required: true }, { text: '阻抗', value: 'impedanceDefineFront', align: 'center', required: true }, { text: '垂直刻度档位', value: 'verticalScaleGearDefineFront', align: 'center', required: true }, { text: '水平刻度档位', value: 'horizontalScaleGearDefineFront', align: 'center', required: true }, - { text: '标称值', value: 'nominalValueDefineFront', align: 'center', required: true }, - { text: '上升时间', value: 'riseTime', align: 'center', required: true }, + { text: '幅度', value: 'nominalValue', align: 'center', required: true, width: '220' }, + { text: '上升时间', value: 'riseTime', align: 'center', required: true, width: '220' }, { text: '修正上升时间', value: 'correctRiseTime', align: 'center', required: false }, { text: '技术指标', value: 'technicalIndexDefineFront', align: 'center', required: true }, { text: '结论', value: 'conclusion', align: 'center', required: false }, ]) const columns_calibrating_signal_simulate = ref([ // 校准信号(模拟示波器) - { text: '检定项目', value: 'params', align: 'center', required: true }, - { text: '信号类型', value: 'nominalValue', align: 'center', required: true }, - { text: '阻抗', value: 'nominalValue', align: 'center', required: true }, - { text: '阻抗单位', value: 'nominalValue', align: 'center', required: true }, - { text: '幅度标称值', value: 'nominalValue', align: 'center', required: true }, - { text: '幅度测量值', value: 'nominalValue', align: 'center', required: true }, - { text: '幅度偏差', value: 'nominalValue', align: 'center', required: true }, - { text: '频率标称值', value: 'nominalValue', align: 'center', required: true }, - { text: '频率测量值', value: 'nominalValue', align: 'center', required: true }, - { text: '频率偏差', value: 'nominalValue', align: 'center', required: true }, - { text: '技术指标', value: 'nominalValue', align: 'center', required: true }, + { text: '检定项目', value: 'params', align: 'center', required: true, width: '90' }, + { text: '信号类型', value: 'signalType', align: 'center', required: true }, + { text: '阻抗', value: 'impedanceDefineFront', align: 'center', required: true }, + { text: '幅度标称值', value: 'nominalAmplitudeValueDefineFront', align: 'center', required: true }, + { text: '幅度测量值', value: 'measureAmplitudeValue', align: 'center', required: true, width: '220' }, + { text: '幅度偏差', value: 'amplitudeDeviation', align: 'center', required: false }, + { text: '频率标称值', value: 'nominalFrequencyValueDefineFront', align: 'center', required: true }, + { text: '频率测量值', value: 'measureFrequencyValue', align: 'center', required: true, width: '220' }, + { text: '频率偏差', value: 'frequencyDeviation', align: 'center', required: false }, + { text: '技术指标', value: 'technicalIndexDefineFront', align: 'center', required: true }, + { text: '结论', value: 'conclusion', align: 'center', required: false }, ]) // -------------------------------------------获取详情信息-------------------------------------------------- // 获取页面详情信息 @@ -308,13 +309,225 @@ // =======================================表单公共组件数据处理======================================================= useSolveFormData(res, templateFormAndTableRef.value) // ==================================检定数据======================================================================== + const data = res.data.measureDataOscilloscopeList + if (itemFormData.value.itemCategoryName === '数字示波器') { + // 时基 + timeBaseList.value = data.filter((item: any) => `${item.dataType}` === '1') + timeBaseList.value = timeBaseList.value.map((item: any) => { + return { + ...item, + params: '时基', + cycleSignalDefineFront: item.cycleSignal + item.cycleSignalUnit, // 周期时标信号 + technicalIndexDefineFront: item.technicalIndexSymbol + item.technicalIndex + item.technicalIndexUnit, // 技术指标 + } + }) + // 直流增益 + zeroFrequencyGainList.value = data.filter((item: any) => `${item.dataType}` === '2') + zeroFrequencyGainList.value = zeroFrequencyGainList.value.map((item: any) => { + return { + ...item, + params: '直流增益', + impedanceDefineFront: item.impedance + item.impedanceUnit, // 阻抗 + verticalDeflectCoefficientDefineFront: item.verticalDeflectCoefficient + item.verticalDeflectCoefficientUnit, // 垂直偏转系数 + standardValueDefineFront: item.standardValue + item.standardValueUnit, // 标准值 + measureValueUnit: item.standardValueUnit, // 测量值单位 + technicalIndexDefineFront: item.technicalIndexSymbol + item.technicalIndex + item.technicalIndexUnit, // 技术指标 + } + }) + useMergeTableRow(zeroFrequencyGainList.value, ['impedanceDefineFront', 'thoroughfare']) // 合并单元格 - // list.value = res.data.measureDataPistonGaugeList.map((item: IDetailMeasureList) => { - // return { - // ...item, - // editable: pageType.value !== 'detail', - // } - // }) // 检定数据 + // 直流偏置 + DCBiasList.value = data.filter((item: any) => `${item.dataType}` === '3') + DCBiasList.value = DCBiasList.value.map((item: any) => { + return { + ...item, + params: '直流偏置', + impedanceDefineFront: item.impedance + item.impedanceUnit, // 阻抗 + thoroughfare: item.thoroughfare, // 通道 + verticalDeflectCoefficientDefineFront: item.verticalDeflectCoefficient + item.verticalDeflectCoefficientUnit, // 垂直偏转系数 + standardValue: item.standardValue, // 标准值 + measureValueUnit: item.standardValueUnit, // 测量值单位 + technicalIndexDefineFront: item.technicalIndexSymbol + item.technicalIndex + item.technicalIndexUnit, // 技术指标 + } + }) + useMergeTableRow(DCBiasList.value, ['impedanceDefineFront', 'thoroughfare']) // 合并单元格 + + // 频带宽度(数字示波器) + frequencyBandwidthList.value = data.filter((item: any) => `${item.dataType}` === '4') + frequencyBandwidthList.value = frequencyBandwidthList.value.map((item: any) => { + return { + ...item, + params: '频带宽度', + impedanceDefineFront: item.impedance + item.impedanceUnit, // 阻抗 + thoroughfare: item.thoroughfare, // 通道 + verticalDeflectCoefficientDefineFront: item.verticalDeflectCoefficient + item.verticalDeflectCoefficientUnit, // 垂直偏转系数 + bandWidthDefineFront: item.bandWidth + item.bandWidthUnit, // 频带宽度 + technicalIndexDefineFront: item.technicalIndexSymbol + item.technicalIndex + item.technicalIndexUnit, // 技术指标 + } + }) + useMergeTableRow(frequencyBandwidthList.value, ['impedanceDefineFront', 'thoroughfare']) // 合并单元格 + + // 触发灵敏度 + triggerSensitivityList.value = data.filter((item: any) => `${item.dataType}` === '5') + triggerSensitivityList.value = triggerSensitivityList.value.map((item: any) => { + return { + ...item, + params: '触发灵敏度', + thoroughfare: item.thoroughfare, // 通道 + triggerType: item.triggerType, // 触发类型 + signalFrequencyDefineFront: item.signalFrequency + item.signalFrequencyUnit, // 信号频率 + nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值 + measureValueUnit: item.nominalValueUnit, // 测量值单位 + } + }) + useMergeTableRow(triggerSensitivityList.value, ['thoroughfare']) // 合并单元格 + + // 上升时间 + risetimeList.value = data.filter((item: any) => `${item.dataType}` === '6') + risetimeList.value = risetimeList.value.map((item: any) => { + return { + ...item, + params: '上升时间', + thoroughfare: item.thoroughfare, // 通道 + impedanceDefineFront: item.impedance + item.impedanceUnit, // 阻抗 + verticalDeflectCoefficientDefineFront: item.verticalDeflectCoefficient + item.verticalDeflectCoefficientUnit, // 垂直偏转系数 + technicalIndexDefineFront: item.technicalIndexSymbol + item.technicalIndex + item.technicalIndexUnit, // 技术指标 + } + }) + useMergeTableRow(risetimeList.value, ['impedanceDefineFront', 'thoroughfare']) // 合并单元格 + + // 输入电阻 + inputResistanceList.value = data.filter((item: any) => `${item.dataType}` === '7') + inputResistanceList.value = inputResistanceList.value.map((item: any) => { + return { + ...item, + params: '输入电阻', + thoroughfare: item.thoroughfare, // 通道 + nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值 + verticalDeflectCoefficientDefineFront: item.verticalDeflectCoefficient + item.verticalDeflectCoefficientUnit, // 垂直偏转系数 + measureValueUnit: item.nominalValueUnit, // 测量值单位 + technicalIndexDefineFront: item.technicalIndexSymbol + item.technicalIndex + item.technicalIndexUnit, // 技术指标 + } + }) + useMergeTableRow(inputResistanceList.value, ['thoroughfare', 'nominalValueDefineFront']) // 合并单元格 + + // 校准信号 + calibratingSignalList.value = data.filter((item: any) => `${item.dataType}` === '8') + calibratingSignalList.value = calibratingSignalList.value.map((item: any) => { + return { + ...item, + params: '校准信号', + itemType: item.itemType, // 项目 + nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值 + topMeasureValue: item.itemType === '频率' ? '-' : '', // 顶部测量值 + bottomMeasureValue: item.itemType === '频率' ? '-' : '', // 底部测量值 + } + }) + } + else if (itemFormData.value.itemCategoryName === '模拟示波器') { + // 扫描时间系数及扩展 + scanningTimeList.value = data.filter((item: any) => `${item.dataType}` === '1') + scanningTimeList.value = scanningTimeList.value.map((item: any) => { + return { + ...item, + params: '扫描时间系数及扩展', + scanType: item.scanType, // 扫描方式 + impedanceDefineFront: item.impedance + item.impedanceUnit, // 阻抗 + horizontalScaleGearDefineFront: item.horizontalScaleGear + item.horizontalScaleGearUnit, // 阻抗 + nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值 + technicalIndexDefineFront: item.technicalIndexSymbol + item.technicalIndex + item.technicalIndexUnit, // 技术指标 + } + }) + useMergeTableRow(scanningTimeList.value, ['scanType', 'impedanceDefineFront']) // 合并单元格 + + // 垂直幅度 + verticalSizeList.value = data.filter((item: any) => `${item.dataType}` === '2') + verticalSizeList.value = verticalSizeList.value.map((item: any) => { + return { + ...item, + params: '垂直幅度', + thoroughfare: item.thoroughfare, // 通道 + impedanceDefineFront: item.impedance + item.impedanceUnit, // 阻抗 + verticalScaleGearDefineFront: item.verticalScaleGear + item.verticalScaleGearUnit, // 垂直刻度档位 + nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值 + technicalIndexDefineFront: item.technicalIndexSymbol + item.technicalIndex + item.technicalIndexUnit, // 技术指标 + } + }) + useMergeTableRow(verticalSizeList.value, ['impedanceDefineFront', 'thoroughfare']) // 合并单元格 + + // 频带宽度 + frequencyBandwidthSimulateList.value = data.filter((item: any) => `${item.dataType}` === '3') + frequencyBandwidthSimulateList.value = frequencyBandwidthSimulateList.value.map((item: any) => { + return { + ...item, + params: '频带宽度', + thoroughfare: item.thoroughfare, // 通道 + impedanceDefineFront: item.impedance + item.impedanceUnit, // 阻抗 + verticalScaleGearDefineFront: item.verticalScaleGear + item.verticalScaleGearUnit, // 垂直刻度档位 + technicalIndexDefineFront: item.technicalIndexSymbol + item.technicalIndex + item.technicalIndexUnit, // 技术指标 + } + }) + useMergeTableRow(frequencyBandwidthSimulateList.value, ['impedanceDefineFront', 'thoroughfare']) // 合并单元格 + + // 触发特性 + triggerCharacteristicList.value = data.filter((item: any) => `${item.dataType}` === '4') + triggerCharacteristicList.value = triggerCharacteristicList.value.map((item: any) => { + return { + ...item, + params: '触发特性', + thoroughfare: item.thoroughfare, // 通道 + impedanceDefineFront: item.impedance + item.impedanceUnit, // 阻抗 + scanType: item.scanType, // 扫描方式 + triggerType: item.triggerType, // 触发类型 + frequencyUpperDefineFront: item.frequencyUpper + item.frequencyUpperUnit, // 频率上限 + technicalIndexDefineFront: item.technicalIndexSymbol + item.technicalIndex + item.technicalIndexUnit, // 技术指标 + } + }) + useMergeTableRow(triggerCharacteristicList.value, ['impedanceDefineFront', 'thoroughfare']) // 合并单元格 + + // 输入电阻（模拟示波器） + inputResistanceSimulateList.value = data.filter((item: any) => `${item.dataType}` === '5') + inputResistanceSimulateList.value = inputResistanceSimulateList.value.map((item: any) => { + return { + ...item, + params: '输入电阻', + thoroughfare: item.thoroughfare, // 通道 + impedanceDefineFront: item.impedance + item.impedanceUnit, // 阻抗 + technicalIndexDefineFront: item.technicalIndexSymbol + item.technicalIndex + item.technicalIndexUnit, // 技术指标 + } + }) + useMergeTableRow(inputResistanceSimulateList.value, ['impedanceDefineFront', 'thoroughfare']) // 合并单元格 + + // 上升时间（模拟示波器） + risetimeSimulateList.value = data.filter((item: any) => `${item.dataType}` === '6') + risetimeSimulateList.value = risetimeSimulateList.value.map((item: any) => { + return { + ...item, + params: '上升时间', + thoroughfare: item.thoroughfare, // 通道 + impedanceDefineFront: item.impedance + item.impedanceUnit, // 阻抗 + verticalScaleGearDefineFront: item.verticalScaleGear + item.verticalScaleGearUnit, // 垂直刻度档位 + horizontalScaleGearDefineFront: item.horizontalScaleGear + item.horizontalScaleGearUnit, // 水平刻度档位 + amplitude: item.amplitude, // 幅度 + technicalIndexDefineFront: item.technicalIndexSymbol + item.technicalIndex + item.technicalIndexUnit, // 技术指标 + } + }) + useMergeTableRow(risetimeSimulateList.value, ['impedanceDefineFront', 'thoroughfare']) // 合并单元格 + + // 校准信号（模拟示波器） + calibratingSignalSimulateList.value = data.filter((item: any) => `${item.dataType}` === '7') + calibratingSignalSimulateList.value = calibratingSignalSimulateList.value.map((item: any) => { + return { + ...item, + params: '校准信号', + signalType: item.signalType, // 信号类型 + impedanceDefineFront: item.impedance + item.impedanceUnit, // 阻抗 + nominalAmplitudeValueDefineFront: item.nominalAmplitudeValue + item.nominalAmplitudeValueUnit, // 幅度标称值 + nominalFrequencyValueDefineFront: item.nominalFrequencyValue + item.nominalFrequencyValueUnit, // 频率标称值 + technicalIndexDefineFront: item.technicalIndexSymbol + item.technicalIndex + item.technicalIndexUnit, // 技术指标 + } + }) + } infoId.value = res.data.id emits('giveInfoId', infoId.value) @@ -338,6 +551,7 @@ conclusion: '', // 结论 } }) + // 直流增益 zeroFrequencyGainList.value = data.filter((item: any) => `${item.dataType}` === '2') zeroFrequencyGainList.value = zeroFrequencyGainList.value.map((item: any) => { @@ -354,6 +568,8 @@ conclusion: '', // 结论 } }) + useMergeTableRow(zeroFrequencyGainList.value, ['impedanceDefineFront', 'thoroughfare']) // 合并单元格 + // 直流偏置 DCBiasList.value = data.filter((item: any) => `${item.dataType}` === '3') DCBiasList.value = DCBiasList.value.map((item: any) => { @@ -372,6 +588,7 @@ conclusion: '', // 结论 } }) + useMergeTableRow(DCBiasList.value, ['impedanceDefineFront', 'thoroughfare']) // 合并单元格 // 频带宽度(数字示波器) frequencyBandwidthList.value = data.filter((item: any) => `${item.dataType}` === '4') @@ -392,6 +609,7 @@ conclusion: '', // 结论 } }) + useMergeTableRow(frequencyBandwidthList.value, ['impedanceDefineFront', 'thoroughfare']) // 合并单元格 // 触发灵敏度 triggerSensitivityList.value = data.filter((item: any) => `${item.dataType}` === '5') @@ -408,6 +626,7 @@ conclusion: '', // 结论 } }) + useMergeTableRow(triggerSensitivityList.value, ['impedanceDefineFront', 'thoroughfare']) // 合并单元格 // 上升时间 risetimeList.value = data.filter((item: any) => `${item.dataType}` === '6') @@ -424,6 +643,7 @@ conclusion: '', // 结论 } }) + useMergeTableRow(risetimeList.value, ['impedanceDefineFront', 'thoroughfare']) // 合并单元格 // 输入电阻 inputResistanceList.value = data.filter((item: any) => `${item.dataType}` === '7') @@ -441,6 +661,8 @@ conclusion: '', // 结论 } }) + useMergeTableRow(inputResistanceList.value, ['nominalValueDefineFront', 'thoroughfare']) // 合并单元格 + // 校准信号 calibratingSignalList.value = data.filter((item: any) => `${item.dataType}` === '8') calibratingSignalList.value = calibratingSignalList.value.map((item: any) => { @@ -474,6 +696,7 @@ conclusion: '', // 结论 } }) + useMergeTableRow(scanningTimeList.value, ['scanType', 'impedanceDefineFront']) // 合并单元格 // 垂直幅度 verticalSizeList.value = data.filter((item: any) => `${item.dataType}` === '2') @@ -491,6 +714,7 @@ conclusion: '', // 结论 } }) + useMergeTableRow(verticalSizeList.value, ['impedanceDefineFront', 'thoroughfare']) // 合并单元格 // 频带宽度 frequencyBandwidthSimulateList.value = data.filter((item: any) => `${item.dataType}` === '3') @@ -507,6 +731,7 @@ conclusion: '', // 结论 } }) + useMergeTableRow(frequencyBandwidthSimulateList.value, ['impedanceDefineFront', 'thoroughfare']) // 合并单元格 // 触发特性 triggerCharacteristicList.value = data.filter((item: any) => `${item.dataType}` === '4') @@ -524,6 +749,7 @@ conclusion: '', // 结论 } }) + useMergeTableRow(triggerCharacteristicList.value, ['impedanceDefineFront', 'thoroughfare']) // 合并单元格 // 输入电阻（模拟示波器） inputResistanceSimulateList.value = data.filter((item: any) => `${item.dataType}` === '5') @@ -539,6 +765,7 @@ conclusion: '', // 结论 } }) + useMergeTableRow(inputResistanceSimulateList.value, ['impedanceDefineFront', 'thoroughfare']) // 合并单元格 // 上升时间（模拟示波器） risetimeSimulateList.value = data.filter((item: any) => `${item.dataType}` === '6') @@ -550,7 +777,8 @@ impedanceDefineFront: item.impedance + item.impedanceUnit, // 阻抗 verticalScaleGearDefineFront: item.verticalScaleGear + item.verticalScaleGearUnit, // 垂直刻度档位 horizontalScaleGearDefineFront: item.horizontalScaleGear + item.horizontalScaleGearUnit, // 水平刻度档位 - nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值 + nominalValue: item.amplitude, // 幅度 + nominalValueUnit: item.amplitudeUnit, // 幅度单位 riseTime: '', // 上升时间 correctRiseTime: '', // 修正上升时间 technicalIndexDefineFront: item.technicalIndexSymbol + item.technicalIndex + item.technicalIndexUnit, // 技术指标 @@ -558,6 +786,26 @@ conclusion: '', // 结论 } }) + useMergeTableRow(risetimeSimulateList.value, ['impedanceDefineFront', 'thoroughfare']) // 合并单元格 + + // 校准信号（模拟示波器） + calibratingSignalSimulateList.value = data.filter((item: any) => `${item.dataType}` === '7') + calibratingSignalSimulateList.value = calibratingSignalSimulateList.value.map((item: any) => { + return { + ...item, + params: '校准信号', + signalType: item.signalType, // 信号类型 + impedanceDefineFront: item.impedance + item.impedanceUnit, // 阻抗 + nominalAmplitudeValueDefineFront: item.nominalAmplitudeValue + item.nominalAmplitudeValueUnit, // 幅度标称值 + measureAmplitudeValue: '', // 幅度测量值 + amplitudeDeviation: '', // 幅度偏差 + nominalFrequencyValueDefineFront: item.nominalFrequencyValue + item.nominalFrequencyValueUnit, // 频率标称值 + measureFrequencyValue: '', // 频率测量值 + frequencyDeviation: '', // 频率偏差 + technicalIndexDefineFront: item.technicalIndexSymbol + item.technicalIndex + item.technicalIndexUnit, // 技术指标 + conclusion: '', // 结论 + } + }) } } @@ -574,7 +822,7 @@ belongStandardEquipment, // 检校标准装置字典code } getItemInfo(params).then((res) => { - itemFormData.value.appearance = res.data.appearanceFunctionCheck ? '1' : '' // 外观及功能检查 1有外观，2没有外观 + itemFormData.value.appearance = res.data.appearanceFunctionCheck ? '正常' : '' // 外观及功能检查 1有外观，2没有外观 itemFormData.value.appearanceFunctionCheck = res.data.appearanceFunctionCheck // 外观及功能检查 1有外观，2没有外观 itemFormData.value.timeBase = res.data.timeBase // 时基 itemFormData.value.currentGain = res.data.currentGain // 直流增益 @@ -596,7 +844,7 @@ }) } -// ----------------------------------------点击保存时校验--------------------------------------- +// ----------------------------------------计算--------------------------------------- // 点击计算结果校验 const checkout = (type: string) => { let result = true @@ -652,6 +900,9 @@ case '上升时间': result = useCheckList(risetimeSimulateList.value, columns_risetime_simulate.value, type) break + case '校准信号': + result = useCheckList(calibratingSignalSimulateList.value, columns_calibrating_signal_simulate.value, type) + break default: break } @@ -712,6 +963,9 @@ case '上升时间': list = risetimeSimulateList.value break + case '校准信号': + list = calibratingSignalSimulateList.value + break default: break } @@ -849,7 +1103,7 @@ }) break case '输入电阻': - triggerCharacteristicList.value = triggerCharacteristicList.value.map((item, index) => { + inputResistanceSimulateList.value = inputResistanceSimulateList.value.map((item, index) => { return { ...item, relativeError: list[index].relativeError, // 相对误差 @@ -862,7 +1116,18 @@ risetimeSimulateList.value = risetimeSimulateList.value.map((item, index) => { return { ...item, - correctRiseTime: list[index].correctRiseTime, // 修正上升时间 + correctRiseTime: `${list[index].correctRiseTime}ns`, // 修正上升时间 + conclusion: list[index].conclusion, // 结论 + exceedMark: list[index].exceedMark, + } + }) + break + case '校准信号': + calibratingSignalSimulateList.value = calibratingSignalSimulateList.value.map((item, index) => { + return { + ...item, + amplitudeDeviation: list[index].amplitudeDeviation, // 幅度偏差 + frequencyDeviation: list[index].frequencyDeviation, // 频率偏差 conclusion: list[index].conclusion, // 结论 exceedMark: list[index].exceedMark, } @@ -875,13 +1140,13 @@ return list } -// -----------------------------------------生成结果处理---------------------------------------- // 点击计算结果 const calculate = (type: string) => { if (!checkout(type)) { return false } const list = solveParamsBeforeCalculate(type) + // =============表格loading============================== timeBaseLoading.value = type === '时基' zeroFrequencyGainLoading.value = type === '直流增益' DCBiasLoading.value = type === '直流偏置' @@ -895,6 +1160,9 @@ frequencyBandwidthSimulateLoading.value = type === '频带宽度' && itemFormData.value.itemCategoryName === '模拟示波器' triggerCharacteristicLoading.value = type === '触发特性' inputResistanceSimulateLoading.value = type === '输入电阻' && itemFormData.value.itemCategoryName === '模拟示波器' + risetimeSimulateLoading.value = type === '上升时间' && itemFormData.value.itemCategoryName === '模拟示波器' + calibratingSignalSimulateLoading.value = type === '校准信号' && itemFormData.value.itemCategoryName === '模拟示波器' + // ======================================================= const params = { belongStandardEquipment: itemFormData.value.belongStandardEquipment, // 检校标准装置 itemCategoryName: itemFormData.value.itemCategoryName, // 检定项分类名称 @@ -922,6 +1190,8 @@ frequencyBandwidthSimulateLoading.value = false triggerCharacteristicLoading.value = false inputResistanceSimulateLoading.value = false + risetimeSimulateLoading.value = false + calibratingSignalSimulateLoading.value = false }).catch(() => { timeBaseLoading.value = false zeroFrequencyGainLoading.value = false @@ -936,9 +1206,53 @@ frequencyBandwidthSimulateLoading.value = false triggerCharacteristicLoading.value = false inputResistanceSimulateLoading.value = false + risetimeSimulateLoading.value = false + calibratingSignalSimulateLoading.value = false }) } +// -----------------------------------------保存之前处理数据------------------------------------ +const solveParamsBeforeSave = () => { + let list = [] as any + if (itemFormData.value.itemCategoryName === '数字示波器') { + list = list.concat( + timeBaseList.value, + zeroFrequencyGainList.value, + DCBiasList.value, + frequencyBandwidthList.value, + triggerSensitivityList.value, + risetimeList.value, + inputResistanceList.value, + calibratingSignalList.value, + ) + } + else { + list = list.concat( + scanningTimeList.value, // 扫描时间系数及扩展 + verticalSizeList.value, // 垂直幅度 + frequencyBandwidthSimulateList.value, // 频带宽度(模拟示波器) + triggerCharacteristicList.value, // 触发特性 + inputResistanceSimulateList.value, // 输入电阻(模拟示波器) + risetimeSimulateList.value, // 上升时间(模拟示波器) + calibratingSignalSimulateList.value, // 校准信号(模拟示波器) + ) + } + let result = '' + const index1 = list.findIndex((item: { exceedMark: number }) => item.exceedMark === 1) // 找不符合指标 + const index0 = list.findIndex((item: { exceedMark: number }) => item.exceedMark === 0) // 找符合指标 + if (index1 !== -1 && index0 !== -1) { // 找到不符合指标和符合指标了 + result = '除*外其余所检项目合格' + } + else if (index1 === -1) { // 没找到不符合指标--合格 + result = '所检项目合格' + } + else if (index0 === -1) { // 没找到符合指标--不合格 + result = '不合格' + } + templateFormAndTableRef.value.form.conclusion = result + return list +} + // ------------------------------------------钩子---------------------------------------------- watch(() => props.infoId, (newValue) => { @@ -962,11 +1276,11 @@ itemFormData.value.itemCategoryId = $route.query.itemCategoryId as string// 设备检定项分类名称id itemFormData.value.belongStandardEquipment = $route.query.belongStandardEquipment as string// 标准装置code itemFormData.value.belongStandardEquipmentName = $route.query.belongStandardEquipmentName as string// 标准装置名称 - // fetchInfo() + fetchInfo() } }) -defineExpose({ checkout, itemFormData, templateFormAndTableRef, pageType }) +defineExpose({ checkout, itemFormData, templateFormAndTableRef, pageType, solveParamsBeforeSave })