fix: Reprocessing All功能,及部分问题修改
This commit is contained in:
		
							parent
							
								
									26c4b05abb
								
							
						
					
					
						commit
						b7767bd15e
					
				|  | @ -313,7 +313,7 @@ export default { | ||||||
|         ) |         ) | ||||||
|         console.log('%c [ result ]-243', 'font-size:13px; background:pink; color:#bf2c9f;', result) |         console.log('%c [ result ]-243', 'font-size:13px; background:pink; color:#bf2c9f;', result) | ||||||
|         if (success) { |         if (success) { | ||||||
|           this.dataProsess(result, 'db') |           this.dataProcess(result, 'db') | ||||||
|         } else { |         } else { | ||||||
|           this.$message.error(message) |           this.$message.error(message) | ||||||
|           this.isLoading = false |           this.isLoading = false | ||||||
|  | @ -343,7 +343,7 @@ export default { | ||||||
|         ) |         ) | ||||||
|         console.log('%c [ result ]-243', 'font-size:13px; background:pink; color:#bf2c9f;', result) |         console.log('%c [ result ]-243', 'font-size:13px; background:pink; color:#bf2c9f;', result) | ||||||
|         if (success) { |         if (success) { | ||||||
|           this.dataProsess(result, 'file') |           this.dataProcess(result, 'file') | ||||||
|         } else { |         } else { | ||||||
|           this.$message.error(message) |           this.$message.error(message) | ||||||
|           this.isLoading = false |           this.isLoading = false | ||||||
|  | @ -367,7 +367,7 @@ export default { | ||||||
|       return cancelToken |       return cancelToken | ||||||
|     }, |     }, | ||||||
| 
 | 
 | ||||||
|     dataProsess(result, flag) { |     dataProcess(result, flag) { | ||||||
|       this.isLoading = false |       this.isLoading = false | ||||||
| 
 | 
 | ||||||
|       const { |       const { | ||||||
|  | @ -527,7 +527,12 @@ export default { | ||||||
|         }) |         }) | ||||||
|       ) |       ) | ||||||
| 
 | 
 | ||||||
|  |       this.opts.notMerge = true | ||||||
|       this.option.series = series |       this.option.series = series | ||||||
|  |        | ||||||
|  |       this.$nextTick(() => { | ||||||
|  |         this.resetChartOpts() | ||||||
|  |       }) | ||||||
|     }, |     }, | ||||||
| 
 | 
 | ||||||
|     // chart 的 tooltip |     // chart 的 tooltip | ||||||
|  | @ -788,7 +793,7 @@ export default { | ||||||
|           this.$message.error(message) |           this.$message.error(message) | ||||||
|         } |         } | ||||||
|       } catch (error) { |       } catch (error) { | ||||||
|         this.list = [] |         this.nuclideLibraryList = [] | ||||||
|         console.error(error) |         console.error(error) | ||||||
|       } finally { |       } finally { | ||||||
|         this.isLoadingNuclide = false |         this.isLoadingNuclide = false | ||||||
|  | @ -1169,7 +1174,7 @@ export default { | ||||||
|       this.handleResetState() |       this.handleResetState() | ||||||
|       data.DetailedInformation = this.detailedInfomation |       data.DetailedInformation = this.detailedInfomation | ||||||
|       this.clearCompareLine() |       this.clearCompareLine() | ||||||
|       this.dataProsess(data) |       this.dataProcess(data) | ||||||
|     }, |     }, | ||||||
| 
 | 
 | ||||||
|     // 分析工具Accept时刷新部分数据 |     // 分析工具Accept时刷新部分数据 | ||||||
|  | @ -1278,7 +1283,7 @@ export default { | ||||||
|     }, |     }, | ||||||
| 
 | 
 | ||||||
|     // 重新分析 |     // 重新分析 | ||||||
|     async reProcessing() { |     async reProcessing(showMessage = true) { | ||||||
|       if (this.isProcessing) { |       if (this.isProcessing) { | ||||||
|         return |         return | ||||||
|       } |       } | ||||||
|  | @ -1297,15 +1302,17 @@ export default { | ||||||
|           this.$emit('reAnalyed', this.isReAnalyed) |           this.$emit('reAnalyed', this.isReAnalyed) | ||||||
|           this.handleResetState() |           this.handleResetState() | ||||||
|           result.DetailedInformation = this.detailedInfomation |           result.DetailedInformation = this.detailedInfomation | ||||||
|           this.dataProsess(result) |           this.dataProcess(result) | ||||||
|         } else { |         } else { | ||||||
|           this.isLoading = false |           this.isLoading = false | ||||||
|  |           if(showMessage) { | ||||||
|             const arr = message.split('\n') |             const arr = message.split('\n') | ||||||
|             this.$warning({ |             this.$warning({ | ||||||
|               title: 'Warning', |               title: 'Warning', | ||||||
|               content: () => arr.map((text) => <div>{text}</div>), |               content: () => arr.map((text) => <div>{text}</div>), | ||||||
|             }) |             }) | ||||||
|           } |           } | ||||||
|  |         } | ||||||
|       } catch (error) { |       } catch (error) { | ||||||
|         console.error(error) |         console.error(error) | ||||||
|       } finally { |       } finally { | ||||||
|  |  | ||||||
|  | @ -599,7 +599,21 @@ export default { | ||||||
|     }, |     }, | ||||||
| 
 | 
 | ||||||
|     handleReprocessAll() { |     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 |     // 查看Comments | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue
	
	Block a user