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

分析成功和分析失败都增加提示

Browse Source 
分析失败 将右下角Result display的数据清空
This commit is contained in:
任珮宇 2024-03-15 14:28:13 +08:00
parent ecd16d9fbf
commit 4842684b6e
3 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -548,16 +548,21 @@ export default {
// this.isReAnalyed_beta = true
// this.analyseCurrentSpectrum = res.result
this.$emit('sendXeData', res.result.XeData)
if (res.result.XeData && res.result.XeData.length > 0) {
res.result.XeData.forEach((item) => {
item.conc = parseFloat(item.conc.toPrecision(6))
item.concErr = parseFloat(item.concErr.toPrecision(6))
item.lc = parseFloat(item.lc.toPrecision(6))
item.mdc = parseFloat(item.mdc.toPrecision(6))
})
this.$emit('reAnalyCurr', true, res.result.XeData)
this.handleReAnalyse(res.result)
// if (res.result.XeData && res.result.XeData.length > 0) {
res.result.XeData.forEach((item) => {
item.conc = parseFloat(item.conc.toPrecision(6))
item.concErr = parseFloat(item.concErr.toPrecision(6))
item.lc = parseFloat(item.lc.toPrecision(6))
item.mdc = parseFloat(item.mdc.toPrecision(6))
})
this.$emit('reAnalyCurr', true, res.result.XeData)
this.handleReAnalyse(res.result)
if (res.result.bProcessed) {
this.$message.success(res.result.message)
} else {
this.$message.warning(res.result.message)
}
// }
} else {
this.$message.warning(res.message)
}

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

@ -154,10 +154,14 @@ export default {
})
this.$emit('sendXeData', res.result.XeData)
this.$emit('reAnalyCurr', true, res.result.XeData)
this.$message.success('Analyse Success!')
this.isReanlyze = true
this.handleExit()
this.$bus.$emit('ReAnalyses', res.result)
if (res.result.bProcessed) {
this.$message.success(res.result.message)
} else {
this.$message.warning(res.result.message)
}
if (this.newCalibrationIsAppliedTo == 'AllSpectrum') {
let sameStation = matchedSampleList.filter(

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

@ -509,10 +509,10 @@ export default {
this.params_toDB.checkDet = val.checkDet
},
getXeData(val) {
if (val && val.length) {
this.$set(this.analyseCurrentSpectrumData, 'XeData', val)
this.resultDisplayFlag = val
}
// if (val && val.length) {
this.$set(this.analyseCurrentSpectrumData, 'XeData', val)
this.resultDisplayFlag = val
// }
},
// formDB 来源 吧接口返回的文件名称添加到sampleData
getFiles(val) {