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 14:32:23 +08:00
commit 3cef2aa62d
3 changed files with 25 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.isReAnalyed_beta = true
// this.analyseCurrentSpectrum = res.result // this.analyseCurrentSpectrum = res.result
this.$emit('sendXeData', res.result.XeData) this.$emit('sendXeData', res.result.XeData)
if (res.result.XeData && res.result.XeData.length > 0) { // if (res.result.XeData && res.result.XeData.length > 0) {
res.result.XeData.forEach((item) => { res.result.XeData.forEach((item) => {
item.conc = parseFloat(item.conc.toPrecision(6)) item.conc = parseFloat(item.conc.toPrecision(6))
item.concErr = parseFloat(item.concErr.toPrecision(6)) item.concErr = parseFloat(item.concErr.toPrecision(6))
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', true, res.result.XeData)
this.handleReAnalyse(res.result) this.handleReAnalyse(res.result)
if (res.result.bProcessed) {
this.$message.success(res.result.message)
} else {
this.$message.warning(res.result.message)
} }
// }
} else { } else {
this.$message.warning(res.message) 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('sendXeData', res.result.XeData)
this.$emit('reAnalyCurr', true, res.result.XeData) this.$emit('reAnalyCurr', true, res.result.XeData)
this.$message.success('Analyse Success!')
this.isReanlyze = true this.isReanlyze = true
this.handleExit() this.handleExit()
this.$bus.$emit('ReAnalyses', res.result) 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') { if (this.newCalibrationIsAppliedTo == 'AllSpectrum') {
let sameStation = matchedSampleList.filter( let sameStation = matchedSampleList.filter(

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

@ -533,10 +533,10 @@ export default {
this.params_toDB.checkDet = val.checkDet this.params_toDB.checkDet = val.checkDet
}, },
getXeData(val) { getXeData(val) {
if (val && val.length) { // if (val && val.length) {
this.$set(this.analyseCurrentSpectrumData, 'XeData', val) this.$set(this.analyseCurrentSpectrumData, 'XeData', val)
this.resultDisplayFlag = val this.resultDisplayFlag = val
} // }
}, },
// formDB 来源 吧接口返回的文件名称添加到sampleData // formDB 来源 吧接口返回的文件名称添加到sampleData
getFiles(val) { getFiles(val) {
@ -1824,6 +1824,8 @@ export default {
<style lang="less"> <style lang="less">
.spectrum-analysis-operators-dropdown-overlay { .spectrum-analysis-operators-dropdown-overlay {
background-color: #03353f; background-color: #03353f;
z-index: 999;
.ant-menu { .ant-menu {
background: transparent; background: transparent;
padding: 0; padding: 0;