fix: 修复Beta 下 Energy Calibration弹窗左下角All Spectrum 未生效问题
This commit is contained in:
parent
e95fe5da81
commit
0672e09dd1
|
@ -52,6 +52,12 @@ import TitleOverBorder from '@/views/spectrumAnalysis/components/TitleOverBorder
|
|||
export default {
|
||||
components: { BetaDetectorCalibration, GammaDetectorCalibration, TitleOverBorder },
|
||||
mixins: [ModalMixin, SampleDataMixin],
|
||||
props: {
|
||||
sampleList: {
|
||||
type: Array,
|
||||
required: true,
|
||||
},
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
currTab: 'gamma',
|
||||
|
@ -85,6 +91,28 @@ export default {
|
|||
this.gammaEnergyValid = val
|
||||
},
|
||||
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 = {
|
||||
applyType: this.newCalibrationIsAppliedTo,
|
||||
sampleData: this.recalculateROICountsFor.includes('sample') ? true : false,
|
||||
|
@ -93,13 +121,14 @@ export default {
|
|||
qcData: this.recalculateROICountsFor.includes('qc') ? true : false,
|
||||
betaEnergyValid: this.betaEnergyValid,
|
||||
gammaEnergyValid: this.gammaEnergyValid,
|
||||
dbNames: [this.newSampleData.dbName],
|
||||
sampleIds: [this.newSampleData.sampleId ? this.newSampleData.sampleId : ''],
|
||||
sampleFileNames: [this.newSampleData.inputFileName],
|
||||
gasFileNames: [this.newSampleData.gasFileName],
|
||||
detFileNames: [this.newSampleData.detFileName],
|
||||
qcFileNames: [this.newSampleData.qcFileName],
|
||||
dbNames,
|
||||
sampleIds,
|
||||
sampleFileNames,
|
||||
gasFileNames,
|
||||
detFileNames,
|
||||
qcFileNames,
|
||||
currentFileName: this.newSampleData.inputFileName,
|
||||
currentQCFileName: this.newSampleData.qcFileName,
|
||||
}
|
||||
postAction('/spectrumAnalysis/ReAnalyse', params).then((res) => {
|
||||
if (res.success) {
|
||||
|
|
|
@ -165,6 +165,7 @@
|
|||
<!-- Beta-Gamma 的Energy Calibration开始 -->
|
||||
<beta-gamma-energy-calibration-modal
|
||||
v-model="betaGammaEnergyCalibrationModalVisible"
|
||||
:sampleList="sampleList"
|
||||
@sendInfo="getCheckFlag"
|
||||
@sendXeData="getXeData"
|
||||
/>
|
||||
|
|
Loading…
Reference in New Issue
Block a user