diff --git a/src/views/business/measure/item/components/ninth/templateDetail.vue b/src/views/business/measure/item/components/ninth/templateDetail.vue index f4a2422..664a39a 100644 --- a/src/views/business/measure/item/components/ninth/templateDetail.vue +++ b/src/views/business/measure/item/components/ninth/templateDetail.vue @@ -255,7 +255,7 @@ { text: '幅度', value: 'amplitude', align: 'center', required: true, type: 'number' }, { text: '幅度单位', value: 'amplitudeUnit', align: 'center', required: true, type: 'select' }, { text: '技术指标', value: 'technicalIndex', align: 'center', required: true, type: 'number' }, - { text: '是否为参考点', value: 'referencePoint', align: 'center', required: true, type: 'radio', width: 180 }, + { text: '是否为参考点', value: 'referencePoint', align: 'center', required: true, type: 'radio', width: 220 }, ]) const columns_gain_compression_point = ref([ // 1dB增益压缩点 diff --git a/src/views/business/measure/item/components/ninth/templateDetail.vue b/src/views/business/measure/item/components/ninth/templateDetail.vue index f4a2422..664a39a 100644 --- a/src/views/business/measure/item/components/ninth/templateDetail.vue +++ b/src/views/business/measure/item/components/ninth/templateDetail.vue @@ -255,7 +255,7 @@ { text: '幅度', value: 'amplitude', align: 'center', required: true, type: 'number' }, { text: '幅度单位', value: 'amplitudeUnit', align: 'center', required: true, type: 'select' }, { text: '技术指标', value: 'technicalIndex', align: 'center', required: true, type: 'number' }, - { text: '是否为参考点', value: 'referencePoint', align: 'center', required: true, type: 'radio', width: 180 }, + { text: '是否为参考点', value: 'referencePoint', align: 'center', required: true, type: 'radio', width: 220 }, ]) const columns_gain_compression_point = ref([ // 1dB增益压缩点 diff --git a/src/views/business/taskMeasure/measureData/components/fourteen/components/clock.vue b/src/views/business/taskMeasure/measureData/components/fourteen/components/clock.vue index 0e56170..431782d 100644 --- a/src/views/business/taskMeasure/measureData/components/fourteen/components/clock.vue +++ b/src/views/business/taskMeasure/measureData/components/fourteen/components/clock.vue @@ -388,7 +388,8 @@ if (Math.abs(dailyFrequencyDriftRateList.value[0].correlationCoefficientOne) >= 0.6) { // 两条曲线 yAxisData.value = [{ name: '相对频率偏差', symbol: 'rect', data: dailyFrequencyDriftRateList.value.map((item: { relativeFrequencyDeviationOne: string | number }) => item.relativeFrequencyDeviationOne), color: '#000080' }, - { name: '日频率漂移率', symbol: 'none', data: [1, 3, 1, 2, 1], color: '#000000' }, + { name: '日频率漂移率', symbol: 'none', data: dailyFrequencyDriftRateList.value.map((item: { dailyAgingRateOrdinate: string | number }) => item.dailyAgingRateOrdinate), color: '#000000' }, + ] as any console.log(yAxisData.value, 'yAxisData.value') } diff --git a/src/views/business/measure/item/components/ninth/templateDetail.vue b/src/views/business/measure/item/components/ninth/templateDetail.vue index f4a2422..664a39a 100644 --- a/src/views/business/measure/item/components/ninth/templateDetail.vue +++ b/src/views/business/measure/item/components/ninth/templateDetail.vue @@ -255,7 +255,7 @@ { text: '幅度', value: 'amplitude', align: 'center', required: true, type: 'number' }, { text: '幅度单位', value: 'amplitudeUnit', align: 'center', required: true, type: 'select' }, { text: '技术指标', value: 'technicalIndex', align: 'center', required: true, type: 'number' }, - { text: '是否为参考点', value: 'referencePoint', align: 'center', required: true, type: 'radio', width: 180 }, + { text: '是否为参考点', value: 'referencePoint', align: 'center', required: true, type: 'radio', width: 220 }, ]) const columns_gain_compression_point = ref([ // 1dB增益压缩点 diff --git a/src/views/business/taskMeasure/measureData/components/fourteen/components/clock.vue b/src/views/business/taskMeasure/measureData/components/fourteen/components/clock.vue index 0e56170..431782d 100644 --- a/src/views/business/taskMeasure/measureData/components/fourteen/components/clock.vue +++ b/src/views/business/taskMeasure/measureData/components/fourteen/components/clock.vue @@ -388,7 +388,8 @@ if (Math.abs(dailyFrequencyDriftRateList.value[0].correlationCoefficientOne) >= 0.6) { // 两条曲线 yAxisData.value = [{ name: '相对频率偏差', symbol: 'rect', data: dailyFrequencyDriftRateList.value.map((item: { relativeFrequencyDeviationOne: string | number }) => item.relativeFrequencyDeviationOne), color: '#000080' }, - { name: '日频率漂移率', symbol: 'none', data: [1, 3, 1, 2, 1], color: '#000000' }, + { name: '日频率漂移率', symbol: 'none', data: dailyFrequencyDriftRateList.value.map((item: { dailyAgingRateOrdinate: string | number }) => item.dailyAgingRateOrdinate), color: '#000000' }, + ] as any console.log(yAxisData.value, 'yAxisData.value') } diff --git a/src/views/business/taskMeasure/measureData/components/fourteen/components/crystalOscillator.vue b/src/views/business/taskMeasure/measureData/components/fourteen/components/crystalOscillator.vue index b3df003..6421249 100644 --- a/src/views/business/taskMeasure/measureData/components/fourteen/components/crystalOscillator.vue +++ b/src/views/business/taskMeasure/measureData/components/fourteen/components/crystalOscillator.vue @@ -415,7 +415,7 @@ // 两条曲线 yAxisData.value = [ { name: '相对频率偏差', symbol: 'rect', data: dailyAgingRateList.value.map((item: { relativeFrequencyDeviationOne: string | number }) => item.relativeFrequencyDeviationOne), color: '#000080' }, - { name: '日老化率', symbol: 'none', data: [1, 3, 1, 2, 1], color: '#000000' }, + { name: '日老化率', symbol: 'none', data: dailyAgingRateList.value.map((item: { dailyAgingRateOrdinate: string | number }) => item.dailyAgingRateOrdinate), color: '#000000' }, ] as any } else { diff --git a/src/views/business/measure/item/components/ninth/templateDetail.vue b/src/views/business/measure/item/components/ninth/templateDetail.vue index f4a2422..664a39a 100644 --- a/src/views/business/measure/item/components/ninth/templateDetail.vue +++ b/src/views/business/measure/item/components/ninth/templateDetail.vue @@ -255,7 +255,7 @@ { text: '幅度', value: 'amplitude', align: 'center', required: true, type: 'number' }, { text: '幅度单位', value: 'amplitudeUnit', align: 'center', required: true, type: 'select' }, { text: '技术指标', value: 'technicalIndex', align: 'center', required: true, type: 'number' }, - { text: '是否为参考点', value: 'referencePoint', align: 'center', required: true, type: 'radio', width: 180 }, + { text: '是否为参考点', value: 'referencePoint', align: 'center', required: true, type: 'radio', width: 220 }, ]) const columns_gain_compression_point = ref([ // 1dB增益压缩点 diff --git a/src/views/business/taskMeasure/measureData/components/fourteen/components/clock.vue b/src/views/business/taskMeasure/measureData/components/fourteen/components/clock.vue index 0e56170..431782d 100644 --- a/src/views/business/taskMeasure/measureData/components/fourteen/components/clock.vue +++ b/src/views/business/taskMeasure/measureData/components/fourteen/components/clock.vue @@ -388,7 +388,8 @@ if (Math.abs(dailyFrequencyDriftRateList.value[0].correlationCoefficientOne) >= 0.6) { // 两条曲线 yAxisData.value = [{ name: '相对频率偏差', symbol: 'rect', data: dailyFrequencyDriftRateList.value.map((item: { relativeFrequencyDeviationOne: string | number }) => item.relativeFrequencyDeviationOne), color: '#000080' }, - { name: '日频率漂移率', symbol: 'none', data: [1, 3, 1, 2, 1], color: '#000000' }, + { name: '日频率漂移率', symbol: 'none', data: dailyFrequencyDriftRateList.value.map((item: { dailyAgingRateOrdinate: string | number }) => item.dailyAgingRateOrdinate), color: '#000000' }, + ] as any console.log(yAxisData.value, 'yAxisData.value') } diff --git a/src/views/business/taskMeasure/measureData/components/fourteen/components/crystalOscillator.vue b/src/views/business/taskMeasure/measureData/components/fourteen/components/crystalOscillator.vue index b3df003..6421249 100644 --- a/src/views/business/taskMeasure/measureData/components/fourteen/components/crystalOscillator.vue +++ b/src/views/business/taskMeasure/measureData/components/fourteen/components/crystalOscillator.vue @@ -415,7 +415,7 @@ // 两条曲线 yAxisData.value = [ { name: '相对频率偏差', symbol: 'rect', data: dailyAgingRateList.value.map((item: { relativeFrequencyDeviationOne: string | number }) => item.relativeFrequencyDeviationOne), color: '#000080' }, - { name: '日老化率', symbol: 'none', data: [1, 3, 1, 2, 1], color: '#000000' }, + { name: '日老化率', symbol: 'none', data: dailyAgingRateList.value.map((item: { dailyAgingRateOrdinate: string | number }) => item.dailyAgingRateOrdinate), color: '#000000' }, ] as any } else { diff --git a/src/views/business/taskMeasure/measureData/components/fourteen/components/universalCounter.vue b/src/views/business/taskMeasure/measureData/components/fourteen/components/universalCounter.vue index e6d2591..703048e 100644 --- a/src/views/business/taskMeasure/measureData/components/fourteen/components/universalCounter.vue +++ b/src/views/business/taskMeasure/measureData/components/fourteen/components/universalCounter.vue @@ -589,7 +589,7 @@ if (Math.abs(crystalOscillatorDailyAgingRateList.value[0].correlationCoefficientOne) >= 0.6) { // 两条曲线 yAxisData.value = [{ name: '相对频率偏差', symbol: 'rect', data: crystalOscillatorDailyAgingRateList.value.map((item: { relativeFrequencyDeviationOne: string | number }) => item.relativeFrequencyDeviationOne), color: '#000080' }, - { name: '日老化率', symbol: 'none', data: [1, 3, 1, 2, 1], color: '#000000' }, + { name: '日老化率', symbol: 'none', data: crystalOscillatorDailyAgingRateList.value.map((item: { dailyAgingRateOrdinate: string | number }) => item.dailyAgingRateOrdinate), color: '#000000' }, ] as any console.log(yAxisData.value, 'yAxisData.valueyAxisData.value') } diff --git a/src/views/business/measure/item/components/ninth/templateDetail.vue b/src/views/business/measure/item/components/ninth/templateDetail.vue index f4a2422..664a39a 100644 --- a/src/views/business/measure/item/components/ninth/templateDetail.vue +++ b/src/views/business/measure/item/components/ninth/templateDetail.vue @@ -255,7 +255,7 @@ { text: '幅度', value: 'amplitude', align: 'center', required: true, type: 'number' }, { text: '幅度单位', value: 'amplitudeUnit', align: 'center', required: true, type: 'select' }, { text: '技术指标', value: 'technicalIndex', align: 'center', required: true, type: 'number' }, - { text: '是否为参考点', value: 'referencePoint', align: 'center', required: true, type: 'radio', width: 180 }, + { text: '是否为参考点', value: 'referencePoint', align: 'center', required: true, type: 'radio', width: 220 }, ]) const columns_gain_compression_point = ref([ // 1dB增益压缩点 diff --git a/src/views/business/taskMeasure/measureData/components/fourteen/components/clock.vue b/src/views/business/taskMeasure/measureData/components/fourteen/components/clock.vue index 0e56170..431782d 100644 --- a/src/views/business/taskMeasure/measureData/components/fourteen/components/clock.vue +++ b/src/views/business/taskMeasure/measureData/components/fourteen/components/clock.vue @@ -388,7 +388,8 @@ if (Math.abs(dailyFrequencyDriftRateList.value[0].correlationCoefficientOne) >= 0.6) { // 两条曲线 yAxisData.value = [{ name: '相对频率偏差', symbol: 'rect', data: dailyFrequencyDriftRateList.value.map((item: { relativeFrequencyDeviationOne: string | number }) => item.relativeFrequencyDeviationOne), color: '#000080' }, - { name: '日频率漂移率', symbol: 'none', data: [1, 3, 1, 2, 1], color: '#000000' }, + { name: '日频率漂移率', symbol: 'none', data: dailyFrequencyDriftRateList.value.map((item: { dailyAgingRateOrdinate: string | number }) => item.dailyAgingRateOrdinate), color: '#000000' }, + ] as any console.log(yAxisData.value, 'yAxisData.value') } diff --git a/src/views/business/taskMeasure/measureData/components/fourteen/components/crystalOscillator.vue b/src/views/business/taskMeasure/measureData/components/fourteen/components/crystalOscillator.vue index b3df003..6421249 100644 --- a/src/views/business/taskMeasure/measureData/components/fourteen/components/crystalOscillator.vue +++ b/src/views/business/taskMeasure/measureData/components/fourteen/components/crystalOscillator.vue @@ -415,7 +415,7 @@ // 两条曲线 yAxisData.value = [ { name: '相对频率偏差', symbol: 'rect', data: dailyAgingRateList.value.map((item: { relativeFrequencyDeviationOne: string | number }) => item.relativeFrequencyDeviationOne), color: '#000080' }, - { name: '日老化率', symbol: 'none', data: [1, 3, 1, 2, 1], color: '#000000' }, + { name: '日老化率', symbol: 'none', data: dailyAgingRateList.value.map((item: { dailyAgingRateOrdinate: string | number }) => item.dailyAgingRateOrdinate), color: '#000000' }, ] as any } else { diff --git a/src/views/business/taskMeasure/measureData/components/fourteen/components/universalCounter.vue b/src/views/business/taskMeasure/measureData/components/fourteen/components/universalCounter.vue index e6d2591..703048e 100644 --- a/src/views/business/taskMeasure/measureData/components/fourteen/components/universalCounter.vue +++ b/src/views/business/taskMeasure/measureData/components/fourteen/components/universalCounter.vue @@ -589,7 +589,7 @@ if (Math.abs(crystalOscillatorDailyAgingRateList.value[0].correlationCoefficientOne) >= 0.6) { // 两条曲线 yAxisData.value = [{ name: '相对频率偏差', symbol: 'rect', data: crystalOscillatorDailyAgingRateList.value.map((item: { relativeFrequencyDeviationOne: string | number }) => item.relativeFrequencyDeviationOne), color: '#000080' }, - { name: '日老化率', symbol: 'none', data: [1, 3, 1, 2, 1], color: '#000000' }, + { name: '日老化率', symbol: 'none', data: crystalOscillatorDailyAgingRateList.value.map((item: { dailyAgingRateOrdinate: string | number }) => item.dailyAgingRateOrdinate), color: '#000000' }, ] as any console.log(yAxisData.value, 'yAxisData.valueyAxisData.value') } diff --git a/src/views/business/taskMeasure/measureData/components/ninth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/ninth/templateDetail.vue index d5a1e18..f789db0 100644 --- a/src/views/business/taskMeasure/measureData/components/ninth/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/ninth/templateDetail.vue @@ -336,11 +336,11 @@ { text: '检定项目', value: 'params', align: 'center', required: false, type: 'text' }, { text: '类型', value: 'typeValue', align: 'center', required: false, type: 'text' }, { text: '标称值', value: 'nominalValue', align: 'center', required: false, type: 'text' }, - { text: '测量值1', value: 'oneValue', align: 'center', required: true, type: 'text' }, - { text: '测量值2', value: 'twoValue', align: 'center', required: true, type: 'text' }, - { text: '测量值3', value: 'threeValue', align: 'center', required: true, type: 'text' }, + { text: '测量值1', value: 'oneValue', align: 'center', required: true, type: '' }, + { text: '测量值2', value: 'twoValue', align: 'center', required: true, type: '' }, + { text: '测量值3', value: 'threeValue', align: 'center', required: true, type: '' }, { text: '指标下限', value: 'lowerIndex', align: 'center', required: false, type: 'text' }, - { text: '测量结果', value: 'measureResult', align: 'center', required: false, type: 'text' }, + { text: '测量结果', value: 'measureResult', align: 'center', required: false, type: '' }, { text: '指标上限', value: 'upperIndex', align: 'center', required: false, type: 'text' }, { text: '结论', value: 'conclusion', align: 'center', required: false, type: 'text' }, ]) @@ -455,7 +455,7 @@ break case '5': // 参考电平 - referenceElectricalLevelList.value.push({ ...item, params: '参考电平', signalSourceAmplitude: Number(item.signalSourceAmplitude) || '', standardAttenuatorAttenuation: item.standardAttenuatorAttenuation || '', upperIndex: Number(item.referencePoint) === 1 ? '参考点' : (item.upperIndex || clearSymbol(item.technicalIndex) || ''), lowerIndex: Number(item.referencePoint) === 1 ? '参考点' : (item.lowerIndex || `-${clearSymbol(item.technicalIndex)}` || ''), conclusion: Number(item.referencePoint) === 1 ? '参考点' : item.conclusion || '', oneValue: Number(item.referencePoint) === 1 ? '参考点' : (item.oneValue || '') }) + referenceElectricalLevelList.value.push({ ...item, params: '参考电平', signalSourceAmplitude: Number(item.amplitude) || Number(item.signalSourceAmplitude) || '', standardAttenuatorAttenuation: item.standardAttenuatorAttenuation || '', upperIndex: Number(item.referencePoint) === 1 ? '参考点' : (item.upperIndex || clearSymbol(item.technicalIndex) || ''), lowerIndex: Number(item.referencePoint) === 1 ? '参考点' : (item.lowerIndex || `-${clearSymbol(item.technicalIndex)}` || ''), conclusion: Number(item.referencePoint) === 1 ? '参考点' : item.conclusion || '', oneValue: Number(item.referencePoint) === 1 ? '参考点' : (item.oneValue || '') }) break case '6': // 垂直刻度 @@ -475,7 +475,7 @@ break case '10': // 输入衰减 - inputAttenuatorList.value.push({ ...item, params: '输入衰减', oneValue: item.oneValue || '', conclusion: Number(item.referencePoint) === 1 ? '参考点' : item.conclusion || '', upperIndex: Number(item.referencePoint) === 1 ? '参考点' : (item.upperIndex || clearSymbol(item.technicalIndex) || ''), lowerIndex: Number(item.referencePoint) === 1 ? '参考点' : (item.lowerIndex || `-${clearSymbol(item.technicalIndex)}` || '') }) + inputAttenuatorList.value.push({ ...item, params: '输入衰减', oneValue: item.oneValue || '', inputAttenuator: Number(item.referencePoint) === 1 ? '参考点' : item.inputAttenuator || '', conclusion: Number(item.referencePoint) === 1 ? '参考点' : item.conclusion || '', upperIndex: Number(item.referencePoint) === 1 ? '参考点' : (item.upperIndex || clearSymbol(item.technicalIndex) || ''), lowerIndex: Number(item.referencePoint) === 1 ? '参考点' : (item.lowerIndex || `-${clearSymbol(item.technicalIndex)}` || '') }) break case '11': // 1dB增益压缩点 @@ -483,7 +483,7 @@ break case '12': // 校准信号 - calibratingSignalList.value.push({ ...item, params: '校准信号', oneValue: item.typeValue === '频率' ? '/' : item.oneValue || '', twoValue: item.typeValue === '频率' ? '/' : item.twoValue || '', threeValue: item.typeValue === '频率' ? '/' : item.threeValue || '' }) + calibratingSignalList.value.push({ ...item, params: '校准信号', oneValue: item.typeValue === '频率' ? '/' : item.oneValue || '', twoValue: item.typeValue === '频率' ? '/' : item.twoValue || '', threeValue: item.typeValue === '频率' ? '/' : item.threeValue || '', measureResult: item.measureResult || '' }) calibratingSignalList.value = calibratingSignalList.value.map((item: any) => ({ ...item, typeValue: item.typeValue || (item.oneValue === '/' ? '频率' : '幅度') })) break } @@ -816,6 +816,9 @@ +