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:
xiaoguangbin 2023-11-03 11:51:54 +08:00
commit 4eaeda87ff
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -913,6 +913,8 @@ export default {
this.resetChartOpts() this.resetChartOpts()
this.selectedKeys = [] this.selectedKeys = []
this.selectedTableItem = null
} else { } else {
this.$message.error(message) this.$message.error(message)
} }

14
src/views/spectrumAnalysis/components/Modals/LoadFromDBModal.vue
View File

@ -114,7 +114,7 @@ export default {
return { return {
queryParam: { queryParam: {
menuTypes: 'G,B', menuTypes: 'G,B',
sampleType: 'P', sampleType: '',
startDate: moment().add(-7, 'd').format('YYYY-MM-DD'), startDate: moment().add(-7, 'd').format('YYYY-MM-DD'),
endDate: moment().format('YYYY-MM-DD'), endDate: moment().format('YYYY-MM-DD'),
dbName: 'auto', dbName: 'auto',
@ -326,13 +326,19 @@ export default {
] ]
if (event == 'B') { if (event == 'B') {
this.sampleTypeOption = arr_B this.sampleTypeOption = arr_B
this.queryParam.sampleType = 'B' this.$nextTick(() => {
this.queryParam.sampleType = 'B'
})
} else if (event == 'G') { } else if (event == 'G') {
this.sampleTypeOption = arr_G this.sampleTypeOption = arr_G
this.queryParam.sampleType = 'P' this.$nextTick(() => {
this.queryParam.sampleType = 'P'
})
} else { } else {
this.sampleTypeOption = arr_A this.sampleTypeOption = arr_A
this.queryParam.sampleType = 'P' this.$nextTick(() => {
this.queryParam.sampleType = ''
})
} }
this.getStationAndDetectorList(event) this.getStationAndDetectorList(event)
}, },