diff --git a/src/views/business/measure/item/components/fourteen/components/clock.vue b/src/views/business/measure/item/components/fourteen/components/clock.vue index 9e01f9c..8c4c541 100644 --- a/src/views/business/measure/item/components/fourteen/components/clock.vue +++ b/src/views/business/measure/item/components/fourteen/components/clock.vue @@ -393,7 +393,13 @@ let result = [] as any[] for (const i in chekedDict) { if ((chekedDict[i] === '1' || chekedDict[i] === 1) && chekedDict[i]) { - const data = listDict.value[i].map((item: any) => ({ ...item, technicalIndex: item.technicalIndex ? `${item.technicalIndexSymbol || ''}${item.technicalIndex}` : '/' })) + const data = listDict.value[i].map((item: any) => ({ + ...item, + technicalIndex: item.technicalIndex ? `${item.technicalIndexSymbol || ''}${item.technicalIndex}` : '/', + urel: item.urel ? item.urel : '/', + testedSignalFrequency: item.testedSignalFrequency ? item.testedSignalFrequency : '/', + multiplyFrequency: item.multiplyFrequency ? item.multiplyFrequency : '/', + })) result = [...result, ...data] } } diff --git a/src/views/business/measure/item/components/fourteen/components/clock.vue b/src/views/business/measure/item/components/fourteen/components/clock.vue index 9e01f9c..8c4c541 100644 --- a/src/views/business/measure/item/components/fourteen/components/clock.vue +++ b/src/views/business/measure/item/components/fourteen/components/clock.vue @@ -393,7 +393,13 @@ let result = [] as any[] for (const i in chekedDict) { if ((chekedDict[i] === '1' || chekedDict[i] === 1) && chekedDict[i]) { - const data = listDict.value[i].map((item: any) => ({ ...item, technicalIndex: item.technicalIndex ? `${item.technicalIndexSymbol || ''}${item.technicalIndex}` : '/' })) + const data = listDict.value[i].map((item: any) => ({ + ...item, + technicalIndex: item.technicalIndex ? `${item.technicalIndexSymbol || ''}${item.technicalIndex}` : '/', + urel: item.urel ? item.urel : '/', + testedSignalFrequency: item.testedSignalFrequency ? item.testedSignalFrequency : '/', + multiplyFrequency: item.multiplyFrequency ? item.multiplyFrequency : '/', + })) result = [...result, ...data] } } diff --git a/src/views/business/measure/item/components/fourteen/components/crystalOscillator.vue b/src/views/business/measure/item/components/fourteen/components/crystalOscillator.vue index dd9941c..04e271e 100644 --- a/src/views/business/measure/item/components/fourteen/components/crystalOscillator.vue +++ b/src/views/business/measure/item/components/fourteen/components/crystalOscillator.vue @@ -395,7 +395,16 @@ let result = [] as any[] for (const i in chekedDict) { if ((chekedDict[i] === '1' || chekedDict[i] === 1) && chekedDict[i]) { - const data = listDict.value[i].map((item: any) => ({ ...item, technicalIndex: item.technicalIndex ? `${item.technicalIndexSymbol || ''}${item.technicalIndex}` : '/' })) + const data = listDict.value[i].map((item: any) => ({ + ...item, + technicalIndex: item.technicalIndex ? `${item.technicalIndexSymbol || ''}${item.technicalIndex}` : '/', + urel: item.urel ? item.urel : '/', + multiplyFrequency: item.multiplyFrequency ? item.multiplyFrequency : '/', + amplitudeTechnicalIndexLower: item.amplitudeTechnicalIndexLower ? item.amplitudeTechnicalIndexLower : '/', + amplitudeTechnicalIndexUpper: item.amplitudeTechnicalIndexUpper ? item.amplitudeTechnicalIndexUpper : '/', + pulseWidthTechnicalIndexLower: item.pulseWidthTechnicalIndexLower ? item.pulseWidthTechnicalIndexLower : '/', + pulseWidthTechnicalIndexUpper: item.pulseWidthTechnicalIndexUpper ? item.pulseWidthTechnicalIndexUpper : '/', + })) result = [...result, ...data] } } diff --git a/src/views/business/measure/item/components/fourteen/components/clock.vue b/src/views/business/measure/item/components/fourteen/components/clock.vue index 9e01f9c..8c4c541 100644 --- a/src/views/business/measure/item/components/fourteen/components/clock.vue +++ b/src/views/business/measure/item/components/fourteen/components/clock.vue @@ -393,7 +393,13 @@ let result = [] as any[] for (const i in chekedDict) { if ((chekedDict[i] === '1' || chekedDict[i] === 1) && chekedDict[i]) { - const data = listDict.value[i].map((item: any) => ({ ...item, technicalIndex: item.technicalIndex ? `${item.technicalIndexSymbol || ''}${item.technicalIndex}` : '/' })) + const data = listDict.value[i].map((item: any) => ({ + ...item, + technicalIndex: item.technicalIndex ? `${item.technicalIndexSymbol || ''}${item.technicalIndex}` : '/', + urel: item.urel ? item.urel : '/', + testedSignalFrequency: item.testedSignalFrequency ? item.testedSignalFrequency : '/', + multiplyFrequency: item.multiplyFrequency ? item.multiplyFrequency : '/', + })) result = [...result, ...data] } } diff --git a/src/views/business/measure/item/components/fourteen/components/crystalOscillator.vue b/src/views/business/measure/item/components/fourteen/components/crystalOscillator.vue index dd9941c..04e271e 100644 --- a/src/views/business/measure/item/components/fourteen/components/crystalOscillator.vue +++ b/src/views/business/measure/item/components/fourteen/components/crystalOscillator.vue @@ -395,7 +395,16 @@ let result = [] as any[] for (const i in chekedDict) { if ((chekedDict[i] === '1' || chekedDict[i] === 1) && chekedDict[i]) { - const data = listDict.value[i].map((item: any) => ({ ...item, technicalIndex: item.technicalIndex ? `${item.technicalIndexSymbol || ''}${item.technicalIndex}` : '/' })) + const data = listDict.value[i].map((item: any) => ({ + ...item, + technicalIndex: item.technicalIndex ? `${item.technicalIndexSymbol || ''}${item.technicalIndex}` : '/', + urel: item.urel ? item.urel : '/', + multiplyFrequency: item.multiplyFrequency ? item.multiplyFrequency : '/', + amplitudeTechnicalIndexLower: item.amplitudeTechnicalIndexLower ? item.amplitudeTechnicalIndexLower : '/', + amplitudeTechnicalIndexUpper: item.amplitudeTechnicalIndexUpper ? item.amplitudeTechnicalIndexUpper : '/', + pulseWidthTechnicalIndexLower: item.pulseWidthTechnicalIndexLower ? item.pulseWidthTechnicalIndexLower : '/', + pulseWidthTechnicalIndexUpper: item.pulseWidthTechnicalIndexUpper ? item.pulseWidthTechnicalIndexUpper : '/', + })) result = [...result, ...data] } } diff --git a/src/views/business/measure/item/components/fourteen/components/universalCounter.vue b/src/views/business/measure/item/components/fourteen/components/universalCounter.vue index 8b96d9e..6c38548 100644 --- a/src/views/business/measure/item/components/fourteen/components/universalCounter.vue +++ b/src/views/business/measure/item/components/fourteen/components/universalCounter.vue @@ -585,7 +585,13 @@ let result = [] as any[] for (const i in chekedDict) { if ((chekedDict[i] === '1' || chekedDict[i] === 1) && chekedDict[i]) { - const data = listDict.value[i].map((item: any) => ({ ...item, technicalIndex: item.technicalIndex ? `${item.technicalIndexSymbol || ''}${item.technicalIndex}` : '/' })) + const data = listDict.value[i].map((item: any) => ({ + ...item, + technicalIndex: item.technicalIndex ? `${item.technicalIndexSymbol || ''}${item.technicalIndex}` : '/', + urel: item.urel ? item.urel : '/', + multiplyFrequency: item.multiplyFrequency ? item.multiplyFrequency : '/', + otherTechnicalIndex: item.otherTechnicalIndex ? item.otherTechnicalIndex : '/', + })) result = [...result, ...data] } } diff --git a/src/views/business/measure/item/components/fourteen/components/clock.vue b/src/views/business/measure/item/components/fourteen/components/clock.vue index 9e01f9c..8c4c541 100644 --- a/src/views/business/measure/item/components/fourteen/components/clock.vue +++ b/src/views/business/measure/item/components/fourteen/components/clock.vue @@ -393,7 +393,13 @@ let result = [] as any[] for (const i in chekedDict) { if ((chekedDict[i] === '1' || chekedDict[i] === 1) && chekedDict[i]) { - const data = listDict.value[i].map((item: any) => ({ ...item, technicalIndex: item.technicalIndex ? `${item.technicalIndexSymbol || ''}${item.technicalIndex}` : '/' })) + const data = listDict.value[i].map((item: any) => ({ + ...item, + technicalIndex: item.technicalIndex ? `${item.technicalIndexSymbol || ''}${item.technicalIndex}` : '/', + urel: item.urel ? item.urel : '/', + testedSignalFrequency: item.testedSignalFrequency ? item.testedSignalFrequency : '/', + multiplyFrequency: item.multiplyFrequency ? item.multiplyFrequency : '/', + })) result = [...result, ...data] } } diff --git a/src/views/business/measure/item/components/fourteen/components/crystalOscillator.vue b/src/views/business/measure/item/components/fourteen/components/crystalOscillator.vue index dd9941c..04e271e 100644 --- a/src/views/business/measure/item/components/fourteen/components/crystalOscillator.vue +++ b/src/views/business/measure/item/components/fourteen/components/crystalOscillator.vue @@ -395,7 +395,16 @@ let result = [] as any[] for (const i in chekedDict) { if ((chekedDict[i] === '1' || chekedDict[i] === 1) && chekedDict[i]) { - const data = listDict.value[i].map((item: any) => ({ ...item, technicalIndex: item.technicalIndex ? `${item.technicalIndexSymbol || ''}${item.technicalIndex}` : '/' })) + const data = listDict.value[i].map((item: any) => ({ + ...item, + technicalIndex: item.technicalIndex ? `${item.technicalIndexSymbol || ''}${item.technicalIndex}` : '/', + urel: item.urel ? item.urel : '/', + multiplyFrequency: item.multiplyFrequency ? item.multiplyFrequency : '/', + amplitudeTechnicalIndexLower: item.amplitudeTechnicalIndexLower ? item.amplitudeTechnicalIndexLower : '/', + amplitudeTechnicalIndexUpper: item.amplitudeTechnicalIndexUpper ? item.amplitudeTechnicalIndexUpper : '/', + pulseWidthTechnicalIndexLower: item.pulseWidthTechnicalIndexLower ? item.pulseWidthTechnicalIndexLower : '/', + pulseWidthTechnicalIndexUpper: item.pulseWidthTechnicalIndexUpper ? item.pulseWidthTechnicalIndexUpper : '/', + })) result = [...result, ...data] } } diff --git a/src/views/business/measure/item/components/fourteen/components/universalCounter.vue b/src/views/business/measure/item/components/fourteen/components/universalCounter.vue index 8b96d9e..6c38548 100644 --- a/src/views/business/measure/item/components/fourteen/components/universalCounter.vue +++ b/src/views/business/measure/item/components/fourteen/components/universalCounter.vue @@ -585,7 +585,13 @@ let result = [] as any[] for (const i in chekedDict) { if ((chekedDict[i] === '1' || chekedDict[i] === 1) && chekedDict[i]) { - const data = listDict.value[i].map((item: any) => ({ ...item, technicalIndex: item.technicalIndex ? `${item.technicalIndexSymbol || ''}${item.technicalIndex}` : '/' })) + const data = listDict.value[i].map((item: any) => ({ + ...item, + technicalIndex: item.technicalIndex ? `${item.technicalIndexSymbol || ''}${item.technicalIndex}` : '/', + urel: item.urel ? item.urel : '/', + multiplyFrequency: item.multiplyFrequency ? item.multiplyFrequency : '/', + otherTechnicalIndex: item.otherTechnicalIndex ? item.otherTechnicalIndex : '/', + })) result = [...result, ...data] } } diff --git a/src/views/business/measure/item/components/sixth/templateDetail.vue b/src/views/business/measure/item/components/sixth/templateDetail.vue index d082121..48e0223 100644 --- a/src/views/business/measure/item/components/sixth/templateDetail.vue +++ b/src/views/business/measure/item/components/sixth/templateDetail.vue @@ -43,21 +43,21 @@ const form = ref({ appearanceFunctionCheck: 1, sealingTest: 1, - zdyl: 1, + rippleVoltage: 1, }) watch(() => props.form, (newVal) => { if (newVal) { form.value = newVal } }) -watch(() => props.list, (newVal) => { - if (newVal && newVal.length) { - form.value.zdyl = 1 - } - else { - form.value.zdyl = 0 - } -}) +// watch(() => props.list, (newVal) => { +// if (newVal && newVal.length) { +// form.value.rippleVoltage = 1 +// } +// else { +// form.value.rippleVoltage = 0 +// } +// }) // ---------------------------------------------校验--------------------------------------------------- // ------------------------------------------------------------------------------------------------ @@ -102,7 +102,7 @@ } }) const getList = () => { - if (Number(form.value.zdyl)) { + if (Number(form.value.rippleVoltage)) { return list.value } else { @@ -182,12 +182,12 @@
- + 整定压力
- +