diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue index e9dbceb..44492de 100644 --- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue +++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue @@ -161,6 +161,8 @@ const SampleType = [ }, ] +const sortList = ['Xe131m', 'Xe133', 'Xe133m', 'Xe135'] + export default { components: { BetaGammaChartContainer, @@ -439,6 +441,8 @@ export default { : this.resultDisplay.length > 0 ? this.resultDisplay : XeData + + this.sortResultDisplay() this.$emit('sendInfo', this.resultDisplay, this.spectrumData.stationCode, savedAnalysisResult) @@ -623,6 +627,15 @@ export default { this.$refs.lineChart4Ref.setRange(minX, maxX) } }, + + // 排序result display + sortResultDisplay() { + this.resultDisplay.sort((a, b) => { + const index1 = sortList.indexOf(a.nuclideName) + const index2 = sortList.indexOf(b.nuclideName) + return index1 - index2 + }) + }, }, watch: { sample: { @@ -653,7 +666,7 @@ export default { handler(newVal, oldVal) { // this.currResultDisplay = newVal.XeData this.resultDisplay = newVal.XeData || [] - + this.sortResultDisplay() this.$store.commit('UPDATE_SAMPLE_DATA', { inputFileName: this.sample.inputFileName, key: 'XeData', diff --git a/src/views/spectrumAnalysis/components/ResultDisplay.vue b/src/views/spectrumAnalysis/components/ResultDisplay.vue index 7fbeb65..2d00eb7 100644 --- a/src/views/spectrumAnalysis/components/ResultDisplay.vue +++ b/src/views/spectrumAnalysis/components/ResultDisplay.vue @@ -46,8 +46,6 @@