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 08:52:06 +08:00
commit 855de3b665
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -799,6 +799,7 @@ export default {
shapeChannelData,
shapeEnergyData,
peak: table,
barChart: this.barChart
})
this.channelPeakChart = channelPeakChart
@ -888,6 +889,7 @@ export default {
shapeChannelData,
shapeEnergyData,
peak: table,
barChart: this.barChart,
})
this.channelPeakChart = channelPeakChart

15
src/views/spectrumAnalysis/gamma-analysis.vue
View File

@ -1368,9 +1368,13 @@ export default {
// 从分析工具刷新部分数据
handleRefresh(data) {
data.DetailedInformation = this.detailedInfomation
data.QCFlag = this.qcFlags
data.BaseCtrls = this.baseCtrls
Object.assign(data, {
DetailedInformation: this.detailedInfomation,
QCFlag: this.qcFlags,
BaseCtrls: this.baseCtrls,
bAnalyed: this.bAnalyed
})
this.clearCompareLine()
this.redrawPeakLine()
this.dataProcess(data)
@ -1378,7 +1382,7 @@ export default {
// 分析工具Accept时刷新部分数据
handleAccept(data) {
const { allData, peakSet, shadowChannelChart, shadowEnergyChart, shapeChannelData, shapeEnergyData } = data
const { allData, peakSet, shadowChannelChart, shadowEnergyChart, shapeChannelData, shapeEnergyData, barChart } = data
const result = {
DetailedInformation: this.detailedInfomation,
@ -1386,11 +1390,12 @@ export default {
allData,
shadowChannelChart,
shadowEnergyChart,
shapeChannelData,
shapeEnergyData,
peak: peakSet,
BaseCtrls: this.baseCtrls,
bAnalyed: this.bAnalyed,
barChart
}
this.clearCompareLine()
this.redrawPeakLine()