diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue index fd08303..31c8838 100644 --- a/src/views/business/manager/order/detail.vue +++ b/src/views/business/manager/order/detail.vue @@ -571,7 +571,7 @@ { // 数据处理 - let tempList = [] + let tempList = [] as any timeBaseList.value = timeBaseList.value.map((item) => { return { ...item, @@ -949,7 +949,7 @@ if (form.value.triggerCharacter) { // 触发特性 tempList = tempList.concat(triggerCharacteristicList.value) } - tempList = tempList.map((item) => { + tempList = tempList.map((item: { id: string }) => { return { ...item, id: '', @@ -1029,26 +1029,26 @@ watch(() => props.list, (newVal) => { // 检定项表格 if (newVal && newVal.length) { if (props.itemCategoryName === '数字示波器') { - timeBaseList.value = newVal.filter(item => `${item.dataType}` === '1').map((item) => { item.params = '时基'; return item }) // 时基 - zeroFrequencyGainList.value = newVal.filter(item => `${item.dataType}` === '2').map((item) => { item.params = '直流增益'; return item }) // 直流增益 - DCBiasList.value = newVal.filter(item => `${item.dataType}` === '3').map((item) => { item.params = '直流偏置'; return item }) // 直流偏置 - frequencyBandwidthList.value = newVal.filter(item => `${item.dataType}` === '4').map((item) => { item.params = '频带宽度'; return item }) // 频带宽度(数字示波器) - triggerSensitivityList.value = newVal.filter(item => `${item.dataType}` === '5').map((item) => { item.params = '触发灵敏度'; return item })// 触发灵敏度 - risetimeList.value = newVal.filter(item => `${item.dataType}` === '6').map((item) => { item.params = '上升时间'; return item })// 上升时间(数字示波器) - inputResistanceList.value = newVal.filter(item => `${item.dataType}` === '7').map((item) => { item.params = '输入电阻'; return item })// 输入电阻(数字示波器) - calibratingSignalList.value = newVal.filter(item => `${item.dataType}` === '8').map((item) => { item.params = '校准信号'; return item })// 校准信号(数字示波器) + timeBaseList.value = newVal.filter((item: any) => `${item.dataType}` === '1').map((item: any) => { item.params = '时基'; return item }) // 时基 + zeroFrequencyGainList.value = newVal.filter((item: any) => `${item.dataType}` === '2').map((item: any) => { item.params = '直流增益'; return item }) // 直流增益 + DCBiasList.value = newVal.filter((item: any) => `${item.dataType}` === '3').map((item: any) => { item.params = '直流偏置'; return item }) // 直流偏置 + frequencyBandwidthList.value = newVal.filter((item: any) => `${item.dataType}` === '4').map((item: any) => { item.params = '频带宽度'; return item }) // 频带宽度(数字示波器) + triggerSensitivityList.value = newVal.filter((item: any) => `${item.dataType}` === '5').map((item: any) => { item.params = '触发灵敏度'; return item })// 触发灵敏度 + risetimeList.value = newVal.filter((item: any) => `${item.dataType}` === '6').map((item: any) => { item.params = '上升时间'; return item })// 上升时间(数字示波器) + inputResistanceList.value = newVal.filter((item: any) => `${item.dataType}` === '7').map((item: any) => { item.params = '输入电阻'; return item })// 输入电阻(数字示波器) + calibratingSignalList.value = newVal.filter((item: any) => `${item.dataType}` === '8').map((item: any) => { item.params = '校准信号'; return item })// 校准信号(数字示波器) if (timeBaseList.value.length) { - form.value.methodType = timeBaseList.value[0].methodType // 时基方法 + form.value.methodType = timeBaseList.value[0].methodType! // 时基方法 } } else if (props.itemCategoryName === '模拟示波器') { - scanningTimeList.value = newVal.filter(item => `${item.dataType}` === '1').map((item) => { item.params = '扫描时间系数及扩展'; return item }) // 扫描时间系数及扩展 - verticalSizeList.value = newVal.filter(item => `${item.dataType}` === '2').map((item) => { item.params = '垂直幅度'; return item }) // 垂直幅度 - frequencyBandwidthSimulateList.value = newVal.filter(item => `${item.dataType}` === '3').map((item) => { item.params = '频带宽度'; return item }) // 频带宽度(模拟示波器 - triggerCharacteristicList.value = newVal.filter(item => `${item.dataType}` === '4').map((item) => { item.params = '触发特性'; return item }) // 触发特性 - inputResistanceSimulateList.value = newVal.filter(item => `${item.dataType}` === '5').map((item) => { item.params = '输入电阻'; return item })// 输入电阻 - risetimeSimulateList.value = newVal.filter(item => `${item.dataType}` === '6').map((item) => { item.params = '上升时间'; return item })// 上升时间(数字示波器) - calibratingSignalSimulateList.value = newVal.filter(item => `${item.dataType}` === '7').map((item) => { item.params = '校准信号'; return item })// 校准信号(数字示波器) + scanningTimeList.value = newVal.filter((item: any) => `${item.dataType}` === '1').map((item: any) => { item.params = '扫描时间系数及扩展'; return item }) // 扫描时间系数及扩展 + verticalSizeList.value = newVal.filter((item: any) => `${item.dataType}` === '2').map((item: any) => { item.params = '垂直幅度'; return item }) // 垂直幅度 + frequencyBandwidthSimulateList.value = newVal.filter((item: any) => `${item.dataType}` === '3').map((item: any) => { item.params = '频带宽度'; return item }) // 频带宽度(模拟示波器 + triggerCharacteristicList.value = newVal.filter((item: any) => `${item.dataType}` === '4').map((item: any) => { item.params = '触发特性'; return item }) // 触发特性 + inputResistanceSimulateList.value = newVal.filter((item: any) => `${item.dataType}` === '5').map((item: any) => { item.params = '输入电阻'; return item })// 输入电阻 + risetimeSimulateList.value = newVal.filter((item: any) => `${item.dataType}` === '6').map((item: any) => { item.params = '上升时间'; return item })// 上升时间(数字示波器) + calibratingSignalSimulateList.value = newVal.filter((item: any) => `${item.dataType}` === '7').map((item: any) => { item.params = '校准信号'; return item })// 校准信号(数字示波器) } } }) diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue index fd08303..31c8838 100644 --- a/src/views/business/manager/order/detail.vue +++ b/src/views/business/manager/order/detail.vue @@ -571,7 +571,7 @@ { // 数据处理 - let tempList = [] + let tempList = [] as any timeBaseList.value = timeBaseList.value.map((item) => { return { ...item, @@ -949,7 +949,7 @@ if (form.value.triggerCharacter) { // 触发特性 tempList = tempList.concat(triggerCharacteristicList.value) } - tempList = tempList.map((item) => { + tempList = tempList.map((item: { id: string }) => { return { ...item, id: '', @@ -1029,26 +1029,26 @@ watch(() => props.list, (newVal) => { // 检定项表格 if (newVal && newVal.length) { if (props.itemCategoryName === '数字示波器') { - timeBaseList.value = newVal.filter(item => `${item.dataType}` === '1').map((item) => { item.params = '时基'; return item }) // 时基 - zeroFrequencyGainList.value = newVal.filter(item => `${item.dataType}` === '2').map((item) => { item.params = '直流增益'; return item }) // 直流增益 - DCBiasList.value = newVal.filter(item => `${item.dataType}` === '3').map((item) => { item.params = '直流偏置'; return item }) // 直流偏置 - frequencyBandwidthList.value = newVal.filter(item => `${item.dataType}` === '4').map((item) => { item.params = '频带宽度'; return item }) // 频带宽度(数字示波器) - triggerSensitivityList.value = newVal.filter(item => `${item.dataType}` === '5').map((item) => { item.params = '触发灵敏度'; return item })// 触发灵敏度 - risetimeList.value = newVal.filter(item => `${item.dataType}` === '6').map((item) => { item.params = '上升时间'; return item })// 上升时间(数字示波器) - inputResistanceList.value = newVal.filter(item => `${item.dataType}` === '7').map((item) => { item.params = '输入电阻'; return item })// 输入电阻(数字示波器) - calibratingSignalList.value = newVal.filter(item => `${item.dataType}` === '8').map((item) => { item.params = '校准信号'; return item })// 校准信号(数字示波器) + timeBaseList.value = newVal.filter((item: any) => `${item.dataType}` === '1').map((item: any) => { item.params = '时基'; return item }) // 时基 + zeroFrequencyGainList.value = newVal.filter((item: any) => `${item.dataType}` === '2').map((item: any) => { item.params = '直流增益'; return item }) // 直流增益 + DCBiasList.value = newVal.filter((item: any) => `${item.dataType}` === '3').map((item: any) => { item.params = '直流偏置'; return item }) // 直流偏置 + frequencyBandwidthList.value = newVal.filter((item: any) => `${item.dataType}` === '4').map((item: any) => { item.params = '频带宽度'; return item }) // 频带宽度(数字示波器) + triggerSensitivityList.value = newVal.filter((item: any) => `${item.dataType}` === '5').map((item: any) => { item.params = '触发灵敏度'; return item })// 触发灵敏度 + risetimeList.value = newVal.filter((item: any) => `${item.dataType}` === '6').map((item: any) => { item.params = '上升时间'; return item })// 上升时间(数字示波器) + inputResistanceList.value = newVal.filter((item: any) => `${item.dataType}` === '7').map((item: any) => { item.params = '输入电阻'; return item })// 输入电阻(数字示波器) + calibratingSignalList.value = newVal.filter((item: any) => `${item.dataType}` === '8').map((item: any) => { item.params = '校准信号'; return item })// 校准信号(数字示波器) if (timeBaseList.value.length) { - form.value.methodType = timeBaseList.value[0].methodType // 时基方法 + form.value.methodType = timeBaseList.value[0].methodType! // 时基方法 } } else if (props.itemCategoryName === '模拟示波器') { - scanningTimeList.value = newVal.filter(item => `${item.dataType}` === '1').map((item) => { item.params = '扫描时间系数及扩展'; return item }) // 扫描时间系数及扩展 - verticalSizeList.value = newVal.filter(item => `${item.dataType}` === '2').map((item) => { item.params = '垂直幅度'; return item }) // 垂直幅度 - frequencyBandwidthSimulateList.value = newVal.filter(item => `${item.dataType}` === '3').map((item) => { item.params = '频带宽度'; return item }) // 频带宽度(模拟示波器 - triggerCharacteristicList.value = newVal.filter(item => `${item.dataType}` === '4').map((item) => { item.params = '触发特性'; return item }) // 触发特性 - inputResistanceSimulateList.value = newVal.filter(item => `${item.dataType}` === '5').map((item) => { item.params = '输入电阻'; return item })// 输入电阻 - risetimeSimulateList.value = newVal.filter(item => `${item.dataType}` === '6').map((item) => { item.params = '上升时间'; return item })// 上升时间(数字示波器) - calibratingSignalSimulateList.value = newVal.filter(item => `${item.dataType}` === '7').map((item) => { item.params = '校准信号'; return item })// 校准信号(数字示波器) + scanningTimeList.value = newVal.filter((item: any) => `${item.dataType}` === '1').map((item: any) => { item.params = '扫描时间系数及扩展'; return item }) // 扫描时间系数及扩展 + verticalSizeList.value = newVal.filter((item: any) => `${item.dataType}` === '2').map((item: any) => { item.params = '垂直幅度'; return item }) // 垂直幅度 + frequencyBandwidthSimulateList.value = newVal.filter((item: any) => `${item.dataType}` === '3').map((item: any) => { item.params = '频带宽度'; return item }) // 频带宽度(模拟示波器 + triggerCharacteristicList.value = newVal.filter((item: any) => `${item.dataType}` === '4').map((item: any) => { item.params = '触发特性'; return item }) // 触发特性 + inputResistanceSimulateList.value = newVal.filter((item: any) => `${item.dataType}` === '5').map((item: any) => { item.params = '输入电阻'; return item })// 输入电阻 + risetimeSimulateList.value = newVal.filter((item: any) => `${item.dataType}` === '6').map((item: any) => { item.params = '上升时间'; return item })// 上升时间(数字示波器) + calibratingSignalSimulateList.value = newVal.filter((item: any) => `${item.dataType}` === '7').map((item: any) => { item.params = '校准信号'; return item })// 校准信号(数字示波器) } } }) diff --git a/src/views/business/measure/item/components/thirteenth/templateTable.vue b/src/views/business/measure/item/components/thirteenth/templateTable.vue index b645ba7..ca0ce12 100644 --- a/src/views/business/measure/item/components/thirteenth/templateTable.vue +++ b/src/views/business/measure/item/components/thirteenth/templateTable.vue @@ -406,7 +406,7 @@ { // 数据处理 - let tempList = [] + let tempList = [] as any timeBaseList.value = timeBaseList.value.map((item) => { return { ...item, @@ -949,7 +949,7 @@ if (form.value.triggerCharacter) { // 触发特性 tempList = tempList.concat(triggerCharacteristicList.value) } - tempList = tempList.map((item) => { + tempList = tempList.map((item: { id: string }) => { return { ...item, id: '', @@ -1029,26 +1029,26 @@ watch(() => props.list, (newVal) => { // 检定项表格 if (newVal && newVal.length) { if (props.itemCategoryName === '数字示波器') { - timeBaseList.value = newVal.filter(item => `${item.dataType}` === '1').map((item) => { item.params = '时基'; return item }) // 时基 - zeroFrequencyGainList.value = newVal.filter(item => `${item.dataType}` === '2').map((item) => { item.params = '直流增益'; return item }) // 直流增益 - DCBiasList.value = newVal.filter(item => `${item.dataType}` === '3').map((item) => { item.params = '直流偏置'; return item }) // 直流偏置 - frequencyBandwidthList.value = newVal.filter(item => `${item.dataType}` === '4').map((item) => { item.params = '频带宽度'; return item }) // 频带宽度(数字示波器) - triggerSensitivityList.value = newVal.filter(item => `${item.dataType}` === '5').map((item) => { item.params = '触发灵敏度'; return item })// 触发灵敏度 - risetimeList.value = newVal.filter(item => `${item.dataType}` === '6').map((item) => { item.params = '上升时间'; return item })// 上升时间(数字示波器) - inputResistanceList.value = newVal.filter(item => `${item.dataType}` === '7').map((item) => { item.params = '输入电阻'; return item })// 输入电阻(数字示波器) - calibratingSignalList.value = newVal.filter(item => `${item.dataType}` === '8').map((item) => { item.params = '校准信号'; return item })// 校准信号(数字示波器) + timeBaseList.value = newVal.filter((item: any) => `${item.dataType}` === '1').map((item: any) => { item.params = '时基'; return item }) // 时基 + zeroFrequencyGainList.value = newVal.filter((item: any) => `${item.dataType}` === '2').map((item: any) => { item.params = '直流增益'; return item }) // 直流增益 + DCBiasList.value = newVal.filter((item: any) => `${item.dataType}` === '3').map((item: any) => { item.params = '直流偏置'; return item }) // 直流偏置 + frequencyBandwidthList.value = newVal.filter((item: any) => `${item.dataType}` === '4').map((item: any) => { item.params = '频带宽度'; return item }) // 频带宽度(数字示波器) + triggerSensitivityList.value = newVal.filter((item: any) => `${item.dataType}` === '5').map((item: any) => { item.params = '触发灵敏度'; return item })// 触发灵敏度 + risetimeList.value = newVal.filter((item: any) => `${item.dataType}` === '6').map((item: any) => { item.params = '上升时间'; return item })// 上升时间(数字示波器) + inputResistanceList.value = newVal.filter((item: any) => `${item.dataType}` === '7').map((item: any) => { item.params = '输入电阻'; return item })// 输入电阻(数字示波器) + calibratingSignalList.value = newVal.filter((item: any) => `${item.dataType}` === '8').map((item: any) => { item.params = '校准信号'; return item })// 校准信号(数字示波器) if (timeBaseList.value.length) { - form.value.methodType = timeBaseList.value[0].methodType // 时基方法 + form.value.methodType = timeBaseList.value[0].methodType! // 时基方法 } } else if (props.itemCategoryName === '模拟示波器') { - scanningTimeList.value = newVal.filter(item => `${item.dataType}` === '1').map((item) => { item.params = '扫描时间系数及扩展'; return item }) // 扫描时间系数及扩展 - verticalSizeList.value = newVal.filter(item => `${item.dataType}` === '2').map((item) => { item.params = '垂直幅度'; return item }) // 垂直幅度 - frequencyBandwidthSimulateList.value = newVal.filter(item => `${item.dataType}` === '3').map((item) => { item.params = '频带宽度'; return item }) // 频带宽度(模拟示波器 - triggerCharacteristicList.value = newVal.filter(item => `${item.dataType}` === '4').map((item) => { item.params = '触发特性'; return item }) // 触发特性 - inputResistanceSimulateList.value = newVal.filter(item => `${item.dataType}` === '5').map((item) => { item.params = '输入电阻'; return item })// 输入电阻 - risetimeSimulateList.value = newVal.filter(item => `${item.dataType}` === '6').map((item) => { item.params = '上升时间'; return item })// 上升时间(数字示波器) - calibratingSignalSimulateList.value = newVal.filter(item => `${item.dataType}` === '7').map((item) => { item.params = '校准信号'; return item })// 校准信号(数字示波器) + scanningTimeList.value = newVal.filter((item: any) => `${item.dataType}` === '1').map((item: any) => { item.params = '扫描时间系数及扩展'; return item }) // 扫描时间系数及扩展 + verticalSizeList.value = newVal.filter((item: any) => `${item.dataType}` === '2').map((item: any) => { item.params = '垂直幅度'; return item }) // 垂直幅度 + frequencyBandwidthSimulateList.value = newVal.filter((item: any) => `${item.dataType}` === '3').map((item: any) => { item.params = '频带宽度'; return item }) // 频带宽度(模拟示波器 + triggerCharacteristicList.value = newVal.filter((item: any) => `${item.dataType}` === '4').map((item: any) => { item.params = '触发特性'; return item }) // 触发特性 + inputResistanceSimulateList.value = newVal.filter((item: any) => `${item.dataType}` === '5').map((item: any) => { item.params = '输入电阻'; return item })// 输入电阻 + risetimeSimulateList.value = newVal.filter((item: any) => `${item.dataType}` === '6').map((item: any) => { item.params = '上升时间'; return item })// 上升时间(数字示波器) + calibratingSignalSimulateList.value = newVal.filter((item: any) => `${item.dataType}` === '7').map((item: any) => { item.params = '校准信号'; return item })// 校准信号(数字示波器) } } }) diff --git a/src/views/business/measure/item/components/thirteenth/templateTable.vue b/src/views/business/measure/item/components/thirteenth/templateTable.vue index b645ba7..ca0ce12 100644 --- a/src/views/business/measure/item/components/thirteenth/templateTable.vue +++ b/src/views/business/measure/item/components/thirteenth/templateTable.vue @@ -406,7 +406,7 @@ ([ // 直流偏置 - { 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: '垂直偏转系数(/div)', value: 'nominalValue', align: 'center', required: true }, - { text: '垂直偏转系数(/div)单位', 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: 'impedanceDefineFront', align: 'center', required: true }, + { text: '通道', value: 'thoroughfare', align: 'center', required: true }, + { text: '垂直偏转系数(/div)', value: 'verticalDeflectCoefficientDefineFront', align: 'center', required: true }, + { text: '标准值', value: 'standardValue', align: 'center', required: true, width: '180' }, + { text: '测量值', value: 'measureValue', align: 'center', required: true, width: '180' }, + { text: '误差', value: 'errorValue', align: 'center', required: false }, + { text: '相对误差', value: 'relativeError', align: 'center', required: false }, + { text: '技术指标', value: 'technicalIndexDefineFront', align: 'center', required: true }, + { text: '结论', value: 'conclusion', align: 'center', required: false }, ]) const columns_frequency_bandwidth = 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: '垂直偏转系数(/div)', value: 'nominalValue', align: 'center', required: true }, - { text: '垂直偏转系数(/div)单位', 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: '分贝数(dB)', 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: 'impedanceDefineFront', align: 'center', required: true }, + { text: '通道', value: 'thoroughfare', align: 'center', required: true }, + { text: '垂直偏转系数(/div)', value: 'verticalDeflectCoefficientDefineFront', align: 'center', required: true }, + { text: '频带宽度', value: 'bandWidthDefineFront', align: 'center', required: true }, + { text: '参考幅度', value: 'referenceAmplitude', align: 'center', required: true, width: '180' }, + { text: '参考幅度单位', value: 'referenceAmplitudeUnit', align: 'center', required: true, width: '120' }, + { text: '测量幅度', value: 'measureAmplitude', align: 'center', required: true, width: '180' }, + { text: '测量幅度单位', value: 'measureAmplitudeUnit', align: 'center', required: true, width: '120' }, + { text: '分贝数(dB)', value: 'decibelNumber', align: 'center', required: false }, + { text: '技术指标', value: 'technicalIndexDefineFront', align: 'center', required: true }, + { text: '结论', value: 'conclusion', align: 'center', required: false }, ]) const columns_trigger_sensitivity = 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: 'params', align: 'center', required: true, width: '110' }, + { text: '通道', value: 'thoroughfare', align: 'center', required: true }, + { text: '触发类型', value: 'triggerType', align: 'center', required: true }, + { text: '信号频率', value: 'signalFrequencyDefineFront', align: 'center', required: true }, + { text: '标称值', value: 'nominalValueDefineFront', align: 'center', required: true }, + { text: '测量值', value: 'measureValue', align: 'center', required: true, width: '220' }, + { text: '结论', value: 'conclusion', align: 'center', required: false }, ]) const columns_risetime = 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: '垂直偏转系数(/div)', value: 'nominalValue', align: 'center', required: true }, - { text: '垂直偏转系数(/div)单位', 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: 'thoroughfare', align: 'center', required: true }, + { text: '阻抗', value: 'impedanceDefineFront', align: 'center', required: true }, + { text: '垂直偏转系数(/div)', value: 'verticalDeflectCoefficientDefineFront', align: 'center', required: true }, + { text: '测量值', value: 'measureValue', align: 'center', required: true, width: '180' }, + { text: '测量值单位', value: 'measureValueUnit', align: 'center', required: true, width: '120' }, + { text: '技术指标', value: 'technicalIndexDefineFront', align: 'center', required: true }, + { text: '结论', value: 'conclusion', align: 'center', required: false }, ]) const columns_input_resistance = 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: '垂直偏转系数(/div)', value: 'nominalValue', align: 'center', required: true }, - { text: '垂直偏转系数(/div)单位', 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: 'thoroughfare', align: 'center', required: true }, + { text: '标称值', value: 'nominalValueDefineFront', align: 'center', required: true }, + { text: '垂直偏转系数(/div)', value: 'verticalDeflectCoefficientDefineFront', align: 'center', required: true }, + { text: '测量值', value: 'measureValue', align: 'center', required: true, width: '220' }, + { text: '技术指标', value: 'technicalIndexDefineFront', align: 'center', required: true }, + { text: '相对误差', value: 'relativeError', align: 'center', required: false }, + { text: '结论', value: 'conclusion', align: 'center', required: false }, ]) const columns_calibrating_signal = 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: 'itemType', align: 'center', required: true }, + { text: '标称值', value: 'nominalValueDefineFront', align: 'center', required: true }, + { text: '顶部测量值', value: 'topMeasureValue', align: 'center', required: true, width: '180' }, + { text: '底部测量值', value: 'bottomMeasureValue', align: 'center', required: true, width: '180' }, + { text: '测量值', value: 'measureValue', align: 'center', required: false, width: '220' }, + { text: '相对误差', value: 'relativeError', align: 'center', required: false }, ]) const columns_scan_time = 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: 'nominalValue', align: 'center', required: true }, + { text: '检定项目', value: 'params', align: 'center', required: true, width: '160' }, + { text: '扫描方式', value: 'scanType', align: 'center', required: true }, + { text: '阻抗', value: 'impedanceDefineFront', align: 'center', required: true }, + { text: '水平刻度档位', value: 'horizontalScaleGearDefineFront', align: 'center', required: true }, + { text: '标称值', value: 'nominalValueDefineFront', align: 'center', required: true }, + { text: '测量值', value: 'measureValue', align: 'center', required: true, width: '220' }, + { text: '相对误差', value: 'relativeError', align: 'center', required: false }, + { text: '技术指标', value: 'technicalIndexDefineFront', align: 'center', required: true }, + { text: '结论', value: 'conclusion', align: 'center', required: false }, ]) const columns_vertical_size = 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: '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: 'nominalValueDefineFront', align: 'center', required: true }, + { text: '测量值', value: 'measureValue', align: 'center', required: true, width: '220' }, + { text: '相对误差', value: 'relativeError', align: 'center', required: false }, + { text: '技术指标', value: 'technicalIndexDefineFront', align: 'center', required: true }, + { text: '结论', value: 'conclusion', align: 'center', required: false }, ]) const columns_frequency_bandwidth_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: '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: 'measureValue', align: 'center', required: true, width: '220' }, + { text: '技术指标', value: 'technicalIndexDefineFront', align: 'center', required: true }, + { text: '结论', value: 'conclusion', align: 'center', required: false }, ]) const columns_trigger_characteristic = 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: 'params', align: 'center', required: true, width: '90' }, + { text: '通道', value: 'thoroughfare', align: 'center', required: true }, + { text: '阻抗', value: 'impedanceDefineFront', align: 'center', required: true }, + { text: '扫描方式', value: 'scanType', align: 'center', required: true }, + { text: '触发类型', value: 'triggerType', align: 'center', required: true }, + { text: '频率上限', value: 'frequencyUpperDefineFront', align: 'center', required: true }, + { text: '输出信号幅度', value: 'outputSignalAmplitude', align: 'center', required: true, width: '220' }, + { text: '技术指标', value: 'technicalIndexDefineFront', align: 'center', required: true }, + { text: '触发特性', value: 'conclusion', align: 'center', required: false }, ]) const columns_input_resistance_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: 'params', align: 'center', required: true, width: '90' }, + { text: '通道', value: 'thoroughfare', align: 'center', required: true }, + { text: '阻抗', value: 'impedanceDefineFront', align: 'center', required: true }, + { text: '测量值', value: 'measureValue', align: 'center', required: true, width: '220' }, + { text: '相对误差', value: 'relativeError', align: 'center', required: false }, + { text: '技术指标', value: 'technicalIndexDefineFront', align: 'center', required: true }, + { text: '结论', value: 'conclusion', align: 'center', required: false }, ]) const columns_risetime_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: '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: '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([ // 校准信号(模拟示波器) @@ -348,8 +326,8 @@ const initInputData = (data: any) => { if (itemFormData.value.itemCategoryName === '数字示波器') { // 时基 - timeBaseList.value = data.filter(item => `${item.dataType}` === '1') - timeBaseList.value = timeBaseList.value.map((item) => { + timeBaseList.value = data.filter((item: any) => `${item.dataType}` === '1') + timeBaseList.value = timeBaseList.value.map((item: any) => { return { ...item, params: '时基', @@ -361,8 +339,8 @@ } }) // 直流增益 - zeroFrequencyGainList.value = data.filter(item => `${item.dataType}` === '2') - zeroFrequencyGainList.value = zeroFrequencyGainList.value.map((item) => { + zeroFrequencyGainList.value = data.filter((item: any) => `${item.dataType}` === '2') + zeroFrequencyGainList.value = zeroFrequencyGainList.value.map((item: any) => { return { ...item, params: '直流增益', @@ -376,9 +354,210 @@ conclusion: '', // 结论 } }) + // 直流偏置 + 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, // 标准值 + measureValue: '', // 测量值 + measureValueUnit: item.standardValueUnit, // 测量值单位 + relativeError: '', // 相对误差 + errorValue: '', // 误差 + technicalIndexDefineFront: item.technicalIndexSymbol + item.technicalIndex + item.technicalIndexUnit, // 技术指标 + conclusion: '', // 结论 + } + }) + + // 频带宽度(数字示波器) + 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, // 频带宽度 + referenceAmplitude: '', // 参考幅度 + referenceAmplitudeUnit: 'V', // 参考幅度单位 + measureAmplitude: '', // 测量幅度 + measureAmplitudeUnit: 'V', // 测量幅度单位 + decibelNumber: '', // 分贝数(dB) + technicalIndexDefineFront: item.technicalIndexSymbol + item.technicalIndex + item.technicalIndexUnit, // 技术指标 + conclusion: '', // 结论 + } + }) + + // 触发灵敏度 + 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, // 标称值 + measureValue: '', // 测量值 + measureValueUnit: item.nominalValueUnit, // 测量值单位 + conclusion: '', // 结论 + } + }) + + // 上升时间 + 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, // 垂直偏转系数 + measureValue: '', // 测量值 + measureValueUnit: '', // 测量值单位 + technicalIndexDefineFront: item.technicalIndexSymbol + item.technicalIndex + item.technicalIndexUnit, // 技术指标 + conclusion: '', // 结论 + } + }) + + // 输入电阻 + 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, // 垂直偏转系数 + measureValue: '', // 测量值 + measureValueUnit: item.nominalValueUnit, // 测量值单位 + technicalIndexDefineFront: item.technicalIndexSymbol + item.technicalIndex + item.technicalIndexUnit, // 技术指标 + relativeError: '', // 相对误差 + conclusion: '', // 结论 + } + }) + // 校准信号 + 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 === '频率' ? '-' : '', // 底部测量值 + measureValue: '', // 测量值 + relativeError: '', // 相对误差 + conclusion: '', // 结论 + } + }) } else if (itemFormData.value.itemCategoryName === '模拟示波器') { - console.log('模拟示波器') + // 扫描时间系数及扩展 + 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, // 标称值 + measureValue: '', // 测量值 + technicalIndexDefineFront: item.technicalIndexSymbol + item.technicalIndex + item.technicalIndexUnit, // 技术指标 + relativeError: '', // 相对误差 + conclusion: '', // 结论 + } + }) + + // 垂直幅度 + 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, // 标称值 + measureValue: '', // 测量值 + technicalIndexDefineFront: item.technicalIndexSymbol + item.technicalIndex + item.technicalIndexUnit, // 技术指标 + relativeError: '', // 相对误差 + conclusion: '', // 结论 + } + }) + + // 频带宽度 + 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, // 垂直刻度档位 + measureValue: '', // 测量值 + technicalIndexDefineFront: item.technicalIndexSymbol + item.technicalIndex + item.technicalIndexUnit, // 技术指标 + relativeError: '', // 相对误差 + conclusion: '', // 结论 + } + }) + + // 触发特性 + 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, // 频率上限 + outputSignalAmplitude: '', // 测量值 + technicalIndexDefineFront: item.technicalIndexSymbol + item.technicalIndex + item.technicalIndexUnit, // 技术指标 + conclusion: '', // 结论 + } + }) + + // 输入电阻（模拟示波器） + 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, // 阻抗 + measureValue: '', // 测量值 + technicalIndexDefineFront: item.technicalIndexSymbol + item.technicalIndex + item.technicalIndexUnit, // 技术指标 + relativeError: '', // 相对误差 + conclusion: '', // 结论 + } + }) + + // 上升时间（模拟示波器） + 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, // 水平刻度档位 + nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值 + riseTime: '', // 上升时间 + correctRiseTime: '', // 修正上升时间 + technicalIndexDefineFront: item.technicalIndexSymbol + item.technicalIndex + item.technicalIndexUnit, // 技术指标 + relativeError: '', // 相对误差 + conclusion: '', // 结论 + } + }) } } @@ -409,7 +588,7 @@ itemFormData.value.triggerCharacter = res.data.triggerCharacter // 触发特性 itemFormData.value.verticalAmplitude = res.data.verticalAmplitude // 垂直幅度 - const tempTimeBaseList = res.data.measureItemDataOscilloscopeList.filter(item => `${item.dataType}` === '1') + const tempTimeBaseList = res.data.measureItemDataOscilloscopeList.filter((item: any) => `${item.dataType}` === '1') if (tempTimeBaseList && tempTimeBaseList.length) { itemFormData.value.methodType = tempTimeBaseList[0].methodType } @@ -421,63 +600,279 @@ // 点击计算结果校验 const checkout = (type: string) => { let result = true - switch (type) { - case '时基': { - const columns = itemFormData.value.methodType === '方法一' ? columns_time_base_method1.value : columns_time_base_method2.value - result = useCheckList(timeBaseList.value, columns, type) - break + if (itemFormData.value.itemCategoryName === '数字示波器') { + switch (type) { + case '时基': { + const columns = itemFormData.value.methodType === '方法一' ? columns_time_base_method1.value : columns_time_base_method2.value + result = useCheckList(timeBaseList.value, columns, type) + break + } + case '直流增益': + result = useCheckList(zeroFrequencyGainList.value, columns_zero_frequency_gain.value, type) + break + case '直流偏置': + result = useCheckList(DCBiasList.value, columns_DC_bias.value, type) + break + case '频带宽度': + result = useCheckList(frequencyBandwidthList.value, columns_frequency_bandwidth.value, type) + break + case '触发灵敏度': + result = useCheckList(triggerSensitivityList.value, columns_trigger_sensitivity.value, type) + break + case '上升时间': + result = useCheckList(risetimeList.value, columns_risetime.value, type) + break + case '输入电阻': + result = useCheckList(inputResistanceList.value, columns_input_resistance.value, type) + break + case '校准信号': + result = useCheckList(calibratingSignalList.value, columns_calibrating_signal.value, type) + break + default: + break } - case '直流增益': - result = useCheckList(zeroFrequencyGainList.value, columns_zero_frequency_gain.value, type) - break - default: - break + } + else if (itemFormData.value.itemCategoryName === '模拟示波器') { + switch (type) { + case '扫描时间系数及扩展': + result = useCheckList(scanningTimeList.value, columns_scan_time.value, type) + break + case '垂直幅度': + result = useCheckList(verticalSizeList.value, columns_vertical_size.value, type) + break + case '频带宽度': + result = useCheckList(frequencyBandwidthSimulateList.value, columns_frequency_bandwidth_simulate.value, type) + break + case '触发特性': + result = useCheckList(triggerCharacteristicList.value, columns_trigger_characteristic.value, type) + break + case '输入电阻': + result = useCheckList(inputResistanceSimulateList.value, columns_input_resistance_simulate.value, type) + break + case '上升时间': + result = useCheckList(risetimeSimulateList.value, columns_risetime_simulate.value, type) + break + default: + break + } } return result } // 计算之前参数处理 const solveParamsBeforeCalculate = (type: string) => { - let list = [] - switch (type) { - case '时基': - list = timeBaseList.value - break - case '直流增益': - list = zeroFrequencyGainList.value - break - default: - break + let list = [] as any + if (itemFormData.value.itemCategoryName === '数字示波器') { + switch (type) { + case '时基': + list = timeBaseList.value + break + case '直流增益': + list = zeroFrequencyGainList.value + break + case '直流偏置': + list = DCBiasList.value + break + case '频带宽度': + list = frequencyBandwidthList.value + break + case '触发灵敏度': + list = triggerSensitivityList.value + break + case '上升时间': + list = risetimeList.value + break + case '输入电阻': + list = inputResistanceList.value + break + case '校准信号': + list = calibratingSignalList.value + break + default: + break + } } + else if (itemFormData.value.itemCategoryName === '模拟示波器') { + switch (type) { + case '扫描时间系数及扩展': + list = scanningTimeList.value + break + case '垂直幅度': + list = verticalSizeList.value + break + case '频带宽度': + list = frequencyBandwidthSimulateList.value + break + case '触发特性': + list = triggerCharacteristicList.value + break + case '输入电阻': + list = inputResistanceSimulateList.value + break + case '上升时间': + list = risetimeSimulateList.value + break + default: + break + } + } + return list } // 计算之后参数处理 -const solveParamsAfterCalculate = (type: string, list) => { - switch (type) { - case '时基': - timeBaseList.value = timeBaseList.value.map((item, index) => { - return { - ...item, - timeBaseRelativeError: list[index].timeBaseRelativeError, - conclusion: list[index].conclusion, - exceedMark: list[index].exceedMark, - } - }) - break - case '直流增益': - zeroFrequencyGainList.value = zeroFrequencyGainList.value.map((item, index) => { - return { - ...item, - relativeError: list[index].relativeError, - conclusion: list[index].conclusion, - exceedMark: list[index].exceedMark, - } - }) - break - default: - break +const solveParamsAfterCalculate = (type: string, list: any) => { + if (itemFormData.value.itemCategoryName === '数字示波器') { + switch (type) { + case '时基': + timeBaseList.value = timeBaseList.value.map((item, index) => { + return { + ...item, + timeBaseRelativeError: list[index].timeBaseRelativeError, + conclusion: list[index].conclusion, + exceedMark: list[index].exceedMark, + } + }) + break + case '直流增益': + zeroFrequencyGainList.value = zeroFrequencyGainList.value.map((item, index) => { + return { + ...item, + relativeError: list[index].relativeError, + conclusion: list[index].conclusion, + exceedMark: list[index].exceedMark, + } + }) + break + case '直流偏置': + DCBiasList.value = DCBiasList.value.map((item, index) => { + return { + ...item, + errorValue: list[index].errorValue + item.standardValueUnit, // 误差 + relativeError: list[index].relativeError, // 相对误差 + conclusion: list[index].conclusion, // 结论 + exceedMark: list[index].exceedMark, + } + }) + break + case '频带宽度': + frequencyBandwidthList.value = frequencyBandwidthList.value.map((item, index) => { + return { + ...item, + decibelNumber: list[index].decibelNumber, // 分贝数(dB) + conclusion: list[index].conclusion, // 结论 + exceedMark: list[index].exceedMark, + } + }) + break + case '触发灵敏度': + triggerSensitivityList.value = triggerSensitivityList.value.map((item, index) => { + return { + ...item, + conclusion: list[index].conclusion, // 结论 + exceedMark: list[index].exceedMark, + } + }) + break + case '上升时间': + risetimeList.value = risetimeList.value.map((item, index) => { + return { + ...item, + conclusion: list[index].conclusion, // 结论 + exceedMark: list[index].exceedMark, + } + }) + break + case '输入电阻': + inputResistanceList.value = inputResistanceList.value.map((item, index) => { + return { + ...item, + relativeError: list[index].relativeError, // 相对误差 + conclusion: list[index].conclusion, // 结论 + exceedMark: list[index].exceedMark, + } + }) + break + case '校准信号': + calibratingSignalList.value = calibratingSignalList.value.map((item, index) => { + return { + ...item, + measureValue: item.itemType === '幅度' ? list[index].measureValue + item.nominalValueUnit : item.measureValue, // 测量值 + relativeError: list[index].relativeError, // 相对误差 + conclusion: list[index].conclusion, // 结论 + exceedMark: list[index].exceedMark, + } + }) + break + default: + break + } } + else if (itemFormData.value.itemCategoryName === '模拟示波器') { + switch (type) { + case '扫描时间系数及扩展': + scanningTimeList.value = scanningTimeList.value.map((item, index) => { + return { + ...item, + relativeError: list[index].relativeError, // 相对误差 + conclusion: list[index].conclusion, // 结论 + exceedMark: list[index].exceedMark, + } + }) + break + case '垂直幅度': + verticalSizeList.value = verticalSizeList.value.map((item, index) => { + return { + ...item, + relativeError: list[index].relativeError, // 相对误差 + conclusion: list[index].conclusion, // 结论 + exceedMark: list[index].exceedMark, + } + }) + break + case '频带宽度': + frequencyBandwidthSimulateList.value = frequencyBandwidthSimulateList.value.map((item, index) => { + return { + ...item, + conclusion: list[index].conclusion, // 结论 + exceedMark: list[index].exceedMark, + } + }) + break + case '触发特性': + triggerCharacteristicList.value = triggerCharacteristicList.value.map((item, index) => { + return { + ...item, + conclusion: list[index].conclusion, // 结论 + exceedMark: list[index].exceedMark, + } + }) + break + case '输入电阻': + triggerCharacteristicList.value = triggerCharacteristicList.value.map((item, index) => { + return { + ...item, + relativeError: list[index].relativeError, // 相对误差 + conclusion: list[index].conclusion, // 结论 + exceedMark: list[index].exceedMark, + } + }) + break + case '上升时间': + risetimeSimulateList.value = risetimeSimulateList.value.map((item, index) => { + return { + ...item, + correctRiseTime: list[index].correctRiseTime, // 修正上升时间 + conclusion: list[index].conclusion, // 结论 + exceedMark: list[index].exceedMark, + } + }) + break + default: + break + } + } + return list } // -----------------------------------------生成结果处理---------------------------------------- @@ -489,10 +884,26 @@ const list = solveParamsBeforeCalculate(type) timeBaseLoading.value = type === '时基' zeroFrequencyGainLoading.value = type === '直流增益' + DCBiasLoading.value = type === '直流偏置' + frequencyBandwidthLoading.value = type === '频带宽度' && itemFormData.value.itemCategoryName === '数字示波器' + triggerSensitivityLoading.value = type === '触发灵敏度' + risetimeLoading.value = type === '上升时间' && itemFormData.value.itemCategoryName === '数字示波器' + inputResistanceLoading.value = type === '输入电阻' && itemFormData.value.itemCategoryName === '数字示波器' + calibratingSignalLoading.value = type === '校准信号' && itemFormData.value.itemCategoryName === '数字示波器' + scanningTimeLoading.value = type === '扫描时间系数及扩展' + verticalSizeLoading.value = type === '垂直幅度' + frequencyBandwidthSimulateLoading.value = type === '频带宽度' && itemFormData.value.itemCategoryName === '模拟示波器' + triggerCharacteristicLoading.value = type === '触发特性' + inputResistanceSimulateLoading.value = type === '输入电阻' && itemFormData.value.itemCategoryName === '模拟示波器' const params = { belongStandardEquipment: itemFormData.value.belongStandardEquipment, // 检校标准装置 itemCategoryName: itemFormData.value.itemCategoryName, // 检定项分类名称 - measureDataOscilloscopeList: list, + measureDataOscilloscopeList: list.map((item: { exceedMark: number }) => { + return { + ...item, + exceedMark: 0, + } + }), } calculateHandle(params).then((res) => { if (res.data && res.data.length) { @@ -500,9 +911,31 @@ } timeBaseLoading.value = false zeroFrequencyGainLoading.value = false + DCBiasLoading.value = false + frequencyBandwidthLoading.value = false + triggerSensitivityLoading.value = false + risetimeLoading.value = false + inputResistanceLoading.value = false + calibratingSignalLoading.value = false + scanningTimeLoading.value = false + verticalSizeLoading.value = false + frequencyBandwidthSimulateLoading.value = false + triggerCharacteristicLoading.value = false + inputResistanceSimulateLoading.value = false }).catch(() => { timeBaseLoading.value = false zeroFrequencyGainLoading.value = false + DCBiasLoading.value = false + frequencyBandwidthLoading.value = false + triggerSensitivityLoading.value = false + risetimeLoading.value = false + inputResistanceLoading.value = false + calibratingSignalLoading.value = false + scanningTimeLoading.value = false + verticalSizeLoading.value = false + frequencyBandwidthSimulateLoading.value = false + triggerCharacteristicLoading.value = false + inputResistanceSimulateLoading.value = false }) } @@ -598,7 +1031,7 @@ 计算结果 - + @@ -608,97 +1041,97 @@ 计算结果 - + - + - + - + - + - + - + - + - + - + diff --git a/src/views/business/manager/order/detail.vue b/src/views/business/manager/order/detail.vue index fd08303..31c8838 100644 --- a/src/views/business/manager/order/detail.vue +++ b/src/views/business/manager/order/detail.vue @@ -571,7 +571,7 @@ { // 数据处理 - let tempList = [] + let tempList = [] as any timeBaseList.value = timeBaseList.value.map((item) => { return { ...item, @@ -949,7 +949,7 @@ if (form.value.triggerCharacter) { // 触发特性 tempList = tempList.concat(triggerCharacteristicList.value) } - tempList = tempList.map((item) => { + tempList = tempList.map((item: { id: string }) => { return { ...item, id: '', @@ -1029,26 +1029,26 @@ watch(() => props.list, (newVal) => { // 检定项表格 if (newVal && newVal.length) { if (props.itemCategoryName === '数字示波器') { - timeBaseList.value = newVal.filter(item => `${item.dataType}` === '1').map((item) => { item.params = '时基'; return item }) // 时基 - zeroFrequencyGainList.value = newVal.filter(item => `${item.dataType}` === '2').map((item) => { item.params = '直流增益'; return item }) // 直流增益 - DCBiasList.value = newVal.filter(item => `${item.dataType}` === '3').map((item) => { item.params = '直流偏置'; return item }) // 直流偏置 - frequencyBandwidthList.value = newVal.filter(item => `${item.dataType}` === '4').map((item) => { item.params = '频带宽度'; return item }) // 频带宽度(数字示波器) - triggerSensitivityList.value = newVal.filter(item => `${item.dataType}` === '5').map((item) => { item.params = '触发灵敏度'; return item })// 触发灵敏度 - risetimeList.value = newVal.filter(item => `${item.dataType}` === '6').map((item) => { item.params = '上升时间'; return item })// 上升时间(数字示波器) - inputResistanceList.value = newVal.filter(item => `${item.dataType}` === '7').map((item) => { item.params = '输入电阻'; return item })// 输入电阻(数字示波器) - calibratingSignalList.value = newVal.filter(item => `${item.dataType}` === '8').map((item) => { item.params = '校准信号'; return item })// 校准信号(数字示波器) + timeBaseList.value = newVal.filter((item: any) => `${item.dataType}` === '1').map((item: any) => { item.params = '时基'; return item }) // 时基 + zeroFrequencyGainList.value = newVal.filter((item: any) => `${item.dataType}` === '2').map((item: any) => { item.params = '直流增益'; return item }) // 直流增益 + DCBiasList.value = newVal.filter((item: any) => `${item.dataType}` === '3').map((item: any) => { item.params = '直流偏置'; return item }) // 直流偏置 + frequencyBandwidthList.value = newVal.filter((item: any) => `${item.dataType}` === '4').map((item: any) => { item.params = '频带宽度'; return item }) // 频带宽度(数字示波器) + triggerSensitivityList.value = newVal.filter((item: any) => `${item.dataType}` === '5').map((item: any) => { item.params = '触发灵敏度'; return item })// 触发灵敏度 + risetimeList.value = newVal.filter((item: any) => `${item.dataType}` === '6').map((item: any) => { item.params = '上升时间'; return item })// 上升时间(数字示波器) + inputResistanceList.value = newVal.filter((item: any) => `${item.dataType}` === '7').map((item: any) => { item.params = '输入电阻'; return item })// 输入电阻(数字示波器) + calibratingSignalList.value = newVal.filter((item: any) => `${item.dataType}` === '8').map((item: any) => { item.params = '校准信号'; return item })// 校准信号(数字示波器) if (timeBaseList.value.length) { - form.value.methodType = timeBaseList.value[0].methodType // 时基方法 + form.value.methodType = timeBaseList.value[0].methodType! // 时基方法 } } else if (props.itemCategoryName === '模拟示波器') { - scanningTimeList.value = newVal.filter(item => `${item.dataType}` === '1').map((item) => { item.params = '扫描时间系数及扩展'; return item }) // 扫描时间系数及扩展 - verticalSizeList.value = newVal.filter(item => `${item.dataType}` === '2').map((item) => { item.params = '垂直幅度'; return item }) // 垂直幅度 - frequencyBandwidthSimulateList.value = newVal.filter(item => `${item.dataType}` === '3').map((item) => { item.params = '频带宽度'; return item }) // 频带宽度(模拟示波器 - triggerCharacteristicList.value = newVal.filter(item => `${item.dataType}` === '4').map((item) => { item.params = '触发特性'; return item }) // 触发特性 - inputResistanceSimulateList.value = newVal.filter(item => `${item.dataType}` === '5').map((item) => { item.params = '输入电阻'; return item })// 输入电阻 - risetimeSimulateList.value = newVal.filter(item => `${item.dataType}` === '6').map((item) => { item.params = '上升时间'; return item })// 上升时间(数字示波器) - calibratingSignalSimulateList.value = newVal.filter(item => `${item.dataType}` === '7').map((item) => { item.params = '校准信号'; return item })// 校准信号(数字示波器) + scanningTimeList.value = newVal.filter((item: any) => `${item.dataType}` === '1').map((item: any) => { item.params = '扫描时间系数及扩展'; return item }) // 扫描时间系数及扩展 + verticalSizeList.value = newVal.filter((item: any) => `${item.dataType}` === '2').map((item: any) => { item.params = '垂直幅度'; return item }) // 垂直幅度 + frequencyBandwidthSimulateList.value = newVal.filter((item: any) => `${item.dataType}` === '3').map((item: any) => { item.params = '频带宽度'; return item }) // 频带宽度(模拟示波器 + triggerCharacteristicList.value = newVal.filter((item: any) => `${item.dataType}` === '4').map((item: any) => { item.params = '触发特性'; return item }) // 触发特性 + inputResistanceSimulateList.value = newVal.filter((item: any) => `${item.dataType}` === '5').map((item: any) => { item.params = '输入电阻'; return item })// 输入电阻 + risetimeSimulateList.value = newVal.filter((item: any) => `${item.dataType}` === '6').map((item: any) => { item.params = '上升时间'; return item })// 上升时间(数字示波器) + calibratingSignalSimulateList.value = newVal.filter((item: any) => `${item.dataType}` === '7').map((item: any) => { item.params = '校准信号'; return item })// 校准信号(数字示波器) } } }) diff --git a/src/views/business/measure/item/components/thirteenth/templateTable.vue b/src/views/business/measure/item/components/thirteenth/templateTable.vue index b645ba7..ca0ce12 100644 --- a/src/views/business/measure/item/components/thirteenth/templateTable.vue +++ b/src/views/business/measure/item/components/thirteenth/templateTable.vue @@ -406,7 +406,7 @@ ([ // 直流偏置 - { 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: '垂直偏转系数(/div)', value: 'nominalValue', align: 'center', required: true }, - { text: '垂直偏转系数(/div)单位', 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: 'impedanceDefineFront', align: 'center', required: true }, + { text: '通道', value: 'thoroughfare', align: 'center', required: true }, + { text: '垂直偏转系数(/div)', value: 'verticalDeflectCoefficientDefineFront', align: 'center', required: true }, + { text: '标准值', value: 'standardValue', align: 'center', required: true, width: '180' }, + { text: '测量值', value: 'measureValue', align: 'center', required: true, width: '180' }, + { text: '误差', value: 'errorValue', align: 'center', required: false }, + { text: '相对误差', value: 'relativeError', align: 'center', required: false }, + { text: '技术指标', value: 'technicalIndexDefineFront', align: 'center', required: true }, + { text: '结论', value: 'conclusion', align: 'center', required: false }, ]) const columns_frequency_bandwidth = 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: '垂直偏转系数(/div)', value: 'nominalValue', align: 'center', required: true }, - { text: '垂直偏转系数(/div)单位', 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: '分贝数(dB)', 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: 'impedanceDefineFront', align: 'center', required: true }, + { text: '通道', value: 'thoroughfare', align: 'center', required: true }, + { text: '垂直偏转系数(/div)', value: 'verticalDeflectCoefficientDefineFront', align: 'center', required: true }, + { text: '频带宽度', value: 'bandWidthDefineFront', align: 'center', required: true }, + { text: '参考幅度', value: 'referenceAmplitude', align: 'center', required: true, width: '180' }, + { text: '参考幅度单位', value: 'referenceAmplitudeUnit', align: 'center', required: true, width: '120' }, + { text: '测量幅度', value: 'measureAmplitude', align: 'center', required: true, width: '180' }, + { text: '测量幅度单位', value: 'measureAmplitudeUnit', align: 'center', required: true, width: '120' }, + { text: '分贝数(dB)', value: 'decibelNumber', align: 'center', required: false }, + { text: '技术指标', value: 'technicalIndexDefineFront', align: 'center', required: true }, + { text: '结论', value: 'conclusion', align: 'center', required: false }, ]) const columns_trigger_sensitivity = 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: 'params', align: 'center', required: true, width: '110' }, + { text: '通道', value: 'thoroughfare', align: 'center', required: true }, + { text: '触发类型', value: 'triggerType', align: 'center', required: true }, + { text: '信号频率', value: 'signalFrequencyDefineFront', align: 'center', required: true }, + { text: '标称值', value: 'nominalValueDefineFront', align: 'center', required: true }, + { text: '测量值', value: 'measureValue', align: 'center', required: true, width: '220' }, + { text: '结论', value: 'conclusion', align: 'center', required: false }, ]) const columns_risetime = 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: '垂直偏转系数(/div)', value: 'nominalValue', align: 'center', required: true }, - { text: '垂直偏转系数(/div)单位', 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: 'thoroughfare', align: 'center', required: true }, + { text: '阻抗', value: 'impedanceDefineFront', align: 'center', required: true }, + { text: '垂直偏转系数(/div)', value: 'verticalDeflectCoefficientDefineFront', align: 'center', required: true }, + { text: '测量值', value: 'measureValue', align: 'center', required: true, width: '180' }, + { text: '测量值单位', value: 'measureValueUnit', align: 'center', required: true, width: '120' }, + { text: '技术指标', value: 'technicalIndexDefineFront', align: 'center', required: true }, + { text: '结论', value: 'conclusion', align: 'center', required: false }, ]) const columns_input_resistance = 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: '垂直偏转系数(/div)', value: 'nominalValue', align: 'center', required: true }, - { text: '垂直偏转系数(/div)单位', 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: 'thoroughfare', align: 'center', required: true }, + { text: '标称值', value: 'nominalValueDefineFront', align: 'center', required: true }, + { text: '垂直偏转系数(/div)', value: 'verticalDeflectCoefficientDefineFront', align: 'center', required: true }, + { text: '测量值', value: 'measureValue', align: 'center', required: true, width: '220' }, + { text: '技术指标', value: 'technicalIndexDefineFront', align: 'center', required: true }, + { text: '相对误差', value: 'relativeError', align: 'center', required: false }, + { text: '结论', value: 'conclusion', align: 'center', required: false }, ]) const columns_calibrating_signal = 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: 'itemType', align: 'center', required: true }, + { text: '标称值', value: 'nominalValueDefineFront', align: 'center', required: true }, + { text: '顶部测量值', value: 'topMeasureValue', align: 'center', required: true, width: '180' }, + { text: '底部测量值', value: 'bottomMeasureValue', align: 'center', required: true, width: '180' }, + { text: '测量值', value: 'measureValue', align: 'center', required: false, width: '220' }, + { text: '相对误差', value: 'relativeError', align: 'center', required: false }, ]) const columns_scan_time = 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: 'nominalValue', align: 'center', required: true }, + { text: '检定项目', value: 'params', align: 'center', required: true, width: '160' }, + { text: '扫描方式', value: 'scanType', align: 'center', required: true }, + { text: '阻抗', value: 'impedanceDefineFront', align: 'center', required: true }, + { text: '水平刻度档位', value: 'horizontalScaleGearDefineFront', align: 'center', required: true }, + { text: '标称值', value: 'nominalValueDefineFront', align: 'center', required: true }, + { text: '测量值', value: 'measureValue', align: 'center', required: true, width: '220' }, + { text: '相对误差', value: 'relativeError', align: 'center', required: false }, + { text: '技术指标', value: 'technicalIndexDefineFront', align: 'center', required: true }, + { text: '结论', value: 'conclusion', align: 'center', required: false }, ]) const columns_vertical_size = 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: '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: 'nominalValueDefineFront', align: 'center', required: true }, + { text: '测量值', value: 'measureValue', align: 'center', required: true, width: '220' }, + { text: '相对误差', value: 'relativeError', align: 'center', required: false }, + { text: '技术指标', value: 'technicalIndexDefineFront', align: 'center', required: true }, + { text: '结论', value: 'conclusion', align: 'center', required: false }, ]) const columns_frequency_bandwidth_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: '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: 'measureValue', align: 'center', required: true, width: '220' }, + { text: '技术指标', value: 'technicalIndexDefineFront', align: 'center', required: true }, + { text: '结论', value: 'conclusion', align: 'center', required: false }, ]) const columns_trigger_characteristic = 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: 'params', align: 'center', required: true, width: '90' }, + { text: '通道', value: 'thoroughfare', align: 'center', required: true }, + { text: '阻抗', value: 'impedanceDefineFront', align: 'center', required: true }, + { text: '扫描方式', value: 'scanType', align: 'center', required: true }, + { text: '触发类型', value: 'triggerType', align: 'center', required: true }, + { text: '频率上限', value: 'frequencyUpperDefineFront', align: 'center', required: true }, + { text: '输出信号幅度', value: 'outputSignalAmplitude', align: 'center', required: true, width: '220' }, + { text: '技术指标', value: 'technicalIndexDefineFront', align: 'center', required: true }, + { text: '触发特性', value: 'conclusion', align: 'center', required: false }, ]) const columns_input_resistance_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: 'params', align: 'center', required: true, width: '90' }, + { text: '通道', value: 'thoroughfare', align: 'center', required: true }, + { text: '阻抗', value: 'impedanceDefineFront', align: 'center', required: true }, + { text: '测量值', value: 'measureValue', align: 'center', required: true, width: '220' }, + { text: '相对误差', value: 'relativeError', align: 'center', required: false }, + { text: '技术指标', value: 'technicalIndexDefineFront', align: 'center', required: true }, + { text: '结论', value: 'conclusion', align: 'center', required: false }, ]) const columns_risetime_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: '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: '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([ // 校准信号(模拟示波器) @@ -348,8 +326,8 @@ const initInputData = (data: any) => { if (itemFormData.value.itemCategoryName === '数字示波器') { // 时基 - timeBaseList.value = data.filter(item => `${item.dataType}` === '1') - timeBaseList.value = timeBaseList.value.map((item) => { + timeBaseList.value = data.filter((item: any) => `${item.dataType}` === '1') + timeBaseList.value = timeBaseList.value.map((item: any) => { return { ...item, params: '时基', @@ -361,8 +339,8 @@ } }) // 直流增益 - zeroFrequencyGainList.value = data.filter(item => `${item.dataType}` === '2') - zeroFrequencyGainList.value = zeroFrequencyGainList.value.map((item) => { + zeroFrequencyGainList.value = data.filter((item: any) => `${item.dataType}` === '2') + zeroFrequencyGainList.value = zeroFrequencyGainList.value.map((item: any) => { return { ...item, params: '直流增益', @@ -376,9 +354,210 @@ conclusion: '', // 结论 } }) + // 直流偏置 + 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, // 标准值 + measureValue: '', // 测量值 + measureValueUnit: item.standardValueUnit, // 测量值单位 + relativeError: '', // 相对误差 + errorValue: '', // 误差 + technicalIndexDefineFront: item.technicalIndexSymbol + item.technicalIndex + item.technicalIndexUnit, // 技术指标 + conclusion: '', // 结论 + } + }) + + // 频带宽度(数字示波器) + 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, // 频带宽度 + referenceAmplitude: '', // 参考幅度 + referenceAmplitudeUnit: 'V', // 参考幅度单位 + measureAmplitude: '', // 测量幅度 + measureAmplitudeUnit: 'V', // 测量幅度单位 + decibelNumber: '', // 分贝数(dB) + technicalIndexDefineFront: item.technicalIndexSymbol + item.technicalIndex + item.technicalIndexUnit, // 技术指标 + conclusion: '', // 结论 + } + }) + + // 触发灵敏度 + 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, // 标称值 + measureValue: '', // 测量值 + measureValueUnit: item.nominalValueUnit, // 测量值单位 + conclusion: '', // 结论 + } + }) + + // 上升时间 + 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, // 垂直偏转系数 + measureValue: '', // 测量值 + measureValueUnit: '', // 测量值单位 + technicalIndexDefineFront: item.technicalIndexSymbol + item.technicalIndex + item.technicalIndexUnit, // 技术指标 + conclusion: '', // 结论 + } + }) + + // 输入电阻 + 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, // 垂直偏转系数 + measureValue: '', // 测量值 + measureValueUnit: item.nominalValueUnit, // 测量值单位 + technicalIndexDefineFront: item.technicalIndexSymbol + item.technicalIndex + item.technicalIndexUnit, // 技术指标 + relativeError: '', // 相对误差 + conclusion: '', // 结论 + } + }) + // 校准信号 + 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 === '频率' ? '-' : '', // 底部测量值 + measureValue: '', // 测量值 + relativeError: '', // 相对误差 + conclusion: '', // 结论 + } + }) } else if (itemFormData.value.itemCategoryName === '模拟示波器') { - console.log('模拟示波器') + // 扫描时间系数及扩展 + 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, // 标称值 + measureValue: '', // 测量值 + technicalIndexDefineFront: item.technicalIndexSymbol + item.technicalIndex + item.technicalIndexUnit, // 技术指标 + relativeError: '', // 相对误差 + conclusion: '', // 结论 + } + }) + + // 垂直幅度 + 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, // 标称值 + measureValue: '', // 测量值 + technicalIndexDefineFront: item.technicalIndexSymbol + item.technicalIndex + item.technicalIndexUnit, // 技术指标 + relativeError: '', // 相对误差 + conclusion: '', // 结论 + } + }) + + // 频带宽度 + 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, // 垂直刻度档位 + measureValue: '', // 测量值 + technicalIndexDefineFront: item.technicalIndexSymbol + item.technicalIndex + item.technicalIndexUnit, // 技术指标 + relativeError: '', // 相对误差 + conclusion: '', // 结论 + } + }) + + // 触发特性 + 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, // 频率上限 + outputSignalAmplitude: '', // 测量值 + technicalIndexDefineFront: item.technicalIndexSymbol + item.technicalIndex + item.technicalIndexUnit, // 技术指标 + conclusion: '', // 结论 + } + }) + + // 输入电阻（模拟示波器） + 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, // 阻抗 + measureValue: '', // 测量值 + technicalIndexDefineFront: item.technicalIndexSymbol + item.technicalIndex + item.technicalIndexUnit, // 技术指标 + relativeError: '', // 相对误差 + conclusion: '', // 结论 + } + }) + + // 上升时间（模拟示波器） + 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, // 水平刻度档位 + nominalValueDefineFront: item.nominalValue + item.nominalValueUnit, // 标称值 + riseTime: '', // 上升时间 + correctRiseTime: '', // 修正上升时间 + technicalIndexDefineFront: item.technicalIndexSymbol + item.technicalIndex + item.technicalIndexUnit, // 技术指标 + relativeError: '', // 相对误差 + conclusion: '', // 结论 + } + }) } } @@ -409,7 +588,7 @@ itemFormData.value.triggerCharacter = res.data.triggerCharacter // 触发特性 itemFormData.value.verticalAmplitude = res.data.verticalAmplitude // 垂直幅度 - const tempTimeBaseList = res.data.measureItemDataOscilloscopeList.filter(item => `${item.dataType}` === '1') + const tempTimeBaseList = res.data.measureItemDataOscilloscopeList.filter((item: any) => `${item.dataType}` === '1') if (tempTimeBaseList && tempTimeBaseList.length) { itemFormData.value.methodType = tempTimeBaseList[0].methodType } @@ -421,63 +600,279 @@ // 点击计算结果校验 const checkout = (type: string) => { let result = true - switch (type) { - case '时基': { - const columns = itemFormData.value.methodType === '方法一' ? columns_time_base_method1.value : columns_time_base_method2.value - result = useCheckList(timeBaseList.value, columns, type) - break + if (itemFormData.value.itemCategoryName === '数字示波器') { + switch (type) { + case '时基': { + const columns = itemFormData.value.methodType === '方法一' ? columns_time_base_method1.value : columns_time_base_method2.value + result = useCheckList(timeBaseList.value, columns, type) + break + } + case '直流增益': + result = useCheckList(zeroFrequencyGainList.value, columns_zero_frequency_gain.value, type) + break + case '直流偏置': + result = useCheckList(DCBiasList.value, columns_DC_bias.value, type) + break + case '频带宽度': + result = useCheckList(frequencyBandwidthList.value, columns_frequency_bandwidth.value, type) + break + case '触发灵敏度': + result = useCheckList(triggerSensitivityList.value, columns_trigger_sensitivity.value, type) + break + case '上升时间': + result = useCheckList(risetimeList.value, columns_risetime.value, type) + break + case '输入电阻': + result = useCheckList(inputResistanceList.value, columns_input_resistance.value, type) + break + case '校准信号': + result = useCheckList(calibratingSignalList.value, columns_calibrating_signal.value, type) + break + default: + break } - case '直流增益': - result = useCheckList(zeroFrequencyGainList.value, columns_zero_frequency_gain.value, type) - break - default: - break + } + else if (itemFormData.value.itemCategoryName === '模拟示波器') { + switch (type) { + case '扫描时间系数及扩展': + result = useCheckList(scanningTimeList.value, columns_scan_time.value, type) + break + case '垂直幅度': + result = useCheckList(verticalSizeList.value, columns_vertical_size.value, type) + break + case '频带宽度': + result = useCheckList(frequencyBandwidthSimulateList.value, columns_frequency_bandwidth_simulate.value, type) + break + case '触发特性': + result = useCheckList(triggerCharacteristicList.value, columns_trigger_characteristic.value, type) + break + case '输入电阻': + result = useCheckList(inputResistanceSimulateList.value, columns_input_resistance_simulate.value, type) + break + case '上升时间': + result = useCheckList(risetimeSimulateList.value, columns_risetime_simulate.value, type) + break + default: + break + } } return result } // 计算之前参数处理 const solveParamsBeforeCalculate = (type: string) => { - let list = [] - switch (type) { - case '时基': - list = timeBaseList.value - break - case '直流增益': - list = zeroFrequencyGainList.value - break - default: - break + let list = [] as any + if (itemFormData.value.itemCategoryName === '数字示波器') { + switch (type) { + case '时基': + list = timeBaseList.value + break + case '直流增益': + list = zeroFrequencyGainList.value + break + case '直流偏置': + list = DCBiasList.value + break + case '频带宽度': + list = frequencyBandwidthList.value + break + case '触发灵敏度': + list = triggerSensitivityList.value + break + case '上升时间': + list = risetimeList.value + break + case '输入电阻': + list = inputResistanceList.value + break + case '校准信号': + list = calibratingSignalList.value + break + default: + break + } } + else if (itemFormData.value.itemCategoryName === '模拟示波器') { + switch (type) { + case '扫描时间系数及扩展': + list = scanningTimeList.value + break + case '垂直幅度': + list = verticalSizeList.value + break + case '频带宽度': + list = frequencyBandwidthSimulateList.value + break + case '触发特性': + list = triggerCharacteristicList.value + break + case '输入电阻': + list = inputResistanceSimulateList.value + break + case '上升时间': + list = risetimeSimulateList.value + break + default: + break + } + } + return list } // 计算之后参数处理 -const solveParamsAfterCalculate = (type: string, list) => { - switch (type) { - case '时基': - timeBaseList.value = timeBaseList.value.map((item, index) => { - return { - ...item, - timeBaseRelativeError: list[index].timeBaseRelativeError, - conclusion: list[index].conclusion, - exceedMark: list[index].exceedMark, - } - }) - break - case '直流增益': - zeroFrequencyGainList.value = zeroFrequencyGainList.value.map((item, index) => { - return { - ...item, - relativeError: list[index].relativeError, - conclusion: list[index].conclusion, - exceedMark: list[index].exceedMark, - } - }) - break - default: - break +const solveParamsAfterCalculate = (type: string, list: any) => { + if (itemFormData.value.itemCategoryName === '数字示波器') { + switch (type) { + case '时基': + timeBaseList.value = timeBaseList.value.map((item, index) => { + return { + ...item, + timeBaseRelativeError: list[index].timeBaseRelativeError, + conclusion: list[index].conclusion, + exceedMark: list[index].exceedMark, + } + }) + break + case '直流增益': + zeroFrequencyGainList.value = zeroFrequencyGainList.value.map((item, index) => { + return { + ...item, + relativeError: list[index].relativeError, + conclusion: list[index].conclusion, + exceedMark: list[index].exceedMark, + } + }) + break + case '直流偏置': + DCBiasList.value = DCBiasList.value.map((item, index) => { + return { + ...item, + errorValue: list[index].errorValue + item.standardValueUnit, // 误差 + relativeError: list[index].relativeError, // 相对误差 + conclusion: list[index].conclusion, // 结论 + exceedMark: list[index].exceedMark, + } + }) + break + case '频带宽度': + frequencyBandwidthList.value = frequencyBandwidthList.value.map((item, index) => { + return { + ...item, + decibelNumber: list[index].decibelNumber, // 分贝数(dB) + conclusion: list[index].conclusion, // 结论 + exceedMark: list[index].exceedMark, + } + }) + break + case '触发灵敏度': + triggerSensitivityList.value = triggerSensitivityList.value.map((item, index) => { + return { + ...item, + conclusion: list[index].conclusion, // 结论 + exceedMark: list[index].exceedMark, + } + }) + break + case '上升时间': + risetimeList.value = risetimeList.value.map((item, index) => { + return { + ...item, + conclusion: list[index].conclusion, // 结论 + exceedMark: list[index].exceedMark, + } + }) + break + case '输入电阻': + inputResistanceList.value = inputResistanceList.value.map((item, index) => { + return { + ...item, + relativeError: list[index].relativeError, // 相对误差 + conclusion: list[index].conclusion, // 结论 + exceedMark: list[index].exceedMark, + } + }) + break + case '校准信号': + calibratingSignalList.value = calibratingSignalList.value.map((item, index) => { + return { + ...item, + measureValue: item.itemType === '幅度' ? list[index].measureValue + item.nominalValueUnit : item.measureValue, // 测量值 + relativeError: list[index].relativeError, // 相对误差 + conclusion: list[index].conclusion, // 结论 + exceedMark: list[index].exceedMark, + } + }) + break + default: + break + } } + else if (itemFormData.value.itemCategoryName === '模拟示波器') { + switch (type) { + case '扫描时间系数及扩展': + scanningTimeList.value = scanningTimeList.value.map((item, index) => { + return { + ...item, + relativeError: list[index].relativeError, // 相对误差 + conclusion: list[index].conclusion, // 结论 + exceedMark: list[index].exceedMark, + } + }) + break + case '垂直幅度': + verticalSizeList.value = verticalSizeList.value.map((item, index) => { + return { + ...item, + relativeError: list[index].relativeError, // 相对误差 + conclusion: list[index].conclusion, // 结论 + exceedMark: list[index].exceedMark, + } + }) + break + case '频带宽度': + frequencyBandwidthSimulateList.value = frequencyBandwidthSimulateList.value.map((item, index) => { + return { + ...item, + conclusion: list[index].conclusion, // 结论 + exceedMark: list[index].exceedMark, + } + }) + break + case '触发特性': + triggerCharacteristicList.value = triggerCharacteristicList.value.map((item, index) => { + return { + ...item, + conclusion: list[index].conclusion, // 结论 + exceedMark: list[index].exceedMark, + } + }) + break + case '输入电阻': + triggerCharacteristicList.value = triggerCharacteristicList.value.map((item, index) => { + return { + ...item, + relativeError: list[index].relativeError, // 相对误差 + conclusion: list[index].conclusion, // 结论 + exceedMark: list[index].exceedMark, + } + }) + break + case '上升时间': + risetimeSimulateList.value = risetimeSimulateList.value.map((item, index) => { + return { + ...item, + correctRiseTime: list[index].correctRiseTime, // 修正上升时间 + conclusion: list[index].conclusion, // 结论 + exceedMark: list[index].exceedMark, + } + }) + break + default: + break + } + } + return list } // -----------------------------------------生成结果处理---------------------------------------- @@ -489,10 +884,26 @@ const list = solveParamsBeforeCalculate(type) timeBaseLoading.value = type === '时基' zeroFrequencyGainLoading.value = type === '直流增益' + DCBiasLoading.value = type === '直流偏置' + frequencyBandwidthLoading.value = type === '频带宽度' && itemFormData.value.itemCategoryName === '数字示波器' + triggerSensitivityLoading.value = type === '触发灵敏度' + risetimeLoading.value = type === '上升时间' && itemFormData.value.itemCategoryName === '数字示波器' + inputResistanceLoading.value = type === '输入电阻' && itemFormData.value.itemCategoryName === '数字示波器' + calibratingSignalLoading.value = type === '校准信号' && itemFormData.value.itemCategoryName === '数字示波器' + scanningTimeLoading.value = type === '扫描时间系数及扩展' + verticalSizeLoading.value = type === '垂直幅度' + frequencyBandwidthSimulateLoading.value = type === '频带宽度' && itemFormData.value.itemCategoryName === '模拟示波器' + triggerCharacteristicLoading.value = type === '触发特性' + inputResistanceSimulateLoading.value = type === '输入电阻' && itemFormData.value.itemCategoryName === '模拟示波器' const params = { belongStandardEquipment: itemFormData.value.belongStandardEquipment, // 检校标准装置 itemCategoryName: itemFormData.value.itemCategoryName, // 检定项分类名称 - measureDataOscilloscopeList: list, + measureDataOscilloscopeList: list.map((item: { exceedMark: number }) => { + return { + ...item, + exceedMark: 0, + } + }), } calculateHandle(params).then((res) => { if (res.data && res.data.length) { @@ -500,9 +911,31 @@ } timeBaseLoading.value = false zeroFrequencyGainLoading.value = false + DCBiasLoading.value = false + frequencyBandwidthLoading.value = false + triggerSensitivityLoading.value = false + risetimeLoading.value = false + inputResistanceLoading.value = false + calibratingSignalLoading.value = false + scanningTimeLoading.value = false + verticalSizeLoading.value = false + frequencyBandwidthSimulateLoading.value = false + triggerCharacteristicLoading.value = false + inputResistanceSimulateLoading.value = false }).catch(() => { timeBaseLoading.value = false zeroFrequencyGainLoading.value = false + DCBiasLoading.value = false + frequencyBandwidthLoading.value = false + triggerSensitivityLoading.value = false + risetimeLoading.value = false + inputResistanceLoading.value = false + calibratingSignalLoading.value = false + scanningTimeLoading.value = false + verticalSizeLoading.value = false + frequencyBandwidthSimulateLoading.value = false + triggerCharacteristicLoading.value = false + inputResistanceSimulateLoading.value = false }) } @@ -598,7 +1031,7 @@ 计算结果 - + @@ -608,97 +1041,97 @@ 计算结果 - + - + - + - + - + - + - + - + - + - + diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateTable.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateTable.vue index cf900a1..8a44355 100644 --- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateTable.vue +++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateTable.vue @@ -38,22 +38,28 @@ type: String, default: 'default', }, // 表格大小，默认，small,mini等，与el-table条件相同 + type: String, }) const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'rowDbClick', 'multiSelect', 'filterChange']) // ------------------------------------------字典---------------------------------------------- -const paramsList = ref([]) // 参数 +const standardVoltageList = ref([]) // 电压单位 +const standardTimeUnitList = ref([]) // 时间单位 /** * 获取字典 */ function getDict() { - // 参数 - getDictByCode('bizFirstStandardParams').then((response) => { - paramsList.value = response.data + // 电压单位--公用/垂直偏转系数(/div)单位 + getDictByCode('standardVoltage').then((response) => { + standardVoltageList.value = response.data + }) + // 时间单位 + getDictByCode('standardTimeUnit').then((response) => { + standardTimeUnitList.value = response.data }) } -// getDict() +getDict() // -------定义数据-------------- interface columnsCheckInfo { text: string @@ -151,29 +157,85 @@ - + @@ -608,97 +1041,97 @@ 计算结果 - + - + - + - + - + - + - + - + - + - + diff --git a/src/views/business/taskMeasure/measureData/components/thirteenth/templateTable.vue b/src/views/business/taskMeasure/measureData/components/thirteenth/templateTable.vue index cf900a1..8a44355 100644 --- a/src/views/business/taskMeasure/measureData/components/thirteenth/templateTable.vue +++ b/src/views/business/taskMeasure/measureData/components/thirteenth/templateTable.vue @@ -38,22 +38,28 @@ type: String, default: 'default', }, // 表格大小，默认，small,mini等，与el-table条件相同 + type: String, }) const emit = defineEmits(['change', 'selectionChange', 'rowClick', 'rowDbClick', 'multiSelect', 'filterChange']) // ------------------------------------------字典---------------------------------------------- -const paramsList = ref([]) // 参数 +const standardVoltageList = ref([]) // 电压单位 +const standardTimeUnitList = ref([]) // 时间单位 /** * 获取字典 */ function getDict() { - // 参数 - getDictByCode('bizFirstStandardParams').then((response) => { - paramsList.value = response.data + // 电压单位--公用/垂直偏转系数(/div)单位 + getDictByCode('standardVoltage').then((response) => { + standardVoltageList.value = response.data + }) + // 时间单位 + getDictByCode('standardTimeUnit').then((response) => { + standardTimeUnitList.value = response.data }) } -// getDict() +getDict() // -------定义数据-------------- interface columnsCheckInfo { text: string @@ -151,29 +157,85 @@