diff --git a/src/views/spectrumAnalysis/beta-analysis.vue b/src/views/spectrumAnalysis/beta-analysis.vue index 381407f..52953f6 100644 --- a/src/views/spectrumAnalysis/beta-analysis.vue +++ b/src/views/spectrumAnalysis/beta-analysis.vue @@ -165,17 +165,17 @@ export default { getIndex(val) { this.currIdx = val }, - async handleDetalSelfStationCache() { - const { inputFileName } = this.sample - let params = { - sampleFileName: inputFileName, - } - try { - const { success, result, message } = await deleteAction('/selfStation/deleteSelfStationCache', params) - } catch (error) { - console.error(error) - } - }, + // async handleDetalSelfStationCache() { + // const { inputFileName } = this.sample + // let params = { + // sampleFileName: inputFileName, + // } + // try { + // const { success, result, message } = await deleteAction('/selfStation/deleteSelfStationCache', params) + // } catch (error) { + // console.error(error) + // } + // }, async getSelfStationSampleDetail() { this.spectraType = this.SampleType[0].value const { inputFileName, detFileName } = this.sample diff --git a/src/views/spectrumAnalysis/components/Modals/NuclideActivityAndMDCModal.vue b/src/views/spectrumAnalysis/components/Modals/NuclideActivityAndMDCModal.vue index 9af9a0b..4e73f72 100644 --- a/src/views/spectrumAnalysis/components/Modals/NuclideActivityAndMDCModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/NuclideActivityAndMDCModal.vue @@ -59,6 +59,7 @@ const columns = [ { title: 'HalfLife', dataIndex: 'halfLife', + ellipsis: true, }, { title: 'Energy (keV)', @@ -114,6 +115,28 @@ export default { // 切换比较 handleComparision() { this.compareVisible = !this.compareVisible + if (this.compareVisible) { + this.getCompareInfo() + } + }, + async getCompareInfo() { + try { + this.isLoading = true + const { sampleId, inputFileName: fileName } = this.sampleData + const { success, result, message } = await getAction('/gamma/nuclComparison', { + // sampleId, + fileName, + }) + if (success) { + this.compareList = result + } else { + this.$message.error(message) + } + } catch (error) { + console.error(error) + } finally { + this.isLoading = false + } }, async getInfo() { diff --git a/src/views/spectrumAnalysis/components/PeakInfomation.vue b/src/views/spectrumAnalysis/components/PeakInfomation.vue index f88c729..ff4c579 100644 --- a/src/views/spectrumAnalysis/components/PeakInfomation.vue +++ b/src/views/spectrumAnalysis/components/PeakInfomation.vue @@ -9,6 +9,7 @@