diff --git a/src/utils/String.ts b/src/utils/String.ts index 3421359..4505c82 100644 --- a/src/utils/String.ts +++ b/src/utils/String.ts @@ -4,7 +4,7 @@ export const clearSymbol = (str: any) => { let string = '' // 替换字符串中的所有特殊字符(包含空格) - const Exp = /[\-\_\,\!\|\~\`\(\)\#\$\%\^\&\*\{\}\:\;\"\L\<\>\±\<\≤\>\≥\<\>\+?]/g + const Exp = /[\-\_\,\!\/\|\~\`\(\)\#\$\%\^\&\*\{\}\:\;\"\L\<\>\±\<\≤\>\≥\<\>\+?]/g string = (!isNaN(str) && typeof str === 'number' ? String(str) : str ? String(str) : '').replace(Exp, '') return string } diff --git a/src/utils/String.ts b/src/utils/String.ts index 3421359..4505c82 100644 --- a/src/utils/String.ts +++ b/src/utils/String.ts @@ -4,7 +4,7 @@ export const clearSymbol = (str: any) => { let string = '' // 替换字符串中的所有特殊字符(包含空格) - const Exp = /[\-\_\,\!\|\~\`\(\)\#\$\%\^\&\*\{\}\:\;\"\L\<\>\±\<\≤\>\≥\<\>\+?]/g + const Exp = /[\-\_\,\!\/\|\~\`\(\)\#\$\%\^\&\*\{\}\:\;\"\L\<\>\±\<\≤\>\≥\<\>\+?]/g string = (!isNaN(str) && typeof str === 'number' ? String(str) : str ? String(str) : '').replace(Exp, '') return string } diff --git a/src/views/business/taskMeasure/measureData/batchEdit.vue b/src/views/business/taskMeasure/measureData/batchEdit.vue index 04db5ba..8dc7ee0 100644 --- a/src/views/business/taskMeasure/measureData/batchEdit.vue +++ b/src/views/business/taskMeasure/measureData/batchEdit.vue @@ -35,6 +35,7 @@ break } } + // 表单验证未通过 if (!formValidate) { return } @@ -46,7 +47,7 @@ Promise.all(measureRef.value.map(async (item: any, index: number) => { try { const res = await updateMeasureData(item.solveSaveParams()) - // 保存成功后置为detail + // 保存成功后页面编辑状态置为detail item.setDetail() return Promise.resolve(res) } diff --git a/src/utils/String.ts b/src/utils/String.ts index 3421359..4505c82 100644 --- a/src/utils/String.ts +++ b/src/utils/String.ts @@ -4,7 +4,7 @@ export const clearSymbol = (str: any) => { let string = '' // 替换字符串中的所有特殊字符(包含空格) - const Exp = /[\-\_\,\!\|\~\`\(\)\#\$\%\^\&\*\{\}\:\;\"\L\<\>\±\<\≤\>\≥\<\>\+?]/g + const Exp = /[\-\_\,\!\/\|\~\`\(\)\#\$\%\^\&\*\{\}\:\;\"\L\<\>\±\<\≤\>\≥\<\>\+?]/g string = (!isNaN(str) && typeof str === 'number' ? String(str) : str ? String(str) : '').replace(Exp, '') return string } diff --git a/src/views/business/taskMeasure/measureData/batchEdit.vue b/src/views/business/taskMeasure/measureData/batchEdit.vue index 04db5ba..8dc7ee0 100644 --- a/src/views/business/taskMeasure/measureData/batchEdit.vue +++ b/src/views/business/taskMeasure/measureData/batchEdit.vue @@ -35,6 +35,7 @@ break } } + // 表单验证未通过 if (!formValidate) { return } @@ -46,7 +47,7 @@ Promise.all(measureRef.value.map(async (item: any, index: number) => { try { const res = await updateMeasureData(item.solveSaveParams()) - // 保存成功后置为detail + // 保存成功后页面编辑状态置为detail item.setDetail() return Promise.resolve(res) } diff --git a/src/views/business/taskMeasure/measureData/components/ninth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/ninth/templateDetail.vue index cb58709..2f48c47 100644 --- a/src/views/business/taskMeasure/measureData/components/ninth/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/ninth/templateDetail.vue @@ -471,33 +471,37 @@ break case '7': // 输入频响 - inputFrequencyResponseList.value.push({ ...item, params: '输入频响', oneValue: item.oneValue || '/', twoValue: item.twoValue || '/', threeValue: item.threeValue || '/', conclusion: Number(mesureItemData.value[index].referencePoint) === 1 ? '参考点' : item.conclusion || '/', upperIndex: Number(mesureItemData.value[index].referencePoint) === 1 ? '参考点' : (item.upperIndex || clearSymbol(item.technicalIndex) || '/'), lowerIndex: Number(mesureItemData.value[index].referencePoint) === 1 ? '参考点' : (item.lowerIndex || `${item.technicalIndex === '/' ? '' : '-'}${clearSymbol(item.technicalIndex)}` || '/') }) + inputFrequencyResponseList.value.push({ ...item, params: '输入频响', oneValue: item.oneValue || '', twoValue: item.twoValue || '', threeValue: item.threeValue || '', conclusion: Number(mesureItemData.value[index].referencePoint) === 1 ? '参考点' : item.conclusion || '/', upperIndex: Number(mesureItemData.value[index].referencePoint) === 1 ? '参考点' : (item.upperIndex || clearSymbol(item.technicalIndex) || '/'), lowerIndex: Number(mesureItemData.value[index].referencePoint) === 1 ? '参考点' : (item.lowerIndex || `${item.technicalIndex === '/' ? '' : '-'}${clearSymbol(item.technicalIndex)}` || '/') }) break case '8': // 平均噪声电平 - averageNoiseLevelList.value.push({ ...item, params: '平均噪声电平', oneValue: item.oneValue || '/' }) + averageNoiseLevelList.value.push({ ...item, params: '平均噪声电平', oneValue: item.oneValue || '', upperIndex: clearSymbol(item.upperIndex) ? clearSymbol(item.upperIndex) : '/' }) break case '9': // 谐波失真 - harmonicDistortionList.value.push({ ...item, params: '谐波失真', oneValue: item.oneValue || '/', twoValue: item.twoValue || '/', fourValue: item.fourValue || '/', sixValue: item.sixValue || '/' }) + harmonicDistortionList.value.push({ ...item, params: '谐波失真', oneValue: item.oneValue || '', twoValue: item.twoValue || '', fourValue: item.fourValue || '', sixValue: item.sixValue || '' }) break case '10': // 输入衰减 - inputAttenuatorList.value.push({ ...item, params: '输入衰减', oneValue: item.oneValue || '/', inputAttenuator: Number(item.referencePoint) === 1 ? '参考点' : item.inputAttenuator || '/', conclusion: Number(mesureItemData.value[index].referencePoint) === 1 ? '参考点' : item.conclusion || '/', upperIndex: Number(mesureItemData.value[index].referencePoint) === 1 ? '参考点' : (item.upperIndex || clearSymbol(item.technicalIndex) || '/'), lowerIndex: Number(mesureItemData.value[index].referencePoint) === 1 ? '参考点' : (item.lowerIndex || `${item.technicalIndex === '/' ? '' : '-'}${clearSymbol(item.technicalIndex)}` || '/') }) + inputAttenuatorList.value.push({ ...item, params: '输入衰减', oneValue: item.oneValue || '', inputAttenuator: Number(item.referencePoint) === 1 ? '参考点' : item.inputAttenuator || '', conclusion: Number(mesureItemData.value[index].referencePoint) === 1 ? '参考点' : item.conclusion || '/', upperIndex: Number(mesureItemData.value[index].referencePoint) === 1 ? '参考点' : (item.upperIndex || clearSymbol(item.technicalIndex) || '/'), lowerIndex: Number(mesureItemData.value[index].referencePoint) === 1 ? '参考点' : (item.lowerIndex || `${item.technicalIndex === '/' ? '' : '-'}${clearSymbol(item.technicalIndex)}` || '/') }) break case '11': // 1dB增益压缩点 - gainCompressionPointList.value.push({ ...item, params: '1dB增益压缩点', oneValue: item.oneValue || '/' }) + gainCompressionPointList.value.push({ ...item, params: '1dB增益压缩点', oneValue: item.oneValue || '', technicalIndex: clearSymbol(item.technicalIndex) ? `${clearSymbol(item.technicalIndex)}` : '/' }) break case '12': // 校准信号 - calibratingSignalList.value.push({ ...item, params: '校准信号', oneValue: item.typeValue === '频率' ? '/' : clearSymbol(item.oneValue) || '/', twoValue: item.typeValue === '频率' ? '/' : clearSymbol(item.twoValue) || '/', threeValue: item.typeValue === '频率' ? '/' : clearSymbol(item.threeValue) || '/', measureResult: item.measureResult || '/' }) - calibratingSignalList.value = calibratingSignalList.value.map((item: any) => ({ ...item, typeValue: item.typeValue || (item.oneValue === '/' ? '频率' : '幅度') })) + calibratingSignalList.value.push({ ...item, params: '校准信号', oneValue: item.typeValue === '频率' ? '/' : clearSymbol(item.oneValue) || '', twoValue: item.typeValue === '频率' ? '/' : clearSymbol(item.twoValue) || '', threeValue: item.typeValue === '频率' ? '/' : clearSymbol(item.threeValue) || '', measureResult: item.measureResult || '/' }) + calibratingSignalList.value = calibratingSignalList.value.map((item: any) => ({ + ...item, + typeValue: item.typeValue || (item.oneValue === '/' ? '频率' : '幅度'), + upperIndex: clearSymbol(item.technicalIndex) ? `+${clearSymbol(item.technicalIndex)}` : '/', + lowerIndex: clearSymbol(item.technicalIndex) ? `-${clearSymbol(item.technicalIndex)}` : '/', + })) break } }) setListDict() - console.log(intermediateFrequencyBandwidthList.value, 'intermediateFrequencyBandwidthList.value') } /** @@ -547,7 +551,7 @@ if (title === '输入频响') { list = list.map((item: any) => ({ ...item, averageValue: ((Number(item.oneValue) + Number(item.twoValue) + Number(item.threeValue)) / 3).toFixed(2) })) } - const res = await calculateFun(list.map((item: any) => ({ ...item, technicalIndex: String(item.technicalIndex) ? clearSymbol(item.technicalIndex) : '/' }))) + const res = await calculateFun(list.map((item: any) => ({ ...item, technicalIndex: String(item.technicalIndex) ? (clearSymbol(item.technicalIndex) || '/') : '/' }))) return res.map(item => ({ ...item, params: title })) } // 点击计算结果 diff --git a/src/utils/String.ts b/src/utils/String.ts index 3421359..4505c82 100644 --- a/src/utils/String.ts +++ b/src/utils/String.ts @@ -4,7 +4,7 @@ export const clearSymbol = (str: any) => { let string = '' // 替换字符串中的所有特殊字符(包含空格) - const Exp = /[\-\_\,\!\|\~\`\(\)\#\$\%\^\&\*\{\}\:\;\"\L\<\>\±\<\≤\>\≥\<\>\+?]/g + const Exp = /[\-\_\,\!\/\|\~\`\(\)\#\$\%\^\&\*\{\}\:\;\"\L\<\>\±\<\≤\>\≥\<\>\+?]/g string = (!isNaN(str) && typeof str === 'number' ? String(str) : str ? String(str) : '').replace(Exp, '') return string } diff --git a/src/views/business/taskMeasure/measureData/batchEdit.vue b/src/views/business/taskMeasure/measureData/batchEdit.vue index 04db5ba..8dc7ee0 100644 --- a/src/views/business/taskMeasure/measureData/batchEdit.vue +++ b/src/views/business/taskMeasure/measureData/batchEdit.vue @@ -35,6 +35,7 @@ break } } + // 表单验证未通过 if (!formValidate) { return } @@ -46,7 +47,7 @@ Promise.all(measureRef.value.map(async (item: any, index: number) => { try { const res = await updateMeasureData(item.solveSaveParams()) - // 保存成功后置为detail + // 保存成功后页面编辑状态置为detail item.setDetail() return Promise.resolve(res) } diff --git a/src/views/business/taskMeasure/measureData/components/ninth/templateDetail.vue b/src/views/business/taskMeasure/measureData/components/ninth/templateDetail.vue index cb58709..2f48c47 100644 --- a/src/views/business/taskMeasure/measureData/components/ninth/templateDetail.vue +++ b/src/views/business/taskMeasure/measureData/components/ninth/templateDetail.vue @@ -471,33 +471,37 @@ break case '7': // 输入频响 - inputFrequencyResponseList.value.push({ ...item, params: '输入频响', oneValue: item.oneValue || '/', twoValue: item.twoValue || '/', threeValue: item.threeValue || '/', conclusion: Number(mesureItemData.value[index].referencePoint) === 1 ? '参考点' : item.conclusion || '/', upperIndex: Number(mesureItemData.value[index].referencePoint) === 1 ? '参考点' : (item.upperIndex || clearSymbol(item.technicalIndex) || '/'), lowerIndex: Number(mesureItemData.value[index].referencePoint) === 1 ? '参考点' : (item.lowerIndex || `${item.technicalIndex === '/' ? '' : '-'}${clearSymbol(item.technicalIndex)}` || '/') }) + inputFrequencyResponseList.value.push({ ...item, params: '输入频响', oneValue: item.oneValue || '', twoValue: item.twoValue || '', threeValue: item.threeValue || '', conclusion: Number(mesureItemData.value[index].referencePoint) === 1 ? '参考点' : item.conclusion || '/', upperIndex: Number(mesureItemData.value[index].referencePoint) === 1 ? '参考点' : (item.upperIndex || clearSymbol(item.technicalIndex) || '/'), lowerIndex: Number(mesureItemData.value[index].referencePoint) === 1 ? '参考点' : (item.lowerIndex || `${item.technicalIndex === '/' ? '' : '-'}${clearSymbol(item.technicalIndex)}` || '/') }) break case '8': // 平均噪声电平 - averageNoiseLevelList.value.push({ ...item, params: '平均噪声电平', oneValue: item.oneValue || '/' }) + averageNoiseLevelList.value.push({ ...item, params: '平均噪声电平', oneValue: item.oneValue || '', upperIndex: clearSymbol(item.upperIndex) ? clearSymbol(item.upperIndex) : '/' }) break case '9': // 谐波失真 - harmonicDistortionList.value.push({ ...item, params: '谐波失真', oneValue: item.oneValue || '/', twoValue: item.twoValue || '/', fourValue: item.fourValue || '/', sixValue: item.sixValue || '/' }) + harmonicDistortionList.value.push({ ...item, params: '谐波失真', oneValue: item.oneValue || '', twoValue: item.twoValue || '', fourValue: item.fourValue || '', sixValue: item.sixValue || '' }) break case '10': // 输入衰减 - inputAttenuatorList.value.push({ ...item, params: '输入衰减', oneValue: item.oneValue || '/', inputAttenuator: Number(item.referencePoint) === 1 ? '参考点' : item.inputAttenuator || '/', conclusion: Number(mesureItemData.value[index].referencePoint) === 1 ? '参考点' : item.conclusion || '/', upperIndex: Number(mesureItemData.value[index].referencePoint) === 1 ? '参考点' : (item.upperIndex || clearSymbol(item.technicalIndex) || '/'), lowerIndex: Number(mesureItemData.value[index].referencePoint) === 1 ? '参考点' : (item.lowerIndex || `${item.technicalIndex === '/' ? '' : '-'}${clearSymbol(item.technicalIndex)}` || '/') }) + inputAttenuatorList.value.push({ ...item, params: '输入衰减', oneValue: item.oneValue || '', inputAttenuator: Number(item.referencePoint) === 1 ? '参考点' : item.inputAttenuator || '', conclusion: Number(mesureItemData.value[index].referencePoint) === 1 ? '参考点' : item.conclusion || '/', upperIndex: Number(mesureItemData.value[index].referencePoint) === 1 ? '参考点' : (item.upperIndex || clearSymbol(item.technicalIndex) || '/'), lowerIndex: Number(mesureItemData.value[index].referencePoint) === 1 ? '参考点' : (item.lowerIndex || `${item.technicalIndex === '/' ? '' : '-'}${clearSymbol(item.technicalIndex)}` || '/') }) break case '11': // 1dB增益压缩点 - gainCompressionPointList.value.push({ ...item, params: '1dB增益压缩点', oneValue: item.oneValue || '/' }) + gainCompressionPointList.value.push({ ...item, params: '1dB增益压缩点', oneValue: item.oneValue || '', technicalIndex: clearSymbol(item.technicalIndex) ? `${clearSymbol(item.technicalIndex)}` : '/' }) break case '12': // 校准信号 - calibratingSignalList.value.push({ ...item, params: '校准信号', oneValue: item.typeValue === '频率' ? '/' : clearSymbol(item.oneValue) || '/', twoValue: item.typeValue === '频率' ? '/' : clearSymbol(item.twoValue) || '/', threeValue: item.typeValue === '频率' ? '/' : clearSymbol(item.threeValue) || '/', measureResult: item.measureResult || '/' }) - calibratingSignalList.value = calibratingSignalList.value.map((item: any) => ({ ...item, typeValue: item.typeValue || (item.oneValue === '/' ? '频率' : '幅度') })) + calibratingSignalList.value.push({ ...item, params: '校准信号', oneValue: item.typeValue === '频率' ? '/' : clearSymbol(item.oneValue) || '', twoValue: item.typeValue === '频率' ? '/' : clearSymbol(item.twoValue) || '', threeValue: item.typeValue === '频率' ? '/' : clearSymbol(item.threeValue) || '', measureResult: item.measureResult || '/' }) + calibratingSignalList.value = calibratingSignalList.value.map((item: any) => ({ + ...item, + typeValue: item.typeValue || (item.oneValue === '/' ? '频率' : '幅度'), + upperIndex: clearSymbol(item.technicalIndex) ? `+${clearSymbol(item.technicalIndex)}` : '/', + lowerIndex: clearSymbol(item.technicalIndex) ? `-${clearSymbol(item.technicalIndex)}` : '/', + })) break } }) setListDict() - console.log(intermediateFrequencyBandwidthList.value, 'intermediateFrequencyBandwidthList.value') } /** @@ -547,7 +551,7 @@ if (title === '输入频响') { list = list.map((item: any) => ({ ...item, averageValue: ((Number(item.oneValue) + Number(item.twoValue) + Number(item.threeValue)) / 3).toFixed(2) })) } - const res = await calculateFun(list.map((item: any) => ({ ...item, technicalIndex: String(item.technicalIndex) ? clearSymbol(item.technicalIndex) : '/' }))) + const res = await calculateFun(list.map((item: any) => ({ ...item, technicalIndex: String(item.technicalIndex) ? (clearSymbol(item.technicalIndex) || '/') : '/' }))) return res.map(item => ({ ...item, params: title })) } // 点击计算结果 diff --git a/src/views/business/taskMeasure/measureData/list.vue b/src/views/business/taskMeasure/measureData/list.vue index 456b034..8f24390 100644 --- a/src/views/business/taskMeasure/measureData/list.vue +++ b/src/views/business/taskMeasure/measureData/list.vue @@ -379,6 +379,10 @@ // --------------------------------------点击批量编辑------------------------------------------------ const batchEdit = () => { + if (!checkoutListAllContent.value.length) { + ElMessage.warning('请先选择需要编辑的数据') + return false + } if (checkoutListAllContent.value.length > 4) { ElMessage.warning('最多可编辑4个') return false