fix: 修复beta清理缓存的调用在load from file时传的文件名不正确问题,getGammaGated接口增加文件名参数
This commit is contained in:
		
							parent
							
								
									30d6f111d3
								
							
						
					
					
						commit
						da9257e81b
					
				| 
						 | 
					@ -6,17 +6,17 @@ import Vue from 'vue'
 | 
				
			||||||
 * 发起请求清理后端对sample的缓存
 | 
					 * 发起请求清理后端对sample的缓存
 | 
				
			||||||
 * @param {Array<any>} sampleList
 | 
					 * @param {Array<any>} sampleList
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
export const clearSampleCache = (sampleList) => {
 | 
					export const clearSampleCache = sampleList => {
 | 
				
			||||||
    sampleList.forEach(sample => {
 | 
					  sampleList.forEach(sample => {
 | 
				
			||||||
        const { inputFileName: fileName, sampleFileName, qcFileName } = sample
 | 
					    const { inputFileName: fileName } = sample
 | 
				
			||||||
        let url = '/gamma/delPHDCache',
 | 
					    let url = '/gamma/delPHDCache',
 | 
				
			||||||
            params = { fileName }
 | 
					      params = { fileName }
 | 
				
			||||||
        if (sample.sampleType == 'B') {
 | 
					    if (sample.sampleType == 'B') {
 | 
				
			||||||
            url = '/spectrumAnalysis/deleteSpectrumCacheData'
 | 
					      url = '/spectrumAnalysis/deleteSpectrumCacheData'
 | 
				
			||||||
            params = { sampleFileName , qcFileName }
 | 
					      params = { sampleFileName: fileName }
 | 
				
			||||||
        }
 | 
					    }
 | 
				
			||||||
        deleteAction(url, params)
 | 
					    deleteAction(url, params)
 | 
				
			||||||
        store.commit('REMOVE_SAMPLE_DATA', fileName)
 | 
					    store.commit('REMOVE_SAMPLE_DATA', fileName)
 | 
				
			||||||
        Vue.ls.remove(`calibration-gamma:${fileName}`)
 | 
					    Vue.ls.remove(`calibration-gamma:${fileName}`)
 | 
				
			||||||
    })
 | 
					  })
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					@ -696,7 +696,7 @@ export default {
 | 
				
			||||||
        this.cancelLastRequest()
 | 
					        this.cancelLastRequest()
 | 
				
			||||||
        const cancelToken = this.createCancelToken()
 | 
					        const cancelToken = this.createCancelToken()
 | 
				
			||||||
        this.isLoadingGammaGated = true
 | 
					        this.isLoadingGammaGated = true
 | 
				
			||||||
        const { sampleId, qcFileName } = this.newSampleData
 | 
					        const { sampleId, qcFileName, inputFileName: sampleFileName } = this.newSampleData
 | 
				
			||||||
        const {
 | 
					        const {
 | 
				
			||||||
          success,
 | 
					          success,
 | 
				
			||||||
          result: { data },
 | 
					          result: { data },
 | 
				
			||||||
| 
						 | 
					@ -709,6 +709,7 @@ export default {
 | 
				
			||||||
            chartHeight: this.gammaEnergy.length,
 | 
					            chartHeight: this.gammaEnergy.length,
 | 
				
			||||||
            channelWidth: this.gammaChannelWidth,
 | 
					            channelWidth: this.gammaChannelWidth,
 | 
				
			||||||
            qcFileName,
 | 
					            qcFileName,
 | 
				
			||||||
 | 
					            sampleFileName
 | 
				
			||||||
          },
 | 
					          },
 | 
				
			||||||
          cancelToken
 | 
					          cancelToken
 | 
				
			||||||
        )
 | 
					        )
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue
	
	Block a user