from file 加载两个谱,切回另外一个谱的时候没有刷新分析后的数据1)加载谱之后,先切换到第二个谱然后点击reprocess all2)分析完之后第二个谱有分析数据,切换回第一个没有获取最新的分析结果
This commit is contained in:
		
							parent
							
								
									3320234545
								
							
						
					
					
						commit
						4a59c95cbb
					
				| 
						 | 
					@ -810,20 +810,6 @@ export default {
 | 
				
			||||||
      if (gammaInputFileNames.length > 0) {
 | 
					      if (gammaInputFileNames.length > 0) {
 | 
				
			||||||
        this.fetchReprocessing(gammaInputFileNames, inputFileName, sampleType)
 | 
					        this.fetchReprocessing(gammaInputFileNames, inputFileName, sampleType)
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
 | 
					 | 
				
			||||||
      // // 先排除当前的谱
 | 
					 | 
				
			||||||
      // 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)
 | 
					 | 
				
			||||||
      // }
 | 
					 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    async fetchReprocessing(fileNames, currFileName, sampleType) {
 | 
					    async fetchReprocessing(fileNames, currFileName, sampleType) {
 | 
				
			||||||
      if (fileNames[0] == currFileName && sampleType !== 'B') {
 | 
					      if (fileNames[0] == currFileName && sampleType !== 'B') {
 | 
				
			||||||
| 
						 | 
					@ -832,6 +818,7 @@ export default {
 | 
				
			||||||
            this.finishCont++
 | 
					            this.finishCont++
 | 
				
			||||||
            this.percentBar = this.finishCont / this.gammaSampleNum
 | 
					            this.percentBar = this.finishCont / this.gammaSampleNum
 | 
				
			||||||
            this.analysedFileName = fileNames.splice(0, 1)
 | 
					            this.analysedFileName = fileNames.splice(0, 1)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            if (fileNames.length > 0) {
 | 
					            if (fileNames.length > 0) {
 | 
				
			||||||
              this.fetchReprocessing(fileNames, currFileName, sampleType)
 | 
					              this.fetchReprocessing(fileNames, currFileName, sampleType)
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
| 
						 | 
					@ -849,6 +836,11 @@ export default {
 | 
				
			||||||
        try {
 | 
					        try {
 | 
				
			||||||
          const { success, result, message } = await postAction(`/gamma/Reprocessing?fileName=${fileNames[0]}`)
 | 
					          const { success, result, message } = await postAction(`/gamma/Reprocessing?fileName=${fileNames[0]}`)
 | 
				
			||||||
          if (success) {
 | 
					          if (success) {
 | 
				
			||||||
 | 
					            this.$store.commit('ADD_SAMPLE_DATA', {
 | 
				
			||||||
 | 
					              inputFileName: fileNames[0],
 | 
				
			||||||
 | 
					              data: result,
 | 
				
			||||||
 | 
					              from: '',
 | 
				
			||||||
 | 
					            })
 | 
				
			||||||
            this.finishCont++
 | 
					            this.finishCont++
 | 
				
			||||||
            this.percentBar = this.finishCont / this.gammaSampleNum
 | 
					            this.percentBar = this.finishCont / this.gammaSampleNum
 | 
				
			||||||
            this.analysedFileName = fileNames.splice(0, 1)
 | 
					            this.analysedFileName = fileNames.splice(0, 1)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue
	
	Block a user