fix: Reprocessing All功能,及部分问题修改

This commit is contained in:
Xu Zhimeng 2023-10-20 17:59:52 +08:00
parent 26c4b05abb
commit b7767bd15e
2 changed files with 34 additions and 13 deletions

View File

@ -313,7 +313,7 @@ export default {
)
console.log('%c [ result ]-243', 'font-size:13px; background:pink; color:#bf2c9f;', result)
if (success) {
this.dataProsess(result, 'db')
this.dataProcess(result, 'db')
} else {
this.$message.error(message)
this.isLoading = false
@ -343,7 +343,7 @@ export default {
)
console.log('%c [ result ]-243', 'font-size:13px; background:pink; color:#bf2c9f;', result)
if (success) {
this.dataProsess(result, 'file')
this.dataProcess(result, 'file')
} else {
this.$message.error(message)
this.isLoading = false
@ -367,7 +367,7 @@ export default {
return cancelToken
},
dataProsess(result, flag) {
dataProcess(result, flag) {
this.isLoading = false
const {
@ -527,7 +527,12 @@ export default {
})
)
this.opts.notMerge = true
this.option.series = series
this.$nextTick(() => {
this.resetChartOpts()
})
},
// chart tooltip
@ -788,7 +793,7 @@ export default {
this.$message.error(message)
}
} catch (error) {
this.list = []
this.nuclideLibraryList = []
console.error(error)
} finally {
this.isLoadingNuclide = false
@ -1169,7 +1174,7 @@ export default {
this.handleResetState()
data.DetailedInformation = this.detailedInfomation
this.clearCompareLine()
this.dataProsess(data)
this.dataProcess(data)
},
// Accept
@ -1278,7 +1283,7 @@ export default {
},
//
async reProcessing() {
async reProcessing(showMessage = true) {
if (this.isProcessing) {
return
}
@ -1297,14 +1302,16 @@ export default {
this.$emit('reAnalyed', this.isReAnalyed)
this.handleResetState()
result.DetailedInformation = this.detailedInfomation
this.dataProsess(result)
this.dataProcess(result)
} else {
this.isLoading = false
const arr = message.split('\n')
this.$warning({
title: 'Warning',
content: () => arr.map((text) => <div>{text}</div>),
})
if(showMessage) {
const arr = message.split('\n')
this.$warning({
title: 'Warning',
content: () => arr.map((text) => <div>{text}</div>),
})
}
}
} catch (error) {
console.error(error)

View File

@ -599,7 +599,21 @@ export default {
},
handleReprocessAll() {
console.log('%c [ handleReprocessAll ]-216', 'font-size:13px; background:pink; color:#bf2c9f;')
const { inputFileName, sampleType } = this.sampleData
//
const otherSampleList = this.sampleList.filter((sample) => sample.inputFileName !== inputFileName)
const betaSamples = otherSampleList.filter((sample) => sample.sampleType == 'B')
const gammaSamples = otherSampleList.filter((sample) => sample.sampleType !== 'B')
gammaSamples.forEach((gammaSample) => {
postAction(`/gamma/Reprocessing?fileName=${gammaSample.inputFileName}`)
})
// reprocessing
if(inputFileName && sampleType !== 'B') {
this.$refs.gammaAnalysisRef.reProcessing(false)
}
},
// Comments