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

fix: 获取曲线图数据接口增加status参数

Browse Source
This commit is contained in:
xiaoguangbin 2024-06-06 18:32:06 +08:00
parent 56eb07ec2b
commit dda6b9fb8e
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/views/spectrumAnalysis/beta-gamma-analysis.vue
View File

@ -308,7 +308,7 @@ export default {
async getSampleDetail() { async getSampleDetail() {
this.spectraType = this.SampleType[0].value this.spectraType = this.SampleType[0].value
const { dbName, sampleId, inputFileName, analyst } = this.sample const { dbName, sampleId, inputFileName, analyst, status } = this.sample
try { try {
this.cancelLastRequest() this.cancelLastRequest()
this.isLoading = true this.isLoading = true
@ -319,6 +319,7 @@ export default {
dbName, dbName,
sampleId, sampleId,
analyst, analyst,
status
}, },
cancelToken cancelToken
) )

3
src/views/spectrumAnalysis/gamma-analysis.vue
View File

@ -523,7 +523,7 @@ export default {
// 获取样品详情 // 获取样品详情
async getSampleDetail() { async getSampleDetail() {
const { dbName, sampleId, analyst } = this.sample const { dbName, sampleId, analyst, status } = this.sample
try { try {
// const { success, result, message } = Response // const { success, result, message } = Response
this.cancelLastRequest() this.cancelLastRequest()
@ -536,6 +536,7 @@ export default {
dbName, dbName,
sampleId, sampleId,
analyst, analyst,
status
}, },
cancelToken cancelToken
) )

6
src/views/spectrumAnalysis/index.vue
View File

@ -578,19 +578,20 @@ export default {
.filter( .filter(
({ sampleType, inputFileName }) => sampleType !== 'B' && inputFileName !== this.sampleData.inputFileName ({ sampleType, inputFileName }) => sampleType !== 'B' && inputFileName !== this.sampleData.inputFileName
) )
.forEach(({ inputFileName: fileName, dbName, sampleId, analyst }) => { .forEach(({ inputFileName: fileName, dbName, sampleId, analyst, status }) => {
const params = { const params = {
sampleId, sampleId,
dbName, dbName,
fileName, fileName,
analyst, analyst,
status
} }
getAction('/gamma/initValue', params) getAction('/gamma/initValue', params)
}) })
willAddList willAddList
.filter(({ sampleType, inputFileName }) => sampleType == 'B' && inputFileName !== this.sampleData.inputFileName) .filter(({ sampleType, inputFileName }) => sampleType == 'B' && inputFileName !== this.sampleData.inputFileName)
.forEach( .forEach(
({ inputFileName: sampleFileName, gasFileName, detFileName, qcFileName, dbName, sampleId, analyst }) => { ({ inputFileName: sampleFileName, gasFileName, detFileName, qcFileName, dbName, sampleId, analyst, status }) => {
const params = { const params = {
sampleId, sampleId,
dbName, dbName,
@ -599,6 +600,7 @@ export default {
gasFileName, gasFileName,
detFileName, detFileName,
qcFileName, qcFileName,
status
} }
getAction('/spectrumAnalysis/initValue', params) getAction('/spectrumAnalysis/initValue', params)
} }