WIP: 修改Interactive Tools 弹窗诸多问题
This commit is contained in:
		
							parent
							
								
									cc8e027322
								
							
						
					
					
						commit
						f50fcf4fa2
					
				|  | @ -156,9 +156,10 @@ export default { | ||||||
|         const { success, result, message } = await postAction('/gamma/acceptResults', { |         const { success, result, message } = await postAction('/gamma/acceptResults', { | ||||||
|           fileName, |           fileName, | ||||||
|           accept, |           accept, | ||||||
|           oldPeaks: this.oldPeaks, |           oldPeak: this.oldPeaks, | ||||||
|           newPeak: this.newPeaks, |           newPeak: this.newPeaks, | ||||||
|           flag: this.isInsertPeak ? 'insert' : 'fit' |           flag: this.isInsertPeak ? 'insert' : 'fit', | ||||||
|  |           tablePeaksList: this.list | ||||||
|         }) |         }) | ||||||
|         if (success) { |         if (success) { | ||||||
|           this.visible = false |           this.visible = false | ||||||
|  |  | ||||||
|  | @ -200,6 +200,7 @@ export default { | ||||||
|         baseLineCP: [], |         baseLineCP: [], | ||||||
|       }, |       }, | ||||||
|       peakList: [], // Peak 列表(非点位) |       peakList: [], // Peak 列表(非点位) | ||||||
|  |       baseCtrls: {}, // BaseCtrls | ||||||
| 
 | 
 | ||||||
|       nuclideLibraryList: [], // 当前鼠标点击选中的channel |       nuclideLibraryList: [], // 当前鼠标点击选中的channel | ||||||
|       peakInfomationTooltip: { |       peakInfomationTooltip: { | ||||||
|  | @ -530,7 +531,7 @@ export default { | ||||||
| 
 | 
 | ||||||
|       this.$store.commit('ADD_SAMPLE_DATA', { |       this.$store.commit('ADD_SAMPLE_DATA', { | ||||||
|         inputFileName, |         inputFileName, | ||||||
|         data: Object.assign(result, { BaseCtrls: baseCtrlJson }), |         data: result, | ||||||
|         from: flag, |         from: flag, | ||||||
|       }) |       }) | ||||||
| 
 | 
 | ||||||
|  | @ -553,6 +554,7 @@ export default { | ||||||
|         shapeChannelData, |         shapeChannelData, | ||||||
|         shapeEnergyData, |         shapeEnergyData, | ||||||
|         peak, |         peak, | ||||||
|  |         BaseCtrls, | ||||||
|       } = result |       } = result | ||||||
|       if (flag && (flag == 'dab' || flag == 'file')) { |       if (flag && (flag == 'dab' || flag == 'file')) { | ||||||
|         this.bAnalyed = result.bAnalyed |         this.bAnalyed = result.bAnalyed | ||||||
|  | @ -568,6 +570,10 @@ export default { | ||||||
|         this.peakList = peak |         this.peakList = peak | ||||||
|       } |       } | ||||||
| 
 | 
 | ||||||
|  |       if(BaseCtrls) { | ||||||
|  |         this.baseCtrls = BaseCtrls | ||||||
|  |       } | ||||||
|  | 
 | ||||||
|       const channelPeakGroup = this.getLineData(allData, 'Peak', 'channel', true) |       const channelPeakGroup = this.getLineData(allData, 'Peak', 'channel', true) | ||||||
|       const energyPeakGroup = this.getLineData(allData, 'Peak', 'energy', true) |       const energyPeakGroup = this.getLineData(allData, 'Peak', 'energy', true) | ||||||
| 
 | 
 | ||||||
|  | @ -1303,6 +1309,7 @@ export default { | ||||||
|     handleRefresh(data) { |     handleRefresh(data) { | ||||||
|       data.DetailedInformation = this.detailedInfomation |       data.DetailedInformation = this.detailedInfomation | ||||||
|       data.QCFlag = this.qcFlags |       data.QCFlag = this.qcFlags | ||||||
|  |       data.BaseCtrls = this.baseCtrls | ||||||
|       this.clearCompareLine() |       this.clearCompareLine() | ||||||
|       this.redrawPeakLine() |       this.redrawPeakLine() | ||||||
|       this.dataProcess(data) |       this.dataProcess(data) | ||||||
|  | @ -1329,6 +1336,7 @@ export default { | ||||||
|         shapeChannelData, |         shapeChannelData, | ||||||
|         shapeEnergyData, |         shapeEnergyData, | ||||||
|         peak: peakSet, |         peak: peakSet, | ||||||
|  |         BaseCtrls: this.baseCtrls, | ||||||
|       } |       } | ||||||
|       this.clearCompareLine() |       this.clearCompareLine() | ||||||
|       this.redrawPeakLine() |       this.redrawPeakLine() | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue
	
	Block a user