fix: 修复Beta 下 Energy Calibration弹窗左下角All Spectrum 未生效问题

This commit is contained in:
Xu Zhimeng 2023-10-30 11:55:27 +08:00
parent e95fe5da81
commit 0672e09dd1
2 changed files with 36 additions and 6 deletions

View File

@ -52,6 +52,12 @@ import TitleOverBorder from '@/views/spectrumAnalysis/components/TitleOverBorder
export default { export default {
components: { BetaDetectorCalibration, GammaDetectorCalibration, TitleOverBorder }, components: { BetaDetectorCalibration, GammaDetectorCalibration, TitleOverBorder },
mixins: [ModalMixin, SampleDataMixin], mixins: [ModalMixin, SampleDataMixin],
props: {
sampleList: {
type: Array,
required: true,
},
},
data() { data() {
return { return {
currTab: 'gamma', currTab: 'gamma',
@ -85,6 +91,28 @@ export default {
this.gammaEnergyValid = val this.gammaEnergyValid = val
}, },
handleReAnalyse() { handleReAnalyse() {
const regExp = /^([A-Z]{1,}\d{1,})_/
const regMatched = this.newSampleData.inputFileName.match(regExp)
const currStationName = regMatched[1]
const dbNames = [],
sampleIds = [],
sampleFileNames = [],
gasFileNames = [],
detFileNames = [],
qcFileNames = []
const matchedSampleList = this.sampleList.filter((item) => item.inputFileName.includes(currStationName))
matchedSampleList.forEach(
({ dbName, sampleId, sampleFileName, gasFileName, detFileName, qcFileName, qcFileStatus }) => {
dbNames.push(dbName || '')
sampleIds.push(sampleId || '')
sampleFileNames.push(sampleFileName)
gasFileNames.push(gasFileName)
detFileNames.push(detFileName)
qcFileNames.push(qcFileStatus ? qcFileName : '')
}
)
let params = { let params = {
applyType: this.newCalibrationIsAppliedTo, applyType: this.newCalibrationIsAppliedTo,
sampleData: this.recalculateROICountsFor.includes('sample') ? true : false, sampleData: this.recalculateROICountsFor.includes('sample') ? true : false,
@ -93,13 +121,14 @@ export default {
qcData: this.recalculateROICountsFor.includes('qc') ? true : false, qcData: this.recalculateROICountsFor.includes('qc') ? true : false,
betaEnergyValid: this.betaEnergyValid, betaEnergyValid: this.betaEnergyValid,
gammaEnergyValid: this.gammaEnergyValid, gammaEnergyValid: this.gammaEnergyValid,
dbNames: [this.newSampleData.dbName], dbNames,
sampleIds: [this.newSampleData.sampleId ? this.newSampleData.sampleId : ''], sampleIds,
sampleFileNames: [this.newSampleData.inputFileName], sampleFileNames,
gasFileNames: [this.newSampleData.gasFileName], gasFileNames,
detFileNames: [this.newSampleData.detFileName], detFileNames,
qcFileNames: [this.newSampleData.qcFileName], qcFileNames,
currentFileName: this.newSampleData.inputFileName, currentFileName: this.newSampleData.inputFileName,
currentQCFileName: this.newSampleData.qcFileName,
} }
postAction('/spectrumAnalysis/ReAnalyse', params).then((res) => { postAction('/spectrumAnalysis/ReAnalyse', params).then((res) => {
if (res.success) { if (res.success) {

View File

@ -165,6 +165,7 @@
<!-- Beta-Gamma 的Energy Calibration开始 --> <!-- Beta-Gamma 的Energy Calibration开始 -->
<beta-gamma-energy-calibration-modal <beta-gamma-energy-calibration-modal
v-model="betaGammaEnergyCalibrationModalVisible" v-model="betaGammaEnergyCalibrationModalVisible"
:sampleList="sampleList"
@sendInfo="getCheckFlag" @sendInfo="getCheckFlag"
@sendXeData="getXeData" @sendXeData="getXeData"
/> />