xiaoguangbin
							
						 
					 | 
					
						
						
						
						
							
						
						
							a59ebff589
							
						
					 | 
					
						
						
							
							Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
						
						
						
						
						
					 | 
					
						2023-10-19 15:47:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b70211b4e5
							
						
					 | 
					
						
						
							
							fix: BetaGammaExtrapolationModal
						
						
						
						
						
					 | 
					
						2023-10-18 18:02:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							52e360eca5
							
						
					 | 
					
						
						
							
							feat: 对接分析功能
						
						
						
						
						
					 | 
					
						2023-10-18 17:59:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							edf91d5e74
							
						
					 | 
					
						
						
							
							fix: 修复Beta 2D图表右侧色盘选择颜色逻辑不正确问题
						
						
						
						
						
					 | 
					
						2023-10-18 16:15:17 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								任珮宇
							
						 
					 | 
					
						
						
						
						
							
						
						
							7bc449d0ce
							
						
					 | 
					
						
						
							
							Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into feature-analysis-RLR-renpy
						
						
						
						
						
					 | 
					
						2023-10-18 13:58:21 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								任珮宇
							
						 
					 | 
					
						
						
						
						
							
						
						
							fe748ee4ce
							
						
					 | 
					
						
						
							
							处理本地文件 分析之后,然后切换谱之后 右下角的分析结果也被清空了的问题
						
						
						
						
						
					 | 
					
						2023-10-18 13:58:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1719ea841a
							
						
					 | 
					
						
						
							
							fix: 增加分析完成的提示
						
						
						
						
						
					 | 
					
						2023-10-18 11:30:33 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3493b27fb5
							
						
					 | 
					
						
						
							
							fix: 下拉选择宽度问题
						
						
						
						
						
					 | 
					
						2023-10-18 11:27:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e9a3a7df46
							
						
					 | 
					
						
						
							
							WIP: Extrapolation图表的操作部分
						
						
						
						
						
					 | 
					
						2023-10-17 19:03:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								任珮宇
							
						 
					 | 
					
						
						
						
						
							
						
						
							0efe3364d5
							
						
					 | 
					
						
						
							
							beta 查看RRR的接口参数调整
						
						
						
						
						
						
						
						beta、gamma 查看RRR 逻辑调整,增加权限,(分析后才可以查看) 
						
					 | 
					
						2023-10-17 17:23:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c493d0abdc
							
						
					 | 
					
						
						
							
							fix: Gamma的Calibration初步优化
						
						
						
						
						
					 | 
					
						2023-10-17 15:26:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d2878ecd36
							
						
					 | 
					
						
						
							
							feat: Strip功能
						
						
						
						
						
					 | 
					
						2023-10-17 15:25:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								任珮宇
							
						 
					 | 
					
						
						
						
						
							
						
						
							f0dc116793
							
						
					 | 
					
						
						
							
							beta 模块 view ARR 和 Automatic Analysis Log 增加按钮权限,及提示信息
						
						
						
						
						
					 | 
					
						2023-10-17 15:15:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								任珮宇
							
						 
					 | 
					
						
						
						
						
							
						
						
							83d3da81ad
							
						
					 | 
					
						
						
							
							gamma File-Format-Ftransit 弹窗中Spectrum Transfer 功能前端代码实现
						
						
						
						
						
					 | 
					
						2023-10-17 14:35:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0f8d019a56
							
						
					 | 
					
						
						
							
							fix: 优化部分逻辑和代码
						
						
						
						
						
					 | 
					
						2023-10-17 10:00:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4edd3d250b
							
						
					 | 
					
						
						
							
							feat: Replot功能对接
						
						
						
						
						
					 | 
					
						2023-10-16 19:26:51 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								任珮宇
							
						 
					 | 
					
						
						
						
						
							
						
						
							6a1fe4a7a0
							
						
					 | 
					
						
						
							
							File-Format-Ftransit 弹窗INT.SPC<=>.IMS和Canberra.IEC<=>.IMS 表单字段默认值调整
						
						
						
						
						
					 | 
					
						2023-10-16 18:24:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								任珮宇
							
						 
					 | 
					
						
						
						
						
							
						
						
							765507f755
							
						
					 | 
					
						
						
							
							处理 Load From File 来源的,ARR 和 Automatic Analysis Log 弹窗的展示逻辑,并给出提示
						
						
						
						
						
					 | 
					
						2023-10-16 16:33:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								任珮宇
							
						 
					 | 
					
						
						
						
						
							
						
						
							aa6ac23fd5
							
						
					 | 
					
						
						
							
							gamma  的 save to file功能(Save as Txt ,Save as Excel)接口对接联调
						
						
						
						
						
						
						
						gamma 的 Save PHD to File 功能接口对接,联调 
						
					 | 
					
						2023-10-16 16:12:04 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							eddab8db4c
							
						
					 | 
					
						
						
							
							WIP: Accept功能
						
						
						
						
						
					 | 
					
						2023-10-16 08:35:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								任珮宇
							
						 
					 | 
					
						
						
						
						
							
						
						
							90cfebf23e
							
						
					 | 
					
						
						
							
							beta 重新分析接口对接,及save to DB 功能调试
						
						
						
						
						
					 | 
					
						2023-10-13 19:49:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0db383e436
							
						
					 | 
					
						
						
							
							Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into feature-analysis-RLR-renpy
						
						
						
						
						
					 | 
					
						2023-10-13 19:08:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7cc143bbd4
							
						
					 | 
					
						
						
							
							WIP: 修改Insert和Fit Peak接口和逻辑,增加BaseLine的Accept接口
						
						
						
						
						
					 | 
					
						2023-10-13 19:07:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								任珮宇
							
						 
					 | 
					
						
						
						
						
							
						
						
							d37106f05f
							
						
					 | 
					
						
						
							
							调整后端beta loadFromFile 和 loadFromDB的 XeData参数
						
						
						
						
						
					 | 
					
						2023-10-13 11:48:04 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b4782e98df
							
						
					 | 
					
						
						
							
							fix: 从服务端加载谱发生错误时,关闭loading;修复reprocessing未成功时也事先清除了series的问题
						
						
						
						
						
					 | 
					
						2023-10-13 10:33:46 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoguangbin
							
						 
					 | 
					
						
						
						
						
							
						
						
							3187130d59
							
						
					 | 
					
						
						
							
							Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
						
						
						
						
						
					 | 
					
						2023-10-13 09:34:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							758f5a9499
							
						
					 | 
					
						
						
							
							fix: 更换WASM文件
						
						
						
						
						
					 | 
					
						2023-10-13 09:15:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f912c4d8dc
							
						
					 | 
					
						
						
							
							Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into feature-analysis-RLR-renpy
						
						
						
						
						
					 | 
					
						2023-10-12 18:24:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							eca536a9e2
							
						
					 | 
					
						
						
							
							feat: 调用wasm计算新的baseline,因echarts移动点比较复杂,重新用html实现,同时将解析完后的后续操作实现
						
						
						
						
						
					 | 
					
						2023-10-12 18:24:28 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoguangbin
							
						 
					 | 
					
						
						
						
						
							
						
						
							64e3c33ccd
							
						
					 | 
					
						
						
							
							Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
						
						
						
						
						
					 | 
					
						2023-10-12 17:29:23 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								任珮宇
							
						 
					 | 
					
						
						
						
						
							
						
						
							adc3798c99
							
						
					 | 
					
						
						
							
							处理重新分析的接口,返回500时,弹窗闪烁的问题
						
						
						
						
						
					 | 
					
						2023-10-12 17:28:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoguangbin
							
						 
					 | 
					
						
						
						
						
							
						
						
							c3ae1d96a2
							
						
					 | 
					
						
						
							
							Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
						
						
						
						
						
					 | 
					
						2023-10-12 16:54:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								任珮宇
							
						 
					 | 
					
						
						
						
						
							
						
						
							fd9bf12a43
							
						
					 | 
					
						
						
							
							gamma 第一次分析之后没有在configure中修改数据 是不允许二次分析的逻辑添加
						
						
						
						
						
					 | 
					
						2023-10-12 16:08:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoguangbin
							
						 
					 | 
					
						
						
						
						
							
						
						
							84441e9c42
							
						
					 | 
					
						
						
							
							Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
						
						
						
						
						
					 | 
					
						2023-10-12 15:31:29 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoguangbin
							
						 
					 | 
					
						
						
						
						
							
						
						
							2a0be5104b
							
						
					 | 
					
						
						
							
							Merge branch 'master-dev' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
						
						
						
						
						
					 | 
					
						2023-10-12 15:31:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								任珮宇
							
						 
					 | 
					
						
						
						
						
							
						
						
							5d632a2954
							
						
					 | 
					
						
						
							
							analysis 模块,重新分析弹窗,状态更新实时更新
						
						
						
						
						
					 | 
					
						2023-10-12 15:30:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								任珮宇
							
						 
					 | 
					
						
						
						
						
							
						
						
							f14469f8fe
							
						
					 | 
					
						
						
							
							系统消息通知弹窗中的副标题调整
						
						
						
						
						
						
						
						system 模块 scheduling tab页面中日历组件默认让是调整 
						
					 | 
					
						2023-10-11 10:31:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4a17c09ddd
							
						
					 | 
					
						
						
							
							fix: 修复Analysis Settings 部分值未保存的问题
						
						
						
						
						
					 | 
					
						2023-10-11 10:02:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								任珮宇
							
						 
					 | 
					
						
						
						
						
							
						
						
							3a413b37fb
							
						
					 | 
					
						
						
							
							Merge branch 'feature-Alarm-renpy' into master-dev
						
						
						
						
						
					 | 
					
						2023-10-10 17:29:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								任珮宇
							
						 
					 | 
					
						
						
						
						
							
						
						
							1de8300df3
							
						
					 | 
					
						
						
							
							代码结构调整
						
						
						
						
						
					 | 
					
						2023-10-10 17:28:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								任珮宇
							
						 
					 | 
					
						
						
						
						
							
						
						
							7e33d014d4
							
						
					 | 
					
						
						
							
							alarm 模块 SERVICE AND PROCESS tab 页面图表调整,及代码优化
						
						
						
						
						
						
						
						alarm 模块 CPU tab 页面图表标题调整 
						
					 | 
					
						2023-10-10 15:59:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0a021a3c53
							
						
					 | 
					
						
						
							
							fix: Load From File关闭时保留表格内容,修复斜率编辑时值不对的问题,修复有斜率的基线控制点旁边+号位置问题,修复Peak Infomation切换时底部图表标题未更新问题
						
						
						
						
						
					 | 
					
						2023-10-10 15:55:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoguangbin
							
						 
					 | 
					
						
						
						
						
							
						
						
							5676fff627
							
						
					 | 
					
						
						
							
							Merge branch 'master-dev' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
						
						
						
						
						
					 | 
					
						2023-10-10 15:50:29 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoguangbin
							
						 
					 | 
					
						
						
						
						
							
						
						
							692cb33145
							
						
					 | 
					
						
						
							
							Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
						
						
						
						
						
					 | 
					
						2023-10-09 20:07:13 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							36ba4a8167
							
						
					 | 
					
						
						
							
							refactor: 重写PHD解析方法以适配内容各异的文件
						
						
						
						
						
					 | 
					
						2023-10-09 19:10:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								任珮宇
							
						 
					 | 
					
						
						
						
						
							
						
						
							fc0e3a79a4
							
						
					 | 
					
						
						
							
							Merge branch 'feature-particulate-renpy' into master-dev
						
						
						
						
						
					 | 
					
						2023-10-09 15:31:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								任珮宇
							
						 
					 | 
					
						
						
						
						
							
						
						
							3e0a17f55c
							
						
					 | 
					
						
						
							
							处理web模块 particulate-BLANKPHD 页面中,接口参数调整,及下载问题
						
						
						
						
						
					 | 
					
						2023-10-09 15:30:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a06362f23d
							
						
					 | 
					
						
						
							
							feat: 完成Beta的Save Results to File 对接
						
						
						
						
						
					 | 
					
						2023-10-09 14:25:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoguangbin
							
						 
					 | 
					
						
						
						
						
							
						
						
							779acbab5c
							
						
					 | 
					
						
						
							
							Merge branch 'master-dev' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
						
						
						
						
						
					 | 
					
						2023-10-09 14:15:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								任珮宇
							
						 
					 | 
					
						
						
						
						
							
						
						
							79e9a3abaa
							
						
					 | 
					
						
						
							
							Merge branch 'feature-Alarm-renpy' into master-dev
						
						
						
						
						
					 | 
					
						2023-10-09 14:13:52 +08:00 | 
					
					
						
						
							
							
							
						
					 |