xiaoguangbin/AnalysisSystemForRadionuclide_vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master-dev' into feature-Beta-dev-renpy

Browse Source
This commit is contained in:
任珮宇 2024-03-15 16:29:51 +08:00
commit 614547696d
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/spectrumAnalysis/beta-gamma-analysis.vue
View File

@ -289,7 +289,7 @@ export default {
} }
} }
this.changeChartByType(this.spectraType) this.changeChartByType(this.spectraType, result.XeData)
}, },
handleGetFlag(val, obj) { handleGetFlag(val, obj) {
@ -401,7 +401,7 @@ export default {
return cancelToken return cancelToken
}, },
changeChartByType(val) { changeChartByType(val, data) {
if (val === 'qc' && !this.sampleDetail.qc) { if (val === 'qc' && !this.sampleDetail.qc) {
this.$message.warning('No qc spectrum file!') this.$message.warning('No qc spectrum file!')
} else { } else {
@ -452,7 +452,7 @@ export default {
console.log('this.resultDisplaythis.resultDisplay', this.resultDisplay) console.log('this.resultDisplaythis.resultDisplay', this.resultDisplay)
this.resultDisplay = XeData this.resultDisplay = data ? data : XeData
this.sortResultDisplay() this.sortResultDisplay()
this.$emit('sendInfo', this.resultDisplay, this.spectrumData.stationCode, savedAnalysisResult) this.$emit('sendInfo', this.resultDisplay, this.spectrumData.stationCode, savedAnalysisResult)
@ -555,7 +555,7 @@ export default {
item.lc = parseFloat(item.lc.toPrecision(6)) item.lc = parseFloat(item.lc.toPrecision(6))
item.mdc = parseFloat(item.mdc.toPrecision(6)) item.mdc = parseFloat(item.mdc.toPrecision(6))
}) })
this.$emit('reAnalyCurr', true, res.result.XeData) this.$emit('reAnalyCurr', res.result.savedAnalysisResult, res.result.XeData)
this.handleReAnalyse(res.result) this.handleReAnalyse(res.result)
if (res.result.bProcessed) { if (res.result.bProcessed) {
this.$message.success(res.result.message) this.$message.success(res.result.message)

2
src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue
View File

@ -153,7 +153,7 @@ export default {
item.mdc = parseFloat(item.mdc.toPrecision(6)) item.mdc = parseFloat(item.mdc.toPrecision(6))
}) })
this.$emit('sendXeData', res.result.XeData) this.$emit('sendXeData', res.result.XeData)
this.$emit('reAnalyCurr', true, res.result.XeData) this.$emit('reAnalyCurr', res.result.savedAnalysisResult, res.result.XeData)
this.isReanlyze = true this.isReanlyze = true
this.handleExit() this.handleExit()
this.$bus.$emit('ReAnalyses', res.result) this.$bus.$emit('ReAnalyses', res.result)

2
src/views/spectrumAnalysis/index.vue
View File

@ -499,7 +499,7 @@ export default {
methods: { methods: {
getReAnalyCurr(flag, val) { getReAnalyCurr(flag, val) {
this.isReAnalyed_beta = flag this.isReAnalyed_beta = flag
this.params_toDB.savedAnalysisResult = true this.params_toDB.savedAnalysisResult = flag
this.resultDisplayFlag = val this.resultDisplayFlag = val
}, },
getReAnalyAll(val) { getReAnalyAll(val) {