xiaoguangbin
							
						 
					 | 
					
						
						
						
						
							
						
						
							35978b7b43
							
						
					 | 
					
						
						
							
							Merge branch 'feature-Alarm-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
						
						
						
						
						
					 | 
					
						2023-10-26 14:29:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoguangbin
							
						 
					 | 
					
						
						
						
						
							
						
						
							e5265561b5
							
						
					 | 
					
						
						
							
							Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
						
						
						
						
						
					 | 
					
						2023-10-26 14:27:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fc7c62b504
							
						
					 | 
					
						
						
							
							fix: 修复Beta点击QC Flags弹窗中DetectorList 为undefined的问题,gamma双击图表改为显示peak弹窗
						
						
						
						
						
					 | 
					
						2023-10-26 13:51:51 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							67757b84e7
							
						
					 | 
					
						
						
							
							feat: 增加对gamma图表缩放的键盘快捷键
						
						
						
						
						
					 | 
					
						2023-10-26 11:39:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoguangbin
							
						 
					 | 
					
						
						
						
						
							
						
						
							76bcfecebb
							
						
					 | 
					
						
						
							
							Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
						
						
						
						
						
					 | 
					
						2023-10-26 09:42:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								任珮宇
							
						 
					 | 
					
						
						
						
						
							
						
						
							78dba4c37c
							
						
					 | 
					
						
						
							
							analysis  beta Result display 样式错乱问题处理
						
						
						
						
						
					 | 
					
						2023-10-26 09:38:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoguangbin
							
						 
					 | 
					
						
						
						
						
							
						
						
							e105d4c8e0
							
						
					 | 
					
						
						
							
							Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
						
						
						
						
						
					 | 
					
						2023-10-25 18:38:15 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								任珮宇
							
						 
					 | 
					
						
						
						
						
							
						
						
							9e29991152
							
						
					 | 
					
						
						
							
							SampleType 下拉框选择之后过滤Sample下拉框数据
						
						
						
						
						
					 | 
					
						2023-10-25 15:47:28 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							46c4dcd927
							
						
					 | 
					
						
						
							
							fix: 优化gamma页各图形构建方式,修复log10刷选后scatter丢失的问题,优化GraphAssistance组件,默认选中log10,from db默认选择full
						
						
						
						
						
					 | 
					
						2023-10-25 14:39:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								任珮宇
							
						 
					 | 
					
						
						
						
						
							
						
						
							5a6387bef9
							
						
					 | 
					
						
						
							
							alarm 模块 Alarm information接口调整
						
						
						
						
						
					 | 
					
						2023-10-25 11:43:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoguangbin
							
						 
					 | 
					
						
						
						
						
							
						
						
							cdfb4d828e
							
						
					 | 
					
						
						
							
							Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
						
						
						
						
						
					 | 
					
						2023-10-25 08:55:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								任珮宇
							
						 
					 | 
					
						
						
						
						
							
						
						
							4ec2fec97b
							
						
					 | 
					
						
						
							
							gamma模块下 analyze  korsum弹窗 右侧的table改成可编辑的表格
						
						
						
						
						
					 | 
					
						2023-10-23 17:37:26 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b936995317
							
						
					 | 
					
						
						
							
							fix: 修复保存Results时的文件名称不正确问题,Compare和Strip增加本地直接选择文件功能
						
						
						
						
						
					 | 
					
						2023-10-23 15:13:12 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoguangbin
							
						 
					 | 
					
						
						
						
						
							
						
						
							2b3731322c
							
						
					 | 
					
						
						
							
							Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
						
						
						
						
						
					 | 
					
						2023-10-23 15:01:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c1d3129441
							
						
					 | 
					
						
						
							
							fix: 按新接口对接Extrapolation的表格、图表绘制和分析功能
						
						
						
						
						
					 | 
					
						2023-10-23 11:27:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoguangbin
							
						 
					 | 
					
						
						
						
						
							
						
						
							8b36e4bc4e
							
						
					 | 
					
						
						
							
							Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into feature-analysis-RLR-renpy
						
						
						
						
						
					 | 
					
						2023-10-20 18:10:09 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoguangbin
							
						 
					 | 
					
						
						
						
						
							
						
						
							489fd642fb
							
						
					 | 
					
						
						
							
							feat:krosum弹窗完成分析以及右侧table数据渲染功能
						
						
						
						
						
					 | 
					
						2023-10-20 18:09:51 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b7767bd15e
							
						
					 | 
					
						
						
							
							fix: Reprocessing All功能,及部分问题修改
						
						
						
						
						
					 | 
					
						2023-10-20 17:59:52 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							26c4b05abb
							
						
					 | 
					
						
						
							
							feat: 文件转换功能
						
						
						
						
						
					 | 
					
						2023-10-20 16:54:13 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							961f9752f6
							
						
					 | 
					
						
						
							
							feat: 对接清理sample缓存功能
						
						
						
						
						
					 | 
					
						2023-10-20 10:11:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoguangbin
							
						 
					 | 
					
						
						
						
						
							
						
						
							6f43ad6fd6
							
						
					 | 
					
						
						
							
							Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
						
						
						
						
						
					 | 
					
						2023-10-19 19:51:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								任珮宇
							
						 
					 | 
					
						
						
						
						
							
						
						
							e69f1b7c06
							
						
					 | 
					
						
						
							
							处理getFileSpectrumChart接口参数
						
						
						
						
						
					 | 
					
						2023-10-19 19:32:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoguangbin
							
						 
					 | 
					
						
						
						
						
							
						
						
							ca3b67a957
							
						
					 | 
					
						
						
							
							Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
						
						
						
						
						
					 | 
					
						2023-10-19 19:15:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								任珮宇
							
						 
					 | 
					
						
						
						
						
							
						
						
							e89afcba1b
							
						
					 | 
					
						
						
							
							后选列表要用表格里面的文件名称要用格式化后的名称
						
						
						
						
						
					 | 
					
						2023-10-19 19:08:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoguangbin
							
						 
					 | 
					
						
						
						
						
							
						
						
							e9f17c6108
							
						
					 | 
					
						
						
							
							Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
						
						
						
						
						
					 | 
					
						2023-10-19 18:19:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								任珮宇
							
						 
					 | 
					
						
						
						
						
							
						
						
							7e7d2f226a
							
						
					 | 
					
						
						
							
							form file 加载本地文件,逻辑调整
						
						
						
						
						
					 | 
					
						2023-10-19 17:24:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								xiaoguangbin
							
						 
					 | 
					
						
						
						
						
							
						
						
							ebedc9d3e5
							
						
					 | 
					
						
						
							
							Merge branch 'master-dev' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
						
						
						
						
						
					 | 
					
						2023-10-19 16:59:30 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								orgin
							
						 
					 | 
					
						
						
						
						
							
						
						
							4972d1cb74
							
						
					 | 
					
						
						
							
							fix:修改打包配置文件
						
						
						
						
						
					 | 
					
						2023-10-16 09:32:32 +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 | 
					
					
						
						
							
							
							
						
					 |