diff --git a/src/views/spectrumAnalysis/components/Modals/LoadFromDBModal.vue b/src/views/spectrumAnalysis/components/Modals/LoadFromDBModal.vue index 9ce3d5c..ed97764 100644 --- a/src/views/spectrumAnalysis/components/Modals/LoadFromDBModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/LoadFromDBModal.vue @@ -37,6 +37,7 @@ import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { getAction } from '../../../../api/manage' import moment from 'moment' +import { cloneDeep } from 'lodash' const columns = [ { @@ -201,7 +202,7 @@ export default { } this.selectedRowKeys = [] this.visible = false - this.$emit('loadSample', this.selectionRows) + this.$emit('loadSample', cloneDeep(this.selectionRows)) }, // 获取台站和探测器列表 diff --git a/src/views/spectrumAnalysis/components/SpectraListInMenu.vue b/src/views/spectrumAnalysis/components/SpectraListInMenu.vue index 6969a05..f55065b 100644 --- a/src/views/spectrumAnalysis/components/SpectraListInMenu.vue +++ b/src/views/spectrumAnalysis/components/SpectraListInMenu.vue @@ -1,11 +1,16 @@ @@ -26,25 +31,25 @@ export default { this.$forceUpdate() }, - handleRemove(spectraItem) { - const index = this.list.findIndex(item => item == spectraItem) - this.list.splice(index, 1) + handleRemove(spectraItem, index) { // 如果删除了一个选中的 if (spectraItem.checked) { - if (index == 0) { - // 如果是第一个,则选中下一个 - this.handleClick(this.list[0]) - } else { - // 如果不是第一个,则选中上一个 + // // 如果是倒数第一个,则选中上一个 + if (index == this.list.length - 1) { this.handleClick(this.list[index - 1]) } + // 否则选中下一个 + else { + this.handleClick(this.list[index + 1]) + } } + this.list.splice(index, 1) this.$forceUpdate() } }, watch: { list(newVal) { - if (newVal.length) { + if (newVal.length && !newVal.find(item => item.checked)) { this.handleClick(newVal[0]) } } diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue index a3ed212..8e985ef 100644 --- a/src/views/spectrumAnalysis/index.vue +++ b/src/views/spectrumAnalysis/index.vue @@ -382,12 +382,12 @@ export default { }, created() { this.$bus.$on('reanalyse', this.handleReanalyse) - this.loadSelectedSample({ - sampleId: 426530, - sampleType: 'G', - dbName: 'auto', - inputFileName: 'CAX05_001-20230731_1528_S_FULL_37563.6.PHD', - }) + // this.loadSelectedSample({ + // sampleId: 426530, + // sampleType: 'G', + // dbName: 'auto', + // inputFileName: 'CAX05_001-20230731_1528_S_FULL_37563.6.PHD', + // }) }, destroyed() { @@ -679,8 +679,7 @@ export default { if (spectra) { this.loadSelectedSample(spectra) } else { - this.analysisType = undefined - this.sampleData = {} + this.handleCleanAll() } }, },