| 
						
					 | 
					
						
						
						
						
							
						
						
							fc63d2c568
							
						
					 | 
					
						
						
							
							Merge branch 'feature/spectrum-analysis' into feature-analysis-RLR-renpy
						
						
						
						
						
					 | 
					
						2023-09-22 17:26:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a921c64f6b
							
						
					 | 
					
						
						
							
							fix: 优化部分样式及功能,,增加Gamma的Save to DB 功能,完成Gamma Calibration弹窗中的Call功能
						
						
						
						
						
					 | 
					
						2023-09-21 19:41:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								任珮宇
							
						 
					 | 
					
						
						
						
						
							
						
						
							76c46d54cc
							
						
					 | 
					
						
						
							
							Merge branch 'feature-spectrum-analysis' into feature-analysis-RLR-renpy
						
						
						
						
						
						
						
						# Conflicts:
#	src/views/spectrumAnalysis/gamma-analysis.vue 
						
					 | 
					
						2023-09-21 16:12:29 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								任珮宇
							
						 
					 | 
					
						
						
						
						
							
						
						
							bff44aba5a
							
						
					 | 
					
						
						
							
							beta  Save to DB 接口联调
						
						
						
						
						
						
						
						分析接口返回的数据处理及参数调整 
						
					 | 
					
						2023-09-21 16:04:37 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							acb93dd817
							
						
					 | 
					
						
						
							
							feat: 对接保存功能,修复部分BUG
						
						
						
						
						
					 | 
					
						2023-09-20 18:58:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							81e5797c73
							
						
					 | 
					
						
						
							
							fix: popover菜单样式问题,及Nuclide Library值不正确的问题
						
						
						
						
						
					 | 
					
						2023-09-19 11:50:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e2b211bfcc
							
						
					 | 
					
						
						
							
							fix: Nuclide Library改为点击弹出,修复切换Peak Infomation时未获取Nuclide Library问题,增加双击弹出Nuclide Review 功能
						
						
						
						
						
					 | 
					
						2023-09-18 19:28:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								任珮宇
							
						 
					 | 
					
						
						
						
						
							
						
						
							be15cf582e
							
						
					 | 
					
						
						
							
							处理 file list 弹窗,单击行取消的功能
						
						
						
						
						
						
						
						file list 当前页勾选后,切换其他分页,清空之前选中项 
						
					 | 
					
						2023-09-18 15:04:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								任珮宇
							
						 
					 | 
					
						
						
						
						
							
						
						
							3bfaa90408
							
						
					 | 
					
						
						
							
							Zero Time中的保存功能对接
						
						
						
						
						
					 | 
					
						2023-09-18 14:39:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								任珮宇
							
						 
					 | 
					
						
						
						
						
							
						
						
							8835f93580
							
						
					 | 
					
						
						
							
							Merge branch 'feature-spectrum-analysis' into feature-analysis-RLR-renpy
						
						
						
						
						
						
						
						# Conflicts:
#	src/views/spectrumAnalysis/beta-gamma-analysis.vue
#	src/views/spectrumAnalysis/index.vue 
						
					 | 
					
						2023-09-15 18:31:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								任珮宇
							
						 
					 | 
					
						
						
						
						
							
						
						
							801ff3d10a
							
						
					 | 
					
						
						
							
							处理 form File 来源 Energy Calibration 弹窗无数据的问题,及接口参数调整
						
						
						
						
						
					 | 
					
						2023-09-15 18:17:21 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								任珮宇
							
						 
					 | 
					
						
						
						
						
							
						
						
							a3187a5975
							
						
					 | 
					
						
						
							
							处理formDb来源的beta模块 Energy Calibration 弹窗接口不显示数据的问题,及接口参数调整
						
						
						
						
						
					 | 
					
						2023-09-15 17:45:46 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							08ca6c154d
							
						
					 | 
					
						
						
							
							fix: 部分页面增加sampleFileName字段
						
						
						
						
						
					 | 
					
						2023-09-15 17:18:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								任珮宇
							
						 
					 | 
					
						
						
						
						
							
						
						
							8fa955e4f4
							
						
					 | 
					
						
						
							
							Merge branch 'feature-spectrum-analysis' into feature-analysis-RLR-renpy
						
						
						
						
						
						
						
						# Conflicts:
#	src/api/manage.js
#	src/views/spectrumAnalysis/gamma-analysis.vue
#	src/views/spectrumAnalysis/index.vue 
						
					 | 
					
						2023-09-15 16:25:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							cbaa99e334
							
						
					 | 
					
						
						
							
							feat: 由于graphic限制,重写小红框逻辑及撤销逻辑,增加绿色加号的渲染逻辑,完成Replot、Accept功能
						
						
						
						
						
					 | 
					
						2023-09-14 19:49:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								任珮宇
							
						 
					 | 
					
						
						
						
						
							
						
						
							3024b10f35
							
						
					 | 
					
						
						
							
							beta  分析接口调试
						
						
						
						
						
					 | 
					
						2023-09-14 19:44:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4a3e5c8957
							
						
					 | 
					
						
						
							
							fix: 修复ColorPicker中的问题
						
						
						
						
						
					 | 
					
						2023-09-14 19:43:15 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								任珮宇
							
						 
					 | 
					
						
						
						
						
							
						
						
							56e1c9130e
							
						
					 | 
					
						
						
							
							处理打开beta RLR 弹窗直接点击save字段无数据的问题
						
						
						
						
						
					 | 
					
						2023-09-14 11:41:34 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								任珮宇
							
						 
					 | 
					
						
						
						
						
							
						
						
							e1c30fd326
							
						
					 | 
					
						
						
							
							处理RLR弹窗点击下载关闭的问题
						
						
						
						
						
					 | 
					
						2023-09-13 19:43:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1c16157a27
							
						
					 | 
					
						
						
							
							feat: 对接ColorConfig功能,完成Interactive Tools中的Fit功能,及切换回BaseLine的部分处理
						
						
						
						
						
					 | 
					
						2023-09-13 19:42:28 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								任珮宇
							
						 
					 | 
					
						
						
						
						
							
						
						
							a289c1de9c
							
						
					 | 
					
						
						
							
							beta  rlr 弹窗导出调整
						
						
						
						
						
					 | 
					
						2023-09-13 19:30:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								任珮宇
							
						 
					 | 
					
						
						
						
						
							
						
						
							e4732fbb55
							
						
					 | 
					
						
						
							
							beta 模块的RLR 弹窗查询接口调整
						
						
						
						
						
						
						
						beta 模块的RLR 弹窗save下载文件接口联调 
						
					 | 
					
						2023-09-13 19:01:21 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								orgin
							
						 
					 | 
					
						
						
						
						
							
						
						
							c2fde1336e
							
						
					 | 
					
						
						
							
							fix:Beta-RLR弹窗 修改接口请求参数
						
						
						
						
						
					 | 
					
						2023-09-12 19:52:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								orgin
							
						 
					 | 
					
						
						
						
						
							
						
						
							aff0802b49
							
						
					 | 
					
						
						
							
							fix: 完成 Beta-RLR 弹窗的 General Infomation,Notes文字内容填充
						
						
						
						
						
					 | 
					
						2023-09-12 19:51:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5ae9115577
							
						
					 | 
					
						
						
							
							fix: 修复部分问题
						
						
						
						
						
					 | 
					
						2023-09-12 19:48:15 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							acf0fb4706
							
						
					 | 
					
						
						
							
							feat: Gamma主页的Peak Infomation和Nuclide Library,分析工具弹窗里的编辑斜率功能
						
						
						
						
						
					 | 
					
						2023-09-12 19:42:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							efe775f0f0
							
						
					 | 
					
						
						
							
							gamma 模块的RLR 导出
						
						
						
						
						
					 | 
					
						2023-09-12 17:42:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6f9a4cbaed
							
						
					 | 
					
						
						
							
							feat: 增加Undo撤销功能
						
						
						
						
						
					 | 
					
						2023-09-11 18:59:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1b80817da3
							
						
					 | 
					
						
						
							
							Form file选择能谱文件之后,曲线图没渲染数据
						
						
						
						
						
					 | 
					
						2023-09-11 15:58:58 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							60c2ed556e
							
						
					 | 
					
						
						
							
							处理fileList加载文件后被覆盖的问题
						
						
						
						
						
					 | 
					
						2023-09-11 14:51:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c9ca7c1a5e
							
						
					 | 
					
						
						
							
							处理下载保存文件,弹窗关闭的问题
						
						
						
						
						
					 | 
					
						2023-09-11 13:42:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2761b0da21
							
						
					 | 
					
						
						
							
							完成gamma  formFile 模块的功能
						
						
						
						
						
					 | 
					
						2023-09-11 11:01:23 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							dcc75bd800
							
						
					 | 
					
						
						
							
							feat: Calibration剩下的两个弹窗中的各操作和接口对接
						
						
						
						
						
					 | 
					
						2023-09-08 18:43:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8cfb9d7262
							
						
					 | 
					
						
						
							
							处理 File List 显示多条数据的时候样式错乱的问题
						
						
						
						
						
					 | 
					
						2023-09-08 16:29:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e48d029827
							
						
					 | 
					
						
						
							
							formfile模块Beta 对接loadFromFile接口,数据显示
						
						
						
						
						
					 | 
					
						2023-09-08 16:23:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0fbdc38690
							
						
					 | 
					
						
						
							
							调整Load Data From File弹窗中,根据返回的数据状态,显示对应文件的名字颜色
						
						
						
						
						
						
						
						处理点击行,fileName值没空的问题 
						
					 | 
					
						2023-09-08 14:48:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							890bc9fa73
							
						
					 | 
					
						
						
							
							Merge branch 'feature-analysis-RLR-renpy' into feature/spectrum-analysis
						
						
						
						
						
					 | 
					
						2023-09-08 11:59:07 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1efe28500e
							
						
					 | 
					
						
						
							
							处理Beta View Spectrum 弹窗文件保存的问题
						
						
						
						
						
					 | 
					
						2023-09-08 11:04:27 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3cf42843c5
							
						
					 | 
					
						
						
							
							File List 表单上面增加“搜索框”用来查询数据
						
						
						
						
						
					 | 
					
						2023-09-08 10:40:00 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6ba65075be
							
						
					 | 
					
						
						
							
							Merge branch 'feature/spectrum-analysis' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into feature-analysis-RLR-renpy
						
						
						
						
						
						
						
						# Conflicts:
#	src/views/spectrumAnalysis/components/Modals/ArrRrrModal.vue
#	src/views/spectrumAnalysis/components/Modals/DataProcessingLogModal.vue
#	src/views/spectrumAnalysis/components/Modals/NuclideActivityAndMDCModal.vue
#	src/views/spectrumAnalysis/components/Modals/QcResultsModal.vue
#	src/views/spectrumAnalysis/components/Modals/RLRModal/index.vue
#	src/views/spectrumAnalysis/components/Modals/SampleInfomationModal.vue
#	src/views/spectrumAnalysis/components/PeakInfomation.vue 
						
					 | 
					
						2023-09-07 19:49:40 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e4edd1abfd
							
						
					 | 
					
						
						
							
							feat: Energy的增/删/改及Apply操作,Peak Comment和GeneralComment接口对接
						
						
						
						
						
					 | 
					
						2023-09-07 19:29:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							229349d4f9
							
						
					 | 
					
						
						
							
							1. File list 改为单机行就可以勾选
						
						
						
						
						
						
						
						. 处理File List 显示20条数据的时候样式错乱的问题
From File 双击Sample 之后,过滤"_S_" 能谱 
						
					 | 
					
						2023-09-07 19:28:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1c27c14564
							
						
					 | 
					
						
						
							
							完成beta 中excel 的导出功能
						
						
						
						
						
					 | 
					
						2023-09-07 18:17:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3b516367d3
							
						
					 | 
					
						
						
							
							Gamma 导出excel功能开发
						
						
						
						
						
					 | 
					
						2023-09-07 17:30:07 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							da3e09e847
							
						
					 | 
					
						
						
							
							处理弹窗中loading的加载问题
						
						
						
						
						
						
						
						获取普文件列表接口参数调整 
						
					 | 
					
						2023-09-07 15:13:51 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2eb703e2ac
							
						
					 | 
					
						
						
							
							完成form file 模块的load功能
						
						
						
						
						
						
						
						修改form file弹窗列表选择文件的逻辑
查看Gamma Viewer Log接口调整 
						
					 | 
					
						2023-09-07 14:48:09 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ef3a022528
							
						
					 | 
					
						
						
							
							feat: Fit Peaks and Baseline接口对接及相关功能,Interactive Analyse Tools图表刷选、删除Peak、控制点的增加和删除、Energy的Insert功能
						
						
						
						
						
					 | 
					
						2023-09-06 19:30:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							44ca1bf9ed
							
						
					 | 
					
						
						
							
							查看Gamma Viewer Log接口参数调整
						
						
						
						
						
					 | 
					
						2023-09-06 19:29:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c45cd40ba9
							
						
					 | 
					
						
						
							
							修改confirm弹窗的默认按钮,增加无数据的提示
						
						
						
						
						
					 | 
					
						2023-09-06 17:48:47 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ec6cb33835
							
						
					 | 
					
						
						
							
							完成form file 弹窗选择文件并保存回显的功能
						
						
						
						
						
					 | 
					
						2023-09-06 16:40:15 +08:00 | 
					
					
						
						
							
							
							
						
					 |