Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
This commit is contained in:
commit
52efa463f5
|
@ -183,15 +183,15 @@ export default {
|
|||
sampleInfo: {
|
||||
type: Object,
|
||||
},
|
||||
// analyseCurrentSpectrum: {
|
||||
// type: Object,
|
||||
// },
|
||||
analyseCurrentSpectrum: {
|
||||
type: Object,
|
||||
},
|
||||
},
|
||||
data() {
|
||||
this.SampleType = SampleType
|
||||
|
||||
return {
|
||||
analyseCurrentSpectrum: {},
|
||||
// analyseCurrentSpectrum: {},
|
||||
qcFlags: {},
|
||||
|
||||
spectraVisible: false,
|
||||
|
|
|
@ -407,7 +407,7 @@ export default {
|
|||
isSaving: false,
|
||||
|
||||
colorConfig: {}, // 颜色配置
|
||||
sampleInfo:{}
|
||||
sampleInfo: {},
|
||||
}
|
||||
},
|
||||
created() {
|
||||
|
@ -448,12 +448,14 @@ export default {
|
|||
this.params_toDB.comment = val.spectrumAnalysisCommentInfo
|
||||
},
|
||||
getStationName(arg, val, flag) {
|
||||
arg.forEach((item) => {
|
||||
item.conc = parseFloat(Number(item.conc).toPrecision(6))
|
||||
item.concErr = parseFloat(Number(item.concErr).toPrecision(6))
|
||||
item.lc = parseFloat(Number(item.lc).toPrecision(6))
|
||||
item.mdc = parseFloat(Number(item.mdc).toPrecision(6))
|
||||
})
|
||||
if (arg.length > 0) {
|
||||
arg.forEach((item) => {
|
||||
item.conc = parseFloat(Number(item.conc).toPrecision(6))
|
||||
item.concErr = parseFloat(Number(item.concErr).toPrecision(6))
|
||||
item.lc = parseFloat(Number(item.lc).toPrecision(6))
|
||||
item.mdc = parseFloat(Number(item.mdc).toPrecision(6))
|
||||
})
|
||||
}
|
||||
this.resultDisplayFlag = arg
|
||||
this.params_toDB.stationName = val
|
||||
this.isReAnalyed_beta = flag
|
||||
|
|
Loading…
Reference in New Issue
Block a user