diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue index 3294ccd..dfca16f 100644 --- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue @@ -344,6 +344,7 @@ return { ...item, lessThan: '', + qualified: '', } }), itemCategoryId: itemCategoryId.value, // 核查项分类id @@ -379,11 +380,14 @@ listStability.value = resultList // 计算稳定性考核是否合格 - if (resultList.every((item: { lessThan: string | number }) => item.lessThan === '合格')) { - form.value.qualified = '合格' - } - else { - form.value.qualified = '不合格' + // if (resultList.every((item: { lessThan: string | number }) => item.lessThan === '合格')) { + // form.value.qualified = '合格' + // } + // else { + // form.value.qualified = '不合格' + // } + if (listStability.value && listStability.value.length) { + form.value.qualified = `${listStability.value[0].qualified}1` === '1' ? '合格' : '不合格' } } @@ -400,10 +404,6 @@ // ------------------------------------------------------------------------------------------ // 处理详情数据 const solveGetDetailData = (responseList: any) => { - form.value.qualified = responseList[0].qualified === 1 ? '合格' : '不合格' - console.log(originList.value) - console.log(originList.value[0].kc) - const list = responseList.map((item: any) => { return { ...item, @@ -457,6 +457,10 @@ } }) // 稳定性 + if (listStability && listStability.length) { + form.value.qualified = `${listStability[0].qualified}1` === '1' ? '合格' : '不合格' + } + return { templistRepeatability: listRepeatability, templistStability: listStability, diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue index 3294ccd..dfca16f 100644 --- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue @@ -344,6 +344,7 @@ return { ...item, lessThan: '', + qualified: '', } }), itemCategoryId: itemCategoryId.value, // 核查项分类id @@ -379,11 +380,14 @@ listStability.value = resultList // 计算稳定性考核是否合格 - if (resultList.every((item: { lessThan: string | number }) => item.lessThan === '合格')) { - form.value.qualified = '合格' - } - else { - form.value.qualified = '不合格' + // if (resultList.every((item: { lessThan: string | number }) => item.lessThan === '合格')) { + // form.value.qualified = '合格' + // } + // else { + // form.value.qualified = '不合格' + // } + if (listStability.value && listStability.value.length) { + form.value.qualified = `${listStability.value[0].qualified}1` === '1' ? '合格' : '不合格' } } @@ -400,10 +404,6 @@ // ------------------------------------------------------------------------------------------ // 处理详情数据 const solveGetDetailData = (responseList: any) => { - form.value.qualified = responseList[0].qualified === 1 ? '合格' : '不合格' - console.log(originList.value) - console.log(originList.value[0].kc) - const list = responseList.map((item: any) => { return { ...item, @@ -457,6 +457,10 @@ } }) // 稳定性 + if (listStability && listStability.length) { + form.value.qualified = `${listStability[0].qualified}1` === '1' ? '合格' : '不合格' + } + return { templistRepeatability: listRepeatability, templistStability: listStability, diff --git a/src/views/equipement/standard/checkData/components/seventeenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/seventeenth/checkDataCom.vue index 0097f67..a1825ac 100644 --- a/src/views/equipement/standard/checkData/components/seventeenth/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/seventeenth/checkDataCom.vue @@ -694,7 +694,7 @@ // 处理详情数据 const solveGetDetailData = (responseList: any) => { console.log('处理详情数据', props.pageType) - form.value.qualified = responseList[0].qualified === 1 ? '合格' : '不合格' + // form.value.qualified = responseList[0].qualified === 1 ? '合格' : '不合格' const list = responseList.map((item: any) => { let unit = '' switch (item.params) { @@ -728,6 +728,13 @@ } }) + // 稳定性考核是否合格 + let tempStabilityList = [] + tempStabilityList = list.filter((item: { checkType: string }) => item.checkType === '稳定性') + if (tempStabilityList.length) { + form.value.qualified = tempStabilityList[0].qualified === 1 ? '合格' : '不合格' + } + const listMismatchRepeatability = list.filter((item: { params: string; checkType: string }) => item.checkType === '重复性' && item.params === '失配测量') // 失配测量-重复性 const listAttenuationRepeatability = list.filter((item: { params: string; checkType: string }) => item.checkType === '重复性' && item.params === '衰减测量') // 衰减测量-重复性 const listPhaseRepeatability = list.filter((item: { params: string; checkType: string }) => item.checkType === '重复性' && item.params === '相移测量') // 相移测量-重复性 diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue index 3294ccd..dfca16f 100644 --- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue @@ -344,6 +344,7 @@ return { ...item, lessThan: '', + qualified: '', } }), itemCategoryId: itemCategoryId.value, // 核查项分类id @@ -379,11 +380,14 @@ listStability.value = resultList // 计算稳定性考核是否合格 - if (resultList.every((item: { lessThan: string | number }) => item.lessThan === '合格')) { - form.value.qualified = '合格' - } - else { - form.value.qualified = '不合格' + // if (resultList.every((item: { lessThan: string | number }) => item.lessThan === '合格')) { + // form.value.qualified = '合格' + // } + // else { + // form.value.qualified = '不合格' + // } + if (listStability.value && listStability.value.length) { + form.value.qualified = `${listStability.value[0].qualified}1` === '1' ? '合格' : '不合格' } } @@ -400,10 +404,6 @@ // ------------------------------------------------------------------------------------------ // 处理详情数据 const solveGetDetailData = (responseList: any) => { - form.value.qualified = responseList[0].qualified === 1 ? '合格' : '不合格' - console.log(originList.value) - console.log(originList.value[0].kc) - const list = responseList.map((item: any) => { return { ...item, @@ -457,6 +457,10 @@ } }) // 稳定性 + if (listStability && listStability.length) { + form.value.qualified = `${listStability[0].qualified}1` === '1' ? '合格' : '不合格' + } + return { templistRepeatability: listRepeatability, templistStability: listStability, diff --git a/src/views/equipement/standard/checkData/components/seventeenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/seventeenth/checkDataCom.vue index 0097f67..a1825ac 100644 --- a/src/views/equipement/standard/checkData/components/seventeenth/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/seventeenth/checkDataCom.vue @@ -694,7 +694,7 @@ // 处理详情数据 const solveGetDetailData = (responseList: any) => { console.log('处理详情数据', props.pageType) - form.value.qualified = responseList[0].qualified === 1 ? '合格' : '不合格' + // form.value.qualified = responseList[0].qualified === 1 ? '合格' : '不合格' const list = responseList.map((item: any) => { let unit = '' switch (item.params) { @@ -728,6 +728,13 @@ } }) + // 稳定性考核是否合格 + let tempStabilityList = [] + tempStabilityList = list.filter((item: { checkType: string }) => item.checkType === '稳定性') + if (tempStabilityList.length) { + form.value.qualified = tempStabilityList[0].qualified === 1 ? '合格' : '不合格' + } + const listMismatchRepeatability = list.filter((item: { params: string; checkType: string }) => item.checkType === '重复性' && item.params === '失配测量') // 失配测量-重复性 const listAttenuationRepeatability = list.filter((item: { params: string; checkType: string }) => item.checkType === '重复性' && item.params === '衰减测量') // 衰减测量-重复性 const listPhaseRepeatability = list.filter((item: { params: string; checkType: string }) => item.checkType === '重复性' && item.params === '相移测量') // 相移测量-重复性 diff --git a/src/views/equipement/standard/checkData/components/tenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/tenth/checkDataCom.vue index 6e948ec..be62ed4 100644 --- a/src/views/equipement/standard/checkData/components/tenth/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/tenth/checkDataCom.vue @@ -13,6 +13,7 @@ import multiTable from '@/components/MultiHeaderTable/index.vue' import { addCheckData, calculateHandle, getHistoryIndication, getInfo, updateCheckData } from '@/api/equipment/standard/checkData' import { getCheckItemDetail, getJobInstructionList } from '@/api/equipment/standard/book' +import { getDataNum, getDataUnit } from '@/utils/validate' const props = defineProps({ selectStandardId: { // 选择的标准装置id @@ -1098,11 +1099,17 @@ const params = { belongStandardEquipment: belongStandardEquipment.value, // 检校标准装置 - checkDataSignalGeneratorList: checkDataSignalGeneratorListParams.map((item: { conclusion: string }) => { + checkDataSignalGeneratorList: checkDataSignalGeneratorListParams.map((item: any) => { return { ...item, conclusion: '', lessThan: '', + testValueOne: getDataNum(item.testValueOne) == null ? '' : getDataNum(item.testValueOne), // 测量值1 + testValueTwo: getDataNum(item.testValueTwo) == null ? '' : getDataNum(item.testValueTwo), // 测量值2 + testValueThree: getDataNum(item.testValueThree) == null ? '' : getDataNum(item.testValueThree), // 测量值3 + testValueFour: getDataNum(item.testValueFour) == null ? '' : getDataNum(item.testValueFour), // 测量值4 + testValueFive: getDataNum(item.testValueFive) == null ? '' : getDataNum(item.testValueFive), // 测量值5 + testValueSix: getDataNum(item.testValueSix) == null ? '' : getDataNum(item.testValueSix), // 测量值6 } }), itemCategoryId: itemCategoryId.value, // 核查项分类id @@ -1316,7 +1323,7 @@ // 处理详情数据 const solveGetDetailData = (responseList: any) => { console.log('处理详情数据', props.pageType) - form.value.qualified = responseList[0].qualified === 1 ? '合格' : '不合格' + const list = responseList.map((item: any) => { let unit = '' switch (item.params) { @@ -1365,6 +1372,13 @@ } }) + // 稳定性考核是否合格 + let tempStabilityList = [] + tempStabilityList = list.filter((item: { checkType: string }) => item.checkType === '稳定性') + if (tempStabilityList.length) { + form.value.qualified = tempStabilityList[0].qualified === 1 ? '合格' : '不合格' + } + const listFrequencyRepeatability = list.filter((item: { params: string; checkType: string }) => item.checkType === '重复性' && item.params === '频率') // 频率-重复性 const listPowerLevelRepeatability = list.filter((item: { params: string; checkType: string }) => item.checkType === '重复性' && item.params === '功率') // 功率-重复性 const listRelativeLevelRepeatability = list.filter((item: { params: string; checkType: string }) => item.checkType === '重复性' && item.params === '相对电平') // 相对电平-重复性 diff --git a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue index 3294ccd..dfca16f 100644 --- a/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/fifteenth/checkDataCom.vue @@ -344,6 +344,7 @@ return { ...item, lessThan: '', + qualified: '', } }), itemCategoryId: itemCategoryId.value, // 核查项分类id @@ -379,11 +380,14 @@ listStability.value = resultList // 计算稳定性考核是否合格 - if (resultList.every((item: { lessThan: string | number }) => item.lessThan === '合格')) { - form.value.qualified = '合格' - } - else { - form.value.qualified = '不合格' + // if (resultList.every((item: { lessThan: string | number }) => item.lessThan === '合格')) { + // form.value.qualified = '合格' + // } + // else { + // form.value.qualified = '不合格' + // } + if (listStability.value && listStability.value.length) { + form.value.qualified = `${listStability.value[0].qualified}1` === '1' ? '合格' : '不合格' } } @@ -400,10 +404,6 @@ // ------------------------------------------------------------------------------------------ // 处理详情数据 const solveGetDetailData = (responseList: any) => { - form.value.qualified = responseList[0].qualified === 1 ? '合格' : '不合格' - console.log(originList.value) - console.log(originList.value[0].kc) - const list = responseList.map((item: any) => { return { ...item, @@ -457,6 +457,10 @@ } }) // 稳定性 + if (listStability && listStability.length) { + form.value.qualified = `${listStability[0].qualified}1` === '1' ? '合格' : '不合格' + } + return { templistRepeatability: listRepeatability, templistStability: listStability, diff --git a/src/views/equipement/standard/checkData/components/seventeenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/seventeenth/checkDataCom.vue index 0097f67..a1825ac 100644 --- a/src/views/equipement/standard/checkData/components/seventeenth/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/seventeenth/checkDataCom.vue @@ -694,7 +694,7 @@ // 处理详情数据 const solveGetDetailData = (responseList: any) => { console.log('处理详情数据', props.pageType) - form.value.qualified = responseList[0].qualified === 1 ? '合格' : '不合格' + // form.value.qualified = responseList[0].qualified === 1 ? '合格' : '不合格' const list = responseList.map((item: any) => { let unit = '' switch (item.params) { @@ -728,6 +728,13 @@ } }) + // 稳定性考核是否合格 + let tempStabilityList = [] + tempStabilityList = list.filter((item: { checkType: string }) => item.checkType === '稳定性') + if (tempStabilityList.length) { + form.value.qualified = tempStabilityList[0].qualified === 1 ? '合格' : '不合格' + } + const listMismatchRepeatability = list.filter((item: { params: string; checkType: string }) => item.checkType === '重复性' && item.params === '失配测量') // 失配测量-重复性 const listAttenuationRepeatability = list.filter((item: { params: string; checkType: string }) => item.checkType === '重复性' && item.params === '衰减测量') // 衰减测量-重复性 const listPhaseRepeatability = list.filter((item: { params: string; checkType: string }) => item.checkType === '重复性' && item.params === '相移测量') // 相移测量-重复性 diff --git a/src/views/equipement/standard/checkData/components/tenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/tenth/checkDataCom.vue index 6e948ec..be62ed4 100644 --- a/src/views/equipement/standard/checkData/components/tenth/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/tenth/checkDataCom.vue @@ -13,6 +13,7 @@ import multiTable from '@/components/MultiHeaderTable/index.vue' import { addCheckData, calculateHandle, getHistoryIndication, getInfo, updateCheckData } from '@/api/equipment/standard/checkData' import { getCheckItemDetail, getJobInstructionList } from '@/api/equipment/standard/book' +import { getDataNum, getDataUnit } from '@/utils/validate' const props = defineProps({ selectStandardId: { // 选择的标准装置id @@ -1098,11 +1099,17 @@ const params = { belongStandardEquipment: belongStandardEquipment.value, // 检校标准装置 - checkDataSignalGeneratorList: checkDataSignalGeneratorListParams.map((item: { conclusion: string }) => { + checkDataSignalGeneratorList: checkDataSignalGeneratorListParams.map((item: any) => { return { ...item, conclusion: '', lessThan: '', + testValueOne: getDataNum(item.testValueOne) == null ? '' : getDataNum(item.testValueOne), // 测量值1 + testValueTwo: getDataNum(item.testValueTwo) == null ? '' : getDataNum(item.testValueTwo), // 测量值2 + testValueThree: getDataNum(item.testValueThree) == null ? '' : getDataNum(item.testValueThree), // 测量值3 + testValueFour: getDataNum(item.testValueFour) == null ? '' : getDataNum(item.testValueFour), // 测量值4 + testValueFive: getDataNum(item.testValueFive) == null ? '' : getDataNum(item.testValueFive), // 测量值5 + testValueSix: getDataNum(item.testValueSix) == null ? '' : getDataNum(item.testValueSix), // 测量值6 } }), itemCategoryId: itemCategoryId.value, // 核查项分类id @@ -1316,7 +1323,7 @@ // 处理详情数据 const solveGetDetailData = (responseList: any) => { console.log('处理详情数据', props.pageType) - form.value.qualified = responseList[0].qualified === 1 ? '合格' : '不合格' + const list = responseList.map((item: any) => { let unit = '' switch (item.params) { @@ -1365,6 +1372,13 @@ } }) + // 稳定性考核是否合格 + let tempStabilityList = [] + tempStabilityList = list.filter((item: { checkType: string }) => item.checkType === '稳定性') + if (tempStabilityList.length) { + form.value.qualified = tempStabilityList[0].qualified === 1 ? '合格' : '不合格' + } + const listFrequencyRepeatability = list.filter((item: { params: string; checkType: string }) => item.checkType === '重复性' && item.params === '频率') // 频率-重复性 const listPowerLevelRepeatability = list.filter((item: { params: string; checkType: string }) => item.checkType === '重复性' && item.params === '功率') // 功率-重复性 const listRelativeLevelRepeatability = list.filter((item: { params: string; checkType: string }) => item.checkType === '重复性' && item.params === '相对电平') // 相对电平-重复性 diff --git a/src/views/equipement/standard/checkData/components/thirteenth/checkDataCom.vue b/src/views/equipement/standard/checkData/components/thirteenth/checkDataCom.vue index f1c8eee..b864fcd 100644 --- a/src/views/equipement/standard/checkData/components/thirteenth/checkDataCom.vue +++ b/src/views/equipement/standard/checkData/components/thirteenth/checkDataCom.vue @@ -1363,7 +1363,7 @@ // 处理详情数据 const solveGetDetailData = (responseList: any) => { console.log('处理详情数据', props.pageType) - form.value.qualified = responseList[0].qualified === 1 ? '合格' : '不合格' + // form.value.qualified = responseList[0].qualified === 1 ? '合格' : '不合格' const list = responseList.map((item: any) => { let tempCheckPoint = item.checkPoint + item.unit if (`${item.referencePoint}` === '1') { @@ -1388,6 +1388,13 @@ } }) + // 稳定性考核是否合格 + let tempStabilityList = [] + tempStabilityList = list.filter((item: { checkType: string }) => item.checkType === '稳定性') + if (tempStabilityList.length) { + form.value.qualified = tempStabilityList[0].qualified === 1 ? '合格' : '不合格' + } + const listTimeMarkRepeatability = list.filter((item: { params: string; checkType: string }) => item.checkType === '重复性' && item.params === '时标') // 时标-重复性 const listSquareWaveVoltage50ΩRepeatability = list.filter((item: { params: string; checkType: string }) => item.checkType === '重复性' && item.params === '方波电压(50Ω)') // 方波电压(50Ω)-重复性 const listSquareWaveVoltage1MΩRepeatability = list.filter((item: { params: string; checkType: string }) => item.checkType === '重复性' && item.params === '方波电压(1MΩ)') // 方波电压(1MΩ)-重复性