diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
index 9eb80fb..7d5f098 100644
--- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue
+++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue
@@ -133,6 +133,7 @@ import BetaGammaQcFlags from './components/SubOperators/BetaGammaQcFlags.vue'
import PopOverWithIcon from './components/SubOperators/PopOverWithIcon.vue'
import Spectra from './components/SubOperators/Spectra.vue'
import CustomSelect from '@/components/CustomSelect/index.vue'
+import axios from 'axios'
const StatisticsType = {
'Collection Time': 'Colloc_Time',
@@ -219,6 +220,9 @@ export default {
currSample: {},
}
},
+ destroyed() {
+ this.cancelLastRequest()
+ },
methods: {
handleGetFlag(val, obj) {
this.resultDisplay.forEach((item) => {
@@ -234,10 +238,16 @@ export default {
const { dbName, sampleId } = this.sample
try {
this.isLoading = true
- const { success, result, message } = await getAction('/spectrumAnalysis/getDBSpectrumChart', {
- dbName,
- sampleId,
- })
+ this.cancelLastRequest()
+ const cancelToken = this.createCancelToken()
+ const { success, result, message } = await getAction(
+ '/spectrumAnalysis/getDBSpectrumChart',
+ {
+ dbName,
+ sampleId,
+ },
+ cancelToken
+ )
if (success) {
this.sampleDetail = result
this.changeChartByType('sample')
@@ -264,7 +274,13 @@ export default {
}
try {
this.isLoading = true
- const { success, result, message } = await getAction('/spectrumAnalysis/getFileSpectrumChart', params)
+ this.cancelLastRequest()
+ const cancelToken = this.createCancelToken()
+ const { success, result, message } = await getAction(
+ '/spectrumAnalysis/getFileSpectrumChart',
+ params,
+ cancelToken
+ )
if (success) {
this.sampleDetail = result
this.changeChartByType('sample')
@@ -277,6 +293,19 @@ export default {
}
},
+ cancelLastRequest() {
+ if (this._cancelToken && typeof this._cancelToken == 'function') {
+ this._cancelToken()
+ }
+ },
+
+ createCancelToken() {
+ const cancelToken = new axios.CancelToken((c) => {
+ this._cancelToken = c
+ })
+ return cancelToken
+ },
+
changeChartByType(val) {
if (val === 'qc' && !this.sample.qcFileStatus) {
this.$message.warning('No qc spectrum file!')
diff --git a/src/views/spectrumAnalysis/components/BetaGammaSpectrumChart.vue b/src/views/spectrumAnalysis/components/BetaGammaSpectrumChart.vue
index 3dc5eff..0315866 100644
--- a/src/views/spectrumAnalysis/components/BetaGammaSpectrumChart.vue
+++ b/src/views/spectrumAnalysis/components/BetaGammaSpectrumChart.vue
@@ -411,8 +411,7 @@ export default {
// 改为不可刷选状态
chart.dispatchAction({
- type: 'takeGlobalCursor',
- rushOption: false
+ type: 'takeGlobalCursor'
})
},
diff --git a/src/views/spectrumAnalysis/components/Modals/ArrRrrModal.vue b/src/views/spectrumAnalysis/components/Modals/ArrRrrModal.vue
index bcda351..ba28f60 100644
--- a/src/views/spectrumAnalysis/components/Modals/ArrRrrModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/ArrRrrModal.vue
@@ -3,7 +3,7 @@
{{ content }}