diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
index d41b4cb..74066a4 100644
--- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue
+++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
@@ -299,7 +299,7 @@ export default {
this.changeChartByType('sample')
this.$store.commit('ADD_SAMPLE_DATA', {
- inputFileName,
+ inputFileName: this.sample.sampleFileName,
data: result,
from: 'file'
})
diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModal.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModal.vue
index 94d2a35..33bfc2a 100644
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModal.vue
@@ -17,7 +17,7 @@
-
+
@@ -301,20 +301,21 @@ export default {
// 设置左上角台站和探测器列表
setStationAndDetector({ detectorList, stationName, stationId }) {
this.queryParams.stationName = stationName
- this.detectorList = detectorList.map(({ detectorCode }) => ({
+ this.detectorList = detectorList.map(({ detectorCode, detectorId }) => ({
label: detectorCode,
- value: detectorCode
+ value: detectorId || ''
}))
this.queryParams.detectorName = detectorList[0].detectorCode
+ this.queryParams.detectorId = detectorList[0].detectorId || ''
this.queryParams.stationId = stationId
},
// 重置左上角查询信息
handleReset() {
this.queryParams.stationName = this.initialMDC.stationName
- this.detectorList = this.initialMDC.detectorList.map(({ detectorCode }) => ({
+ this.detectorList = this.initialMDC.detectorList.map(({ detectorCode, detectorId }) => ({
label: detectorCode,
- value: detectorCode
+ value: detectorId || ''
}))
},
@@ -326,7 +327,11 @@ export default {
}
try {
- const { success, message, result } = await postAction('/spectrumAnalysis/statisticsQuery', this.queryParams)
+ const find = this.detectorList.find(item => item.value == this.queryParams.detectorId)
+ const { success, message, result } = await postAction('/spectrumAnalysis/statisticsQuery', {
+ detectorCode: find.label,
+ ...this.queryParams
+ })
if (success) {
if (result) {
diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModalForQCFlags.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModalForQCFlags.vue
index 281c48b..e5ec91d 100644
--- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModalForQCFlags.vue
+++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModalForQCFlags.vue
@@ -26,7 +26,7 @@
@@ -204,27 +204,32 @@ export default {
// 设置左上角台站和探测器列表
setStationAndDetector({ detectorList, stationName, stationId }) {
this.queryParams.stationName = stationName
- this.detectorList = detectorList.map(({ detectorCode }) => ({
+ this.detectorList = detectorList.map(({ detectorCode, detectorId }) => ({
label: detectorCode,
- value: detectorCode,
+ value: detectorId || '',
}))
this.queryParams.detectorName = detectorList[0].detectorCode
- this.queryParams.stationId = stationId
+ this.queryParams.detectorId = detectorList[0].detectorId || ''
+ this.queryParams.stationId = stationId || ''
},
// 重置左上角查询信息
handleReset() {
this.queryParams.stationName = this.initialMDC.stationName
- this.detectorList = this.initialMDC.detectorList.map(({ detectorCode }) => ({
+ this.detectorList = this.initialMDC.detectorList.map(({ detectorCode, detectorId }) => ({
label: detectorCode,
- value: detectorCode,
+ value: detectorId || '',
}))
},
// 查询右侧图表信息
async handleStatisticsQuery() {
try {
- const { success, message, result } = await getAction('/spectrumAnalysis/statisticsQueryBtn', this.queryParams)
+ const find = this.detectorList.find(item => item.value == this.queryParams.detectorId)
+ const { success, message, result } = await getAction('/spectrumAnalysis/statisticsQueryBtn', {
+ detectorCode: find.label,
+ ...this.queryParams
+ })
if (success) {
if (result) {
const data = result.m_Values