Compare commits

...

2 Commits

View File

@ -303,7 +303,7 @@ export default {
item.nidFlag = val ? 1 : 0 item.nidFlag = val ? 1 : 0
} }
}) })
this.$emit('sendInfo', this.resultDisplay, this.spectrumData.stationCode) this.$emit('sendInfo', this.resultDisplay, this.spectrumData.stationCode, this.sampleDetail.savedAnalysisResult)
}, },
async getSampleDetail() { async getSampleDetail() {
this.spectraType = this.SampleType[0].value this.spectraType = this.SampleType[0].value
@ -562,7 +562,6 @@ export default {
item.mdc = parseFloat(item.mdc.toPrecision(6)) item.mdc = parseFloat(item.mdc.toPrecision(6))
}) })
this.$emit('reAnalyCurr', res.result.savedAnalysisResult, res.result.XeData) this.$emit('reAnalyCurr', res.result.savedAnalysisResult, res.result.XeData)
this.handleReAnalyse(res.result)
updateSampleData({ updateSampleData({
inputFileName: this.sample.inputFileName, inputFileName: this.sample.inputFileName,
key: 'XeData', key: 'XeData',
@ -573,6 +572,7 @@ export default {
key: 'savedAnalysisResult', key: 'savedAnalysisResult',
data: res.result.savedAnalysisResult, data: res.result.savedAnalysisResult,
}) })
this.handleReAnalyse(res.result)
if (res.result.bProcessed) { if (res.result.bProcessed) {
this.$message.success(res.result.message) this.$message.success(res.result.message)
} else { } else {
@ -628,19 +628,6 @@ export default {
item.lc = parseFloat(item.lc.toPrecision(6)) item.lc = parseFloat(item.lc.toPrecision(6))
item.mdc = parseFloat(item.mdc.toPrecision(6)) item.mdc = parseFloat(item.mdc.toPrecision(6))
}) })
if (inputFileName == this.sample.inputFileName) {
this.$emit('sendXeData', XeData)
this.$emit('reAnalyAll', savedAnalysisResult, XeData)
this.handleReAnalyse(sampleInfo)
if (bProcessed) {
this.$message.success(message)
} else {
this.$message.warning(message)
}
}
updateSampleData({ updateSampleData({
inputFileName, inputFileName,
key: 'XeData', key: 'XeData',
@ -652,6 +639,17 @@ export default {
key: 'savedAnalysisResult', key: 'savedAnalysisResult',
data: savedAnalysisResult, data: savedAnalysisResult,
}) })
if (inputFileName == this.sample.inputFileName) {
this.$emit('sendXeData', XeData)
this.$emit('reAnalyAll', savedAnalysisResult, XeData)
this.handleReAnalyse(sampleInfo)
if (bProcessed) {
this.$message.success(message)
} else {
this.$message.warning(message)
}
}
}) })
} else { } else {
this.$message.warning(message) this.$message.warning(message)