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

Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev

Browse Source
This commit is contained in:
orgin 2023-11-06 11:03:26 +08:00
commit 52efa463f5
2 changed files with 13 additions and 11 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

@ -183,15 +183,15 @@ export default {
sampleInfo: { sampleInfo: {
type: Object, type: Object,
}, },
// analyseCurrentSpectrum: { analyseCurrentSpectrum: {
// type: Object, type: Object,
// }, },
}, },
data() { data() {
this.SampleType = SampleType this.SampleType = SampleType
return { return {
analyseCurrentSpectrum: {}, // analyseCurrentSpectrum: {},
qcFlags: {}, qcFlags: {},
spectraVisible: false, spectraVisible: false,

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

@ -407,7 +407,7 @@ export default {
isSaving: false, isSaving: false,
colorConfig: {}, // 颜色配置 colorConfig: {}, // 颜色配置
sampleInfo:{} sampleInfo: {},
} }
}, },
created() { created() {
@ -448,12 +448,14 @@ export default {
this.params_toDB.comment = val.spectrumAnalysisCommentInfo this.params_toDB.comment = val.spectrumAnalysisCommentInfo
}, },
getStationName(arg, val, flag) { getStationName(arg, val, flag) {
arg.forEach((item) => { if (arg.length > 0) {
item.conc = parseFloat(Number(item.conc).toPrecision(6)) arg.forEach((item) => {
item.concErr = parseFloat(Number(item.concErr).toPrecision(6)) item.conc = parseFloat(Number(item.conc).toPrecision(6))
item.lc = parseFloat(Number(item.lc).toPrecision(6)) item.concErr = parseFloat(Number(item.concErr).toPrecision(6))
item.mdc = parseFloat(Number(item.mdc).toPrecision(6)) item.lc = parseFloat(Number(item.lc).toPrecision(6))
}) item.mdc = parseFloat(Number(item.mdc).toPrecision(6))
})
}
this.resultDisplayFlag = arg this.resultDisplayFlag = arg
this.params_toDB.stationName = val this.params_toDB.stationName = val
this.isReAnalyed_beta = flag this.isReAnalyed_beta = flag