| 
						
					 | 
					
						
						
						
						
							
						
						
							08829d0f93
							
						
					 | 
					
						
						
							
							alarm模块创建
						
						
						
						
						
					 | 
					
						2023-07-18 15:15:31 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							321a421268
							
						
					 | 
					
						
						
							
							Merge branch 'bugfix/submenu' into feature-Alarm-renpy
						
						
						
						
						
					 | 
					
						2023-07-18 15:12:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							31961650cd
							
						
					 | 
					
						
						
							
							修改对应模块导出文件的名称
						
						
						
						
						
					 | 
					
						2023-07-18 13:56:53 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							25809071d4
							
						
					 | 
					
						
						
							
							alerts、rmssoh、met 模块增加导出excel功能
						
						
						
						
						
					 | 
					
						2023-07-18 13:53:52 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							38b23f5e0d
							
						
					 | 
					
						
						
							
							feat: 增加RLR弹窗中所有子页面,增加Arr、SampleInfo、QC Results弹窗
						
						
						
						
						
					 | 
					
						2023-07-17 19:37:46 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c564150ad7
							
						
					 | 
					
						
						
							
							列表页面table组件,查询时增加loading效果
						
						
						
						
						
					 | 
					
						2023-07-17 13:56:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							08dc2aeef3
							
						
					 | 
					
						
						
							
							处理左侧二级菜单的刷新后,选中的高亮菜单与路由地址不匹配的问题
						
						
						
						
						
					 | 
					
						2023-07-17 11:46:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5ae562ff7a
							
						
					 | 
					
						
						
							
							修改下载文件的文件名称及增加无数据时点击下载文件的提示,及报错提示
						
						
						
						
						
					 | 
					
						2023-07-17 11:45:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							704986f910
							
						
					 | 
					
						
						
							
							feat: 增加Nuclide Library弹窗,优化部分样式
						
						
						
						
						
					 | 
					
						2023-07-17 09:12:22 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5306706954
							
						
					 | 
					
						
						
							
							完成导出Radionuclide的Excel的功能
						
						
						
						
						
					 | 
					
						2023-07-14 18:26:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b841f8cf6a
							
						
					 | 
					
						
						
							
							接口错误信息提示文案调整,下载预览接口错误消息文案调整
						
						
						
						
						
					 | 
					
						2023-07-14 16:52:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c985ffa6f3
							
						
					 | 
					
						
						
							
							按钮增加手型样式,请求增加错误提示代码
						
						
						
						
						
					 | 
					
						2023-07-14 15:18:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f3091bdb84
							
						
					 | 
					
						
						
							
							Merge branch 'bugfix/submenu' into feature-particulate-renpy
						
						
						
						
						
					 | 
					
						2023-07-14 13:51:23 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							acfa3c14f5
							
						
					 | 
					
						
						
							
							处理压缩包不能解压问题
						
						
						
						
						
					 | 
					
						2023-07-14 11:37:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ffed2cf2fa
							
						
					 | 
					
						
						
							
							feat: Energy Calibration、Resolution Calibration、Spectrum Comments、Color Config、Data Processing Log、Config User Library 弹窗,3D Scatter图表、Beta-gamma接口修改的那部分对接
						
						
						
						
						
					 | 
					
						2023-07-13 19:18:23 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4022a3c38d
							
						
					 | 
					
						
						
							
							增加下载失败,预览失败提醒消息
						
						
						
						
						
					 | 
					
						2023-07-13 18:29:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							80e81c6a50
							
						
					 | 
					
						
						
							
							完成各个模块的下载,预览,zip下载功能
						
						
						
						
						
					 | 
					
						2023-07-13 16:54:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							df0706c9ad
							
						
					 | 
					
						
						
							
							Merge branch 'feature-particulate-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into feature-particulate-renpy
						
						
						
						
						
					 | 
					
						2023-07-13 14:12:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							69b349c618
							
						
					 | 
					
						
						
							
							删除无用代码
						
						
						
						
						
					 | 
					
						2023-07-13 14:02:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							88abf7b5a0
							
						
					 | 
					
						
						
							
							放开注释代码
						
						
						
						
						
					 | 
					
						2023-07-13 13:59:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								orgin
							
						 
					 | 
					
						
						
						
						
							
						
						
							53bace583c
							
						
					 | 
					
						
						
							
							Merge branch 'feature-particulate-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into feature-particulate-renpy
						
						
						
						
						
					 | 
					
						2023-07-13 13:50:15 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e86525fb98
							
						
					 | 
					
						
						
							
							添加 ARR 和 RRR 模块,完成详情页的预览,下载功能
						
						
						
						
						
					 | 
					
						2023-07-13 11:15:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								orgin
							
						 
					 | 
					
						
						
						
						
							
						
						
							8772c16c9b
							
						
					 | 
					
						
						
							
							Merge branch 'master' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue
						
						
						
						
						
					 | 
					
						2023-07-13 10:54:28 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ae5fc57778
							
						
					 | 
					
						
						
							
							Merge pull request 'bugfix/custom-table' (#8) from bugfix/custom-table into master
						
						
						
						
						
					 | 
					
						2023-07-13 10:40:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0b3bbdb166
							
						
					 | 
					
						
						
							
							feat: 增加控制sub-menus菜单是否显示的方法
						
						
						
						
						
					 | 
					
						2023-07-13 09:25:14 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							766b4f6c04
							
						
					 | 
					
						
						
							
							feat: 完成Korsum、ReProcessing、 Zero Time、EfficiencyCalibration弹窗,和NuclideReview中图表的逻辑
						
						
						
						
						
					 | 
					
						2023-07-12 19:56:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8fb0089be1
							
						
					 | 
					
						
						
							
							feat: 增加Interactive Tool弹窗中的部分二级弹窗,对接样本类型为beta-gamma的部分数据
						
						
						
						
						
					 | 
					
						2023-07-11 19:35:18 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								orgin
							
						 
					 | 
					
						
						
						
						
							
						
						
							e74839183b
							
						
					 | 
					
						
						
							
							Merge branch 'feature-particulate-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into feature-particulate-renpy
						
						
						
						
						
					 | 
					
						2023-07-11 17:55:44 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e25ae12785
							
						
					 | 
					
						
						
							
							删除无用代码
						
						
						
						
						
					 | 
					
						2023-07-11 17:05:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c9b9c93b06
							
						
					 | 
					
						
						
							
							alerts  rmssoh   met  模块增加日期限制提醒的功能
						
						
						
						
						
					 | 
					
						2023-07-11 17:04:26 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								orgin
							
						 
					 | 
					
						
						
						
						
							
						
						
							f94429ccaa
							
						
					 | 
					
						
						
							
							Merge branch 'feature-particulate-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into feature-particulate-renpy
						
						
						
						
						
					 | 
					
						2023-07-11 14:22:05 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4203f9df9c
							
						
					 | 
					
						
						
							
							soh、alerts、met模块开发,及功能联调
						
						
						
						
						
					 | 
					
						2023-07-11 14:01:49 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							09e77962d2
							
						
					 | 
					
						
						
							
							WIP: 完成部分弹窗
						
						
						
						
						
					 | 
					
						2023-07-11 09:10:34 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							194162804e
							
						
					 | 
					
						
						
							
							feat: 增加鼠标按下拖拽选点功能
						
						
						
						
						
					 | 
					
						2023-07-10 09:45:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3c92cbff86
							
						
					 | 
					
						
						
							
							fix: 修复某些页面的表格滚动高度不正确的问题
						
						
						
						
						
					 | 
					
						2023-07-07 17:45:51 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a7248af1b4
							
						
					 | 
					
						
						
							
							feat: 对接LoadFromDB接口,增加右侧四图表实时值显示,优化刷选时的逻辑,修改某些公共样式
						
						
						
						
						
					 | 
					
						2023-07-07 17:44:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								orgin
							
						 
					 | 
					
						
						
						
						
							
						
						
							086a049238
							
						
					 | 
					
						
						
							
							Merge branch 'feature-particulate-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into feature-particulate-renpy
						
						
						
						
						
					 | 
					
						2023-07-07 17:12:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							24af99c0bd
							
						
					 | 
					
						
						
							
							详情页表格调整,折线图,散点图坐标调整
						
						
						
						
						
					 | 
					
						2023-07-07 17:10:23 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							24dacdb692
							
						
					 | 
					
						
						
							
							Merge branch 'bugfix/custom-table' into feature/spectrum-analysis
						
						
						
						
						
					 | 
					
						2023-07-07 15:46:03 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0fd52c80cf
							
						
					 | 
					
						
						
							
							feat: CustomTable增加同步选中的行功能(selectionRows)
						
						
						
						
						
					 | 
					
						2023-07-07 15:45:09 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								orgin
							
						 
					 | 
					
						
						
						
						
							
						
						
							eb191811c3
							
						
					 | 
					
						
						
							
							Merge branch 'feature-particulate-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into feature-particulate-renpy
						
						
						
						
						
					 | 
					
						2023-07-07 14:21:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fe5166eb16
							
						
					 | 
					
						
						
							
							noble Gas beta-gamma 模块开发
						
						
						
						
						
					 | 
					
						2023-07-07 14:21:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f5715a0ad9
							
						
					 | 
					
						
						
							
							WIP: load from db 接口对接
						
						
						
						
						
					 | 
					
						2023-07-06 19:41:06 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0482aebb12
							
						
					 | 
					
						
						
							
							feat: 增加各图表之间的联动
						
						
						
						
						
					 | 
					
						2023-07-06 19:40:48 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6c02e52e23
							
						
					 | 
					
						
						
							
							feat: 增加LoadFromDb、LoadFromFile等等弹窗,修改custom-modal时的用法,
						
						
						
						
						
					 | 
					
						2023-07-06 14:05:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								orgin
							
						 
					 | 
					
						
						
						
						
							
						
						
							8ffbdf3cf7
							
						
					 | 
					
						
						
							
							Merge branch 'feature-particulate-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into feature-particulate-renpy
						
						
						
						
						
					 | 
					
						2023-07-06 11:50:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							42e1000c11
							
						
					 | 
					
						
						
							
							fix: 修复自定义弹窗控制footer时的逻辑错误,改为默认显示保存和取消,增加custom-footer插槽来自定义footer,以使其更加灵活
						
						
						
						
						
					 | 
					
						2023-07-06 11:19:04 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a8f1e88d91
							
						
					 | 
					
						
						
							
							node gas hpge 模块开发联调
						
						
						
						
						
					 | 
					
						2023-07-06 11:15:19 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								orgin
							
						 
					 | 
					
						
						
						
						
							
						
						
							729e497b2e
							
						
					 | 
					
						
						
							
							Merge branch 'feature-particulate-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into feature-particulate-renpy
						
						
						
						
						
					 | 
					
						2023-07-05 16:45:56 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b0499f0748
							
						
					 | 
					
						
						
							
							Merge branch 'bugfix/custom-table' into feature/spectrum-analysis
						
						
						
						
						
					 | 
					
						2023-07-05 16:03:38 +08:00 | 
					
					
						
						
							
							
							
						
					 |