xiaoguangbin/AnalysisSystemForRadionuclide_vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复Load From File，从FTP加载时，无法多次加载同一数据的问题

Browse Source
This commit is contained in:
Xu Zhimeng 2024-07-09 16:08:32 +08:00
parent acdd26424a
commit dc0b9065a5
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/spectrumAnalysis/beta-analysis.vue
View File

@ -82,6 +82,7 @@ import RoiLimits from './components/RoiLimits.vue'
import RoiParam from './components/RoiParam.vue' import RoiParam from './components/RoiParam.vue'
import axios from 'axios' import axios from 'axios'
import { getAction, postAction, deleteAction } from '../../api/manage' import { getAction, postAction, deleteAction } from '../../api/manage'
import { addSampleData, getSampleData } from '@/utils/SampleStore'
const SampleType = [ const SampleType = [
{ {
label: 'Sample Data', label: 'Sample Data',
@ -132,7 +133,7 @@ export default {
sample: { sample: {
async handler(newVal, oldVal) { async handler(newVal, oldVal) {
// this.resultDisplay = [] // this.resultDisplay = []
const sampleData = await this.$store.dispatch('GET_SAMPLE_DATA', newVal.inputFileName) const sampleData = getSampleData(newVal.inputFileName)
if (sampleData) { if (sampleData) {
const { data, from } = sampleData const { data, from } = sampleData
this.sampleDetail = data this.sampleDetail = data
@ -148,6 +149,7 @@ export default {
this.getSelfStationSampleDetail() this.getSelfStationSampleDetail()
} }
} }
await this.$nextTick()
this.$refs.betaChartRef.handleUnzoom() this.$refs.betaChartRef.handleUnzoom()
}, },
immediate: true, immediate: true,
@ -300,7 +302,7 @@ export default {
const cancelToken = this.createCancelToken() const cancelToken = this.createCancelToken()
const { success, result, message } = await getAction('/selfStation/loadFromFile', params, cancelToken) const { success, result, message } = await getAction('/selfStation/loadFromFile', params, cancelToken)
if (success) { if (success) {
this.$store.commit('ADD_SAMPLE_DATA', { addSampleData({
inputFileName, inputFileName,
data: result, data: result,
from: 'file', from: 'file',

3
src/views/spectrumAnalysis/components/Modals/LoadFromFileModal.vue
View File

@ -207,6 +207,7 @@ import { FilePicker } from '@/utils/FilePicker'
import { readFile, zipFile } from '@/utils/file' import { readFile, zipFile } from '@/utils/file'
import { isSample, PHDParser, PHD_DATA_TYPE } from '@/utils/phdHelper' import { isSample, PHDParser, PHD_DATA_TYPE } from '@/utils/phdHelper'
import ModalMixin from '@/mixins/ModalMixin' import ModalMixin from '@/mixins/ModalMixin'
import { cloneDeep } from 'lodash'
const columns = [ const columns = [
{ {
@ -764,7 +765,7 @@ export default {
} }
} else { } else {
this.visible = false this.visible = false
this.$emit('loadFormFile', this.list) this.$emit('loadFormFile', cloneDeep(this.list))
} }
}, },